From 82fa044116fd3f02196d0989d7d22b7da42041cf Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 7 May 2024 10:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../healthyOrderDetail.wxml                   |  4 +--
 patient/pages/login/login.js                  |  8 +++++-
 patient/pages/mobileLogin/mobileLogin.js      |  7 ++++-
 utils/request.js                              | 28 +++++++++++++++++--
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index 72e5036..5c24d7e 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -182,9 +182,9 @@
       <view  class="dot">：</view>
      </view>
      <view class="desc time" wx:if="{{order.order_service_status==2}}"><text class="red">接诊后有效</text></view>
-     <view class="desc time" wx:elif="{{order.order_service_status==3}}"><text class="red">{{filter.transforDay(equity.order_service_package.start_time,'dotdateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dotdateminute')}}</text></view>
+     <view class="desc time" wx:elif="{{order.order_service_status==3 || order.order_service_status==4}}"><text class="red">{{filter.transforDay(equity.order_service_package.start_time,'dotdateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dotdateminute')}}</text></view>
     </view>
-    <view class="row" style="align-items: flex-start;" wx:if="{{ order.order_service_status==3 || order.order_service_status==4}}">
+    <view class="row" style="align-items: flex-start;" wx:if="{{ order.order_service_status==3 }}">
         <view class="namebox">
       <view class="name">当月时间</view>
       <view  class="dot">：</view>
diff --git a/patient/pages/login/login.js b/patient/pages/login/login.js
index de7e826..c6129af 100644
--- a/patient/pages/login/login.js
+++ b/patient/pages/login/login.js
@@ -80,7 +80,13 @@ Page({
           user_type: 1,
           wx_code: res
         }).then((data)=>{
-           wx.setStorageSync('AUTH_TOKEN', data.token);
+            const { envVersion } = wx.getAccountInfoSync().miniProgram;
+            if(envVersion=='release'){
+                 wx.setStorageSync('AUTH_TOKEN', data.token);
+            }else{
+                 wx.setStorageSync('DEV_AUTH_TOKEN', data.token); 
+            }
+         
            wx.setStorageSync('CLIENT_USER_ID',data.client_user_id);
            wx.setStorageSync('USER_ID',data.user_id);
           let url=this.data.redirectUrl?this.data.redirectUrl:'/pages/index/index';
diff --git a/patient/pages/mobileLogin/mobileLogin.js b/patient/pages/mobileLogin/mobileLogin.js
index 28b2d98..f1c1963 100644
--- a/patient/pages/mobileLogin/mobileLogin.js
+++ b/patient/pages/mobileLogin/mobileLogin.js
@@ -128,7 +128,12 @@ Page({
         user_type:1,
         wx_code:res
       }).then((data)=>{
-         wx.setStorageSync('AUTH_TOKEN', data.token);
+        const { envVersion } = wx.getAccountInfoSync().miniProgram;
+        if(envVersion=='release'){
+             wx.setStorageSync('AUTH_TOKEN', data.token);
+        }else{
+             wx.setStorageSync('DEV_AUTH_TOKEN', data.token); 
+        }
          wx.setStorageSync('CLIENT_USER_ID',data.client_user_id);
          wx.setStorageSync('USER_ID',data.user_id);
         let url=this.data.redirectUrl?this.data.redirectUrl:'/pages/index/index';
diff --git a/utils/request.js b/utils/request.js
index c8e75de..dbbc001 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -20,7 +20,15 @@ function request(url, method, data, loding = false) {
       mask: true
     })
   }
-  let token = wx.getStorageSync('AUTH_TOKEN');
+   let token='';
+  const { envVersion } = wx.getAccountInfoSync().miniProgram;
+  if(envVersion=='release'){
+    token = wx.getStorageSync('AUTH_TOKEN');
+  }else{
+    token = wx.getStorageSync('DEV_AUTH_TOKEN');
+      
+  }
+  
   if (!token) {
     let freelist = ["/login/wechat_mobile_login", '/login/mobile_login','/code/phone','/patient/index',"/popup","/sign/im"];//接口白名单
     let currentUrl=getCurrentPageUrl();
@@ -53,7 +61,14 @@ function request(url, method, data, loding = false) {
         
         var Authorization_token = res.header.Authorization;
         if (Authorization_token) {
-          wx.setStorageSync('AUTH_TOKEN', Authorization_token); //当token快过期时，服务器会返回新token，本地刷新
+            const { envVersion } = wx.getAccountInfoSync().miniProgram;
+            if(envVersion=='release'){
+                wx.setStorageSync('AUTH_TOKEN', Authorization_token);
+            }else{
+                wx.setStorageSync('DEV_AUTH_TOKEN', Authorization_token); 
+                
+            }
+         //当token快过期时，服务器会返回新token，本地刷新
         }
         if (loding) {
           wx.hideLoading()
@@ -90,7 +105,14 @@ function request(url, method, data, loding = false) {
         }else if (Number(res.data.code) == 401 || Number(res.data.code) == 403 || Number(res.data.code) == 405 || Number(res.data.code) == 406) {
             let redirectUrl=formatUrl();
             if(!isLock){
-             wx.setStorageSync('AUTH_TOKEN','');
+                const { envVersion } = wx.getAccountInfoSync().miniProgram;
+                if(envVersion=='release'){
+                    wx.setStorageSync('AUTH_TOKEN','');
+                }else{
+                    wx.setStorageSync('DEV_AUTH_TOKEN','');
+                    
+                }
+            //  wx.setStorageSync('AUTH_TOKEN','');
               isLock=true;
               wx.reLaunch({
                 url: '/patient/pages/login/login?redirectUrl='+redirectUrl