From e01d46d64cd23260d2efaef5df2276b6632802fd Mon Sep 17 00:00:00 2001
From: "@zuopngfei" <zuopengfei@nuiner.com>
Date: Mon, 11 Aug 2025 16:44:45 +0800
Subject: [PATCH] sdw2

---
 api/request.js            | 60 ++++++++++++++++++---------------------
 pages/followUp/index.js   |  6 ++++
 pages/home/index.js       |  7 +----
 pages/home/index.wxml     |  2 +-
 pages/login/login.wxml    |  4 +--
 pages/patients/index.wxml |  4 +--
 6 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/api/request.js b/api/request.js
index f7e4241..d043cb9 100644
--- a/api/request.js
+++ b/api/request.js
@@ -13,42 +13,38 @@ function request(url, method = 'GET', data = {}) {
     header.Authorization = `${tokenString}`;
   }
   return new Promise((resolve, reject) => {
-      wx.request({
-          url: baseUrl + url,
-          method,
-          data,
-          dataType: 'json', // 微信官方文档中介绍会对数据进行一次JSON.parse
-          header,
-          success(res) {
-            if (res.data.code) {
-              if (res.data.code == 10103) {
-                wx.removeStorageSync('access_token');
-                wx.navigateTo({
-                  url: '/pages/login/login',
-                  complete: () => {
-                    isNavigatingToLogin = false;
-                  }
-                });
-              }
-              reject(res.data);
-              return;
-            }
-            wx.showToast({
-              title: res.data.message,
-              icon: 'none'
+    wx.request({
+      url: baseUrl + url,
+      method,
+      data,
+      dataType: 'json', // 微信官方文档中介绍会对数据进行一次JSON.parse
+      header,
+      success(res) {
+        if (res.data.code) {
+          if (res.data.code == 10103) {
+            wx.removeStorageSync('access_token');
+            wx.navigateTo({
+              url: '/pages/login/login',
             });
             reject(res.data);
-          } else {
-            resolve(res.data);
+            return;
           }
+          wx.showToast({
+            title: res.data.message,
+            icon: 'none'
+          });
+          reject(res.data);
+        } else {
+          resolve(res.data);
+        }
 
-        },
-        fail(err) {
-          console.log(err)
-          // 断网、服务器挂了都会fail回调，直接reject即可
-          reject(err);
-        },
-      });
+      },
+      fail(err) {
+        console.log(err)
+        // 断网、服务器挂了都会fail回调，直接reject即可
+        reject(err);
+      },
+    });
   });
 }
 
diff --git a/pages/followUp/index.js b/pages/followUp/index.js
index 8a59ddc..4d630c9 100644
--- a/pages/followUp/index.js
+++ b/pages/followUp/index.js
@@ -73,6 +73,12 @@ Page({
       imageVisible: true
     })
   },
+
+  onClose(){
+    this.setData({
+      imageVisible: false
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/pages/home/index.js b/pages/home/index.js
index 862559b..602bdaf 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -8,12 +8,7 @@ const app = getApp();
 
 Page({
   onShareAppMessage: function (res) {
-    return {
-      title: 'ECharts 可以在微信小程序中使用啦！',
-      path: '/pages/index/index',
-      success: function () {},
-      fail: function () {}
-    }
+    
   },
   data: {
     ec: {
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 598fd48..7f62421 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -9,7 +9,7 @@
         <image src="{{userInfo.avatar}}" />
       </view>
       <view class="text-group_1">
-        <text lines="1" class="text_2">{{userInfo.username}}<text lines="1" decode="true" class="text_4">{{userInfo.sex == 1 ? '男':'女'}}&nbsp;·&nbsp;{{ userInfo.age }}</text></text>
+        <text lines="1" class="text_2">{{userInfo.username ? userInfo.username : '患者信息未完善'}}<text wx:if="{{userInfo.username}}" lines="1" decode="true" class="text_4">{{userInfo.sex == 1 ? '男':'女'}}&nbsp;·&nbsp;{{ userInfo.age }}</text></text>
         <text lines="1" class="text_3">下次随访时间：{{ userInfo.next_follow_date }}</text>
       </view>
 
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 55b2fe9..937eb7f 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -30,8 +30,8 @@
       <text lines="1" class="text_4">登录</text>
     </view>
     <view class="text-wrapper_2">
-      <text lines="1" class="text_6">登录或注册完成即代表您同意</text>
-      <text lines="1" class="text_7">《用户服务协议》</text>
+      <!-- <text lines="1" class="text_6">登录或注册完成即代表您同意</text>
+      <text lines="1" class="text_7">《用户服务协议》</text> -->
     </view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/patients/index.wxml b/pages/patients/index.wxml
index 5918081..49bb060 100644
--- a/pages/patients/index.wxml
+++ b/pages/patients/index.wxml
@@ -19,8 +19,8 @@
               </view>
               <view class="text-group_2">
                 <view class="text-wrapper_1">
-                  <text class="text_2">{{item.username}}</text>
-                  <text decode="true" class="text_3">
+                  <text class="text_2">{{item.username ? item.username : '患者信息未完善'}}</text>
+                  <text wx:if="{{item.username}}" decode="true" class="text_3">
                     {{item.sex == 1 ? '男':'女'}}&nbsp;·&nbsp;{{item.age}}
                   </text>
                 </view>