diff --git a/Pages/index/index.js b/Pages/index/index.js index 9fdfb96..e40eb50 100644 --- a/Pages/index/index.js +++ b/Pages/index/index.js @@ -118,7 +118,13 @@ Page({ app.imLogout(); url = "/Pages/yaoshi/home/home"; } - let token = wx.getStorageSync('AUTH_TOKEN_'+usertype); + let token = ''; + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + token= wx.getStorageSync('AUTH_TOKEN_'+usertype) + }else{ + token= wx.getStorageSync('DEV_AUTH_TOKEN_'+usertype) + } console.log(token); console.log(url); if(token){ diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js index 0f2c357..ecb670d 100644 --- a/Pages/yaoshi/my/my.js +++ b/Pages/yaoshi/my/my.js @@ -35,7 +35,14 @@ Page({ success (res) { if (res.confirm) { console.log('用户点击确定') - wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + //wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, ''); + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype,''); + + } wx.setStorageSync('user_id_'+usertype, ""); wx.setStorageSync('client_user_id_'+usertype, ""); app.globalData.isLogin=false; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index bf2f2b2..0c5785a 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -87,7 +87,8 @@ 不接诊5分钟后自动取消 - 不接诊24小时后自动取消 + 不接诊24小时后自动取消 + 不接诊72小时后自动取消 diff --git a/app.js b/app.js index 87538b4..37b2ca9 100644 --- a/app.js +++ b/app.js @@ -49,6 +49,7 @@ App({ if(userID == ""){ return; } + this.globalData.config.userID = userID; // let sign = genTestUserSig(this.globalData.config); // console.log("sign: ", sign); @@ -170,7 +171,13 @@ App({ onKickedOut(){ // console.log("onKickedOutonKickedOutonKickedOutonKickedOut"); let usertype = wx.getStorageSync('usertype'); - wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + // wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, ''); + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, ''); + } wx.setStorageSync('user_id_'+usertype, ""); wx.setStorageSync('client_user_id_'+usertype, ""); if(wx.$TUIKit){ diff --git a/user/pages/login/index.js b/user/pages/login/index.js index 1aaa539..52ea1a4 100644 --- a/user/pages/login/index.js +++ b/user/pages/login/index.js @@ -145,8 +145,15 @@ Page({ wx_code: res.code } api.wechatMobileLogin(params).then(response => { - console.log(response); - wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); + // console.log(response); + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, response.data.token); + + } + wx.setStorageSync('user_id_'+usertype, response.data.user_id); wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id); app.globalData.config.userID = response.data.user_id; diff --git a/user/pages/mobile_login/index.js b/user/pages/mobile_login/index.js index 591c8e1..4f74db7 100644 --- a/user/pages/mobile_login/index.js +++ b/user/pages/mobile_login/index.js @@ -138,8 +138,14 @@ Page({ api.mobileLogin(params).then(response => { app.globalData.isLogin=true; - console.log(response); - wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, response.data.token); + + } + // wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); wx.setStorageSync('user_id_'+usertype, response.data.user_id); wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id); app.globalData.config.userID = response.data.user_id; diff --git a/user/pages/yaoshi/my/my.js b/user/pages/yaoshi/my/my.js index 5e700c3..6ee6c16 100644 --- a/user/pages/yaoshi/my/my.js +++ b/user/pages/yaoshi/my/my.js @@ -35,7 +35,13 @@ Page({ success (res) { if (res.confirm) { console.log('用户点击确定') - wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, ''); + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, ''); + } + // wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); wx.setStorageSync('user_id_'+usertype, ""); wx.setStorageSync('client_user_id_'+usertype, ""); app.globalData.isLogin=false; diff --git a/user/pages/yishi/myinfo/index.js b/user/pages/yishi/myinfo/index.js index a377c86..9df9b0e 100644 --- a/user/pages/yishi/myinfo/index.js +++ b/user/pages/yishi/myinfo/index.js @@ -51,7 +51,13 @@ Page({ if (res.confirm) { console.log('用户点击确定') let usertype = wx.getStorageSync('usertype'); - wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, ''); + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, ''); + } + // wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); wx.setStorageSync('user_id_'+usertype, ""); wx.setStorageSync('client_user_id_'+usertype, ""); diff --git a/utils/network/request.js b/utils/network/request.js index d54573d..f14fdd2 100644 --- a/utils/network/request.js +++ b/utils/network/request.js @@ -28,19 +28,32 @@ class HTTP { _request(url, resolve, reject, data = {}, method = 'GET', contentType = 'application/json', showLoading = true) { if(showLoading) wx.showLoading(); let usertype = wx.getStorageSync('usertype'); + let token=''; + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + token= wx.getStorageSync('AUTH_TOKEN_'+usertype) + }else{ + token= wx.getStorageSync('DEV_AUTH_TOKEN_'+usertype) + } wx.request({ url: url, method: method, data: data, header: { 'content-type': contentType, - 'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype) + 'Authorization': "Bearer " + token }, success: (res) => { // console.log("header Authorization: ", res.header.Authorization); var Authorization_token = res.header.Authorization; if(Authorization_token){ - wx.setStorageSync('AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时,服务器会返回新token,本地刷新 + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + wx.setStorageSync('AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时,服务器会返回新token,本地刷新 + }else{ + wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时,服务器会返回新token,本地刷新 + } + } if (res.data) { const code = res.data.code;