Commit 4646ffc7 by 梁建民

bug

parent a2b38e5f
...@@ -10,14 +10,14 @@ import { ...@@ -10,14 +10,14 @@ import {
} from './utils/api.js'; } from './utils/api.js';
App({ App({
globalData: { globalData: {
auth: wx.getStorageSync('auth'),//是否授权 auth: wx.getStorageSync('auth'), //是否授权
token: wx.getStorageSync('access_token'), token: wx.getStorageSync('access_token'),
isIPX: false, //是否为iphone X isIPX: false, //是否为iphone X
customerNum: "001",//客服 customerNum: "001", //客服
customerName: "芯掌柜客服",//客服名称 customerName: "芯掌柜客服", //客服名称
isRelogin: true, //登入环信失败后是否重新登入,只允许重新登入一次 isRelogin: true, //登入环信失败后是否重新登入,只允许重新登入一次
bus: bus,//页面之间的监听 bus: bus, //页面之间的监听
imBoolean: false,//是否是被异地登入的状态 imBoolean: false, //是否是被异地登入的状态
}, },
getImUser: chat.getImUser, getImUser: chat.getImUser,
conn: chat.conn, conn: chat.conn,
...@@ -42,9 +42,17 @@ App({ ...@@ -42,9 +42,17 @@ App({
member.push(id); member.push(id);
wx.setStorageSync("member", member) wx.setStorageSync("member", member)
}, },
onLaunch() { onLaunch(e) {
wx.removeStorageSync('is_ShowModal')//由于小程序的show切后台时会执行,导致异地登入弹窗会重复弹起,所以设置一个缓存进行转换
wx.removeStorageSync('is_ShowModal') //由于小程序的show切后台时会执行,导致异地登入弹窗会重复弹起,所以设置一个缓存进行转换
this.versionUpdate(); this.versionUpdate();
//判断是从app拉起
if (e.query.token) {
return false;
}
//验证是否授权 //验证是否授权
if (this.globalData.auth) { if (this.globalData.auth) {
//是否登录 //是否登录
...@@ -65,7 +73,7 @@ App({ ...@@ -65,7 +73,7 @@ App({
if (judgeToken()) { if (judgeToken()) {
WebIM.conn.close();//断开im重新登入 WebIM.conn.close(); //断开im重新登入
this.getImUser(); this.getImUser();
} }
......
...@@ -30,7 +30,6 @@ Page({ ...@@ -30,7 +30,6 @@ Page({
}); });
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
......
...@@ -361,6 +361,13 @@ ...@@ -361,6 +361,13 @@
"pathName": "pages/person/welfare/index", "pathName": "pages/person/welfare/index",
"query": "token= eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOi8vYXV0aGFwaS5pY3NhbGVzLmNvbS92MS9nZXR3eFVzZXJJbmZvIiwiaWF0IjoxNTcwODQzMDU0LCJleHAiOjE1NzA4NTM4NTQsIm5iZiI6MTU3MDg0MzA1NCwianRpIjoiWXMwdVRTalhnTVF6OWVRTSIsInN1YiI6MjAsInBydiI6Ijg3ZTBhZjFlZjlmZDE1ODEyZmRlYzk3MTUzYTE0ZTBiMDQ3NTQ2YWEifQ.ClJB0cBhwPar5LK_2TczezcX27n4enis4n_JtFS4wLc", "query": "token= eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOi8vYXV0aGFwaS5pY3NhbGVzLmNvbS92MS9nZXR3eFVzZXJJbmZvIiwiaWF0IjoxNTcwODQzMDU0LCJleHAiOjE1NzA4NTM4NTQsIm5iZiI6MTU3MDg0MzA1NCwianRpIjoiWXMwdVRTalhnTVF6OWVRTSIsInN1YiI6MjAsInBydiI6Ijg3ZTBhZjFlZjlmZDE1ODEyZmRlYzk3MTUzYTE0ZTBiMDQ3NTQ2YWEifQ.ClJB0cBhwPar5LK_2TczezcX27n4enis4n_JtFS4wLc",
"scene": null "scene": null
},
{
"id": -1,
"name": "pages/person/welfare/index",
"pathName": "pages/person/welfare/index",
"query": "user_id=123&token= eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOi8vYXV0aGFwaS5pY3NhbGVzLmNvbS92MS9nZXR3eFVzZXJJbmZvIiwiaWF0IjoxNTcwODQzMDU0LCJleHAiOjE1NzA4NTM4NTQsIm5iZiI6MTU3MDg0MzA1NCwianRpIjoiWXMwdVRTalhnTVF6OWVRTSIsInN1YiI6MjAsInBydiI6Ijg3ZTBhZjFlZjlmZDE1ODEyZmRlYzk3MTUzYTE0ZTBiMDQ3NTQ2YWEifQ.ClJB0cBhwPar5LK_2TczezcX27n4enis4n_JtFS4wLc",
"scene": null
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment