From 428c0064f852440bf15e866ad70bd6eec56289cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E5=93=A5?= <17630302050@163.com>
Date: Fri, 4 Jul 2025 22:09:48 +0800
Subject: [PATCH] qwew

---
 api/request.js                         | 18 +++++++++++-------
 pages/AddTherapeuticRegimen/index.js   |  2 +-
 pages/AddTherapeuticRegimen/index.wxml |  4 ++--
 pages/followUp/index.js                |  2 +-
 pages/followUp/index.wxml              |  2 +-
 pages/home/index.less                  |  3 ++-
 pages/home/index.wxml                  |  4 ++--
 pages/message/index.less               |  3 ++-
 pages/mmp-7/index.js                   |  2 +-
 pages/my/info-edit/index.js            |  4 ++--
 10 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/api/request.js b/api/request.js
index a8007df..b01acec 100644
--- a/api/request.js
+++ b/api/request.js
@@ -22,13 +22,17 @@ function request(url, method = 'GET', data = {}) {
           if (res.data.code == 10103) {
             wx.removeStorageSync('access_token');
             if (!isNavigatingToLogin) {
-              isNavigatingToLogin = true;
-              wx.navigateTo({
-                url: '/pages/login/login',
-                complete: () => {
-                  isNavigatingToLogin = false;
-                }
-              });
+              const pages = getCurrentPages();
+              const currentRoute = pages[pages.length - 1]?.route;
+              if (currentRoute !== 'pages/login/login') {
+                isNavigatingToLogin = true;
+                wx.navigateTo({
+                  url: '/pages/login/login',
+                  complete: () => {
+                    isNavigatingToLogin = false;
+                  }
+                });
+              }
             }
             reject(res.data);
           }
diff --git a/pages/AddTherapeuticRegimen/index.js b/pages/AddTherapeuticRegimen/index.js
index 9e2d311..00e2f7e 100644
--- a/pages/AddTherapeuticRegimen/index.js
+++ b/pages/AddTherapeuticRegimen/index.js
@@ -343,7 +343,7 @@ Page({
     
   },
   handleUpload(e) {
-    wx.chooseMessageFile({
+    wx.chooseImage({
       count: 1, // 选择一个文件
       type: 'all', // 支持所有类型的文件
       success: (res) => {
diff --git a/pages/AddTherapeuticRegimen/index.wxml b/pages/AddTherapeuticRegimen/index.wxml
index 45dae8f..53869f1 100644
--- a/pages/AddTherapeuticRegimen/index.wxml
+++ b/pages/AddTherapeuticRegimen/index.wxml
@@ -20,13 +20,13 @@
       <t-row gutter="12">
         <t-col span="12">
           <view class="input-example">
-            <t-input placeholder="开始时间" bindtap="showPicker" value="{{start_date}}" data-mode="start_date" borderless="{{true}}" />
+            <t-input placeholder="开始时间" readonly bindtap="showPicker" value="{{start_date}}" data-mode="start_date" borderless="{{true}}" />
             <text class="tip">—</text>
           </view>
         </t-col>
         <t-col span="12">
           <view class="input-example">
-            <t-input placeholder="结束时间" bindtap="showPicker" value="{{end_date}}" data-mode="end_date" borderless="{{true}}" />
+            <t-input placeholder="结束时间" readonly bindtap="showPicker" value="{{end_date}}" data-mode="end_date" borderless="{{true}}" />
           </view>
         </t-col>
       </t-row>
diff --git a/pages/followUp/index.js b/pages/followUp/index.js
index e13d199..ea686a2 100644
--- a/pages/followUp/index.js
+++ b/pages/followUp/index.js
@@ -287,7 +287,7 @@ Page({
     
   },
   handleUpload(e) {
-    wx.chooseMessageFile({
+    wx.chooseImage({
       count: 1, // 选择一个文件
       type: 'all', // 支持所有类型的文件
       success: (res) => {
diff --git a/pages/followUp/index.wxml b/pages/followUp/index.wxml
index 92b27ec..e721506 100644
--- a/pages/followUp/index.wxml
+++ b/pages/followUp/index.wxml
@@ -11,7 +11,7 @@
     </view>
     <view class="input-example">
       <view class="custom-label">随访日期</view>
-      <t-input placeholder="请选择" bindtap="showPicker" size="small" borderless="{{true}}" style="{{style}}" data-mode="birth" suffixIcon="{{ { name: 'calendar-1'} }}" note="'请选择'" value="{{form.follow_date}}"
+      <t-input placeholder="请选择" bindtap="showPicker" readonly size="small" borderless="{{true}}" style="{{style}}" data-mode="birth" suffixIcon="{{ { name: 'calendar-1'} }}" note="'请选择'" value="{{form.follow_date}}"
       data-tips="isTime"
       status="error"
       tips="{{isTime ? '':'请选择随访日期'}}" />
diff --git a/pages/home/index.less b/pages/home/index.less
index 0069b56..af71fd5 100644
--- a/pages/home/index.less
+++ b/pages/home/index.less
@@ -27,10 +27,11 @@
     
     .item-title-img{
       height: 36rpx;
-      // width: auto;
+      width: auto;
     }
     .item-title-img-2{
       height: 96rpx;
+      width: auto;
       position: relative;
       left: -24rpx;
       // margin-top: -28rpx;
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 0c16f20..0fa7850 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -22,8 +22,8 @@
       </view>
       <text class="echarts-title">{{activeIndex == 0 ? '身高（cm）':'体重（g）'}}</text>
       <view class="echarts-canvas-container">
-        <ec-canvas wx:if="{{ activeIndex == 0 }}" id="mychart-dom-height" canvas-id="mychart-height" ec="{{ ec }}" force-use-old-canvas="true"></ec-canvas>
-        <ec-canvas wx:else id="mychart-dom-weight" canvas-id="mychart-weight" ec="{{ ec2 }}" force-use-old-canvas="true"></ec-canvas>
+        <ec-canvas wx:if="{{ activeIndex == 0 }}" id="mychart-dom-height" canvas-id="mychart-height" ec="{{ ec }}" ></ec-canvas>
+        <ec-canvas wx:else id="mychart-dom-weight" canvas-id="mychart-weight" ec="{{ ec2 }}" ></ec-canvas>
       </view>
     </view>
     <view class="item-content item-content-1">
diff --git a/pages/message/index.less b/pages/message/index.less
index 05d2b1d..a80b8db 100644
--- a/pages/message/index.less
+++ b/pages/message/index.less
@@ -1,7 +1,7 @@
 /* pages/clockIn/index.wxss */
 .clockin{
   padding: 28rpx;
-  padding-bottom: 160rpx;
+  padding-bottom: 130rpx;
   position: relative;
   .clockin-img{
 
@@ -73,6 +73,7 @@
     justify-content: center;
     width: 100%;
     left: 0;
+    z-index: 2;
     view{
       width: 246rpx;
       height: 82rpx;
diff --git a/pages/mmp-7/index.js b/pages/mmp-7/index.js
index 00045f3..617679c 100644
--- a/pages/mmp-7/index.js
+++ b/pages/mmp-7/index.js
@@ -81,7 +81,7 @@ handleUpload(e) {
   const { mode } = e.currentTarget.dataset;
 
 
-  wx.chooseMessageFile({
+  wx.chooseImage({
     count: 1, // 选择一个文件
     type: 'all', // 支持所有类型的文件
     success: (res) => {
diff --git a/pages/my/info-edit/index.js b/pages/my/info-edit/index.js
index c8d730c..2ea8a98 100644
--- a/pages/my/info-edit/index.js
+++ b/pages/my/info-edit/index.js
@@ -352,8 +352,8 @@ Page({
       icon: 'success',
       duration: 2000, 
       complete: () => {
-        wx.navigateBack({
-          delta: 1
+        wx.switchTab({
+          url: '/pages/my/index'
         })
       }
     })