From e655c1304337df14a931a10924fa43eebf8a0dc5 Mon Sep 17 00:00:00 2001
From: wangjialin <wangjialin@lyms.com>
Date: Mon, 12 Aug 2024 08:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9vip=E5=92=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageA/pages/editAddress/editAddress.js      | 16 ++++++----
 littleApp_child/pages/home/home.js                 | 34 +++++++++++++---------
 littleApp_child/pages/vipService/vipService.js     |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/littleApp_child/packageA/pages/editAddress/editAddress.js b/littleApp_child/packageA/pages/editAddress/editAddress.js
index 9b24f7d..145293f 100644
--- a/littleApp_child/packageA/pages/editAddress/editAddress.js
+++ b/littleApp_child/packageA/pages/editAddress/editAddress.js
@@ -10,7 +10,8 @@ Page(Object.assign({}, AreaPicker,{
     babyAddress: ''
   },
   onLoad: function (options) {
-    if (options.id) {
+    if (options.id&&options.id!='null') {
+      console.log('options.id',options.id);
       this.setData({
         id: options.id
       })
@@ -19,12 +20,15 @@ Page(Object.assign({}, AreaPicker,{
     }
   },
   findNameById(id,data) {  
-    for (let i = 0; i < data.length; i++) {  
-      if (data[i].id == id) {  
-        return data[i].name;  
+    if(data.length!=0){
+      for (let i = 0; i < data.length; i++) {  
+        if (data[i].id == id) {  
+          return data[i].name;  
+        }  
       }  
-    }  
-    return null;  
+    }else{
+      return ''
+    }
   },
   getdz(id){
     let self=this
diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js
index 39eb118..ea43ccf 100644
--- a/littleApp_child/pages/home/home.js
+++ b/littleApp_child/pages/home/home.js
@@ -596,18 +596,23 @@ Page({
     }, function(res) {
 
       if (res.errorcode == 4002) {
-        wx.showModal({
-          title: '提示',
-          content: res.errormsg,
-          showCancel: false,
-          success: function(res) {
-            wx.setStorageSync('userToken', '')
-            wx.setStorageSync('userId', '')
-            getApp().globalData.token = ''
-            getApp().globalData.userId = ''
-            self.toLogin()
-          }
-        })
+        // wx.showModal({
+        //   title: '提示',
+        //   content: res.errormsg,
+        //   showCancel: false,
+        //   success: function(res) {
+        //     wx.setStorageSync('userToken', '')
+        //     wx.setStorageSync('userId', '')
+        //     getApp().globalData.token = ''
+        //     getApp().globalData.userId = ''
+        //     self.toLogin()
+        //   }
+        // })
+        wx.setStorageSync('userToken', '')
+        wx.setStorageSync('userId', '')
+        getApp().globalData.token = ''
+        getApp().globalData.userId = ''
+        self.toLogin()
       } else {
         networkUtil.showErrorToast(res.errormsg)
       }
@@ -935,8 +940,11 @@ Page({
     }
     networkUtil._post(api.getBabyBuildPidInfo,param,function(res){
       if (res.data.data) {
-          console.log('params',param);
+        if(!res.data.data.id){
           console.log('res.data.data.id',res.data.data.id);
+        }
+          console.log('params',param);
+
         wx.navigateTo({url: '/packageA/pages/editAddress/editAddress?id=' + res.data.data.id })
       }
     },function(res){
diff --git a/littleApp_child/pages/vipService/vipService.js b/littleApp_child/pages/vipService/vipService.js
index 8d55f08..bd6451c 100644
--- a/littleApp_child/pages/vipService/vipService.js
+++ b/littleApp_child/pages/vipService/vipService.js
@@ -69,6 +69,7 @@ Page({
         arr[1]=res.data.data[1]
         arr[0].desc=['1.精准指导服务:'+res.data.data[0].desc,'2.随访提醒:'+res.data.data[2].desc,'3.查看检查记录:'+res.data.data[3].desc]
         arr[1].desc=[res.data.data[1].desc]
+        arr[1].name='儿保小助理服务'
         console.log('arr',arr);
         self.setData({
           vipList: arr,
-- 
1.8.3.1