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 @@
:
接诊后有效
- {{filter.transforDay(equity.order_service_package.start_time,'dotdateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dotdateminute')}}
+ {{filter.transforDay(equity.order_service_package.start_time,'dotdateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dotdateminute')}}
-
+
当月时间
:
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