|
@@ -4,15 +4,24 @@ import Activity from './api/activity';
|
|
|
App({
|
|
|
onLaunch() {
|
|
|
// 展示本地存储能力
|
|
|
- // const logs = wx.getStorageSync('logs') || []
|
|
|
- // logs.unshift(Date.now())
|
|
|
- // wx.setStorageSync('logs', logs)
|
|
|
-
|
|
|
- // 登录
|
|
|
- var openId = wx.getStorageSync('loginInfo').openId
|
|
|
- if(!openId){
|
|
|
- this.login();
|
|
|
- }
|
|
|
+ var that = this;
|
|
|
+ wx.checkSession({
|
|
|
+ success: (res) => {
|
|
|
+ var openId = wx.getStorageSync('loginInfo').openId;
|
|
|
+
|
|
|
+ //过渡代码 以前存到前端的现在不存在了
|
|
|
+ var sessionKey = wx.getStorageSync('loginInfo').sessionKey;
|
|
|
+ if(!openId || sessionKey){
|
|
|
+ that.login();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ fail () {
|
|
|
+ // session_key 已经失效,需要重新执行登录流程
|
|
|
+ that.login() //重新登录
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
|
|
|
},
|
|
|
checkInvalid(param={},callBack='') {
|
|
@@ -44,12 +53,9 @@ App({
|
|
|
result.then(res=>{
|
|
|
wx.setStorageSync('loginInfo',{
|
|
|
openId:res.openId,
|
|
|
- sessionKey:res.sessionKey
|
|
|
});
|
|
|
});
|
|
|
- // if(typeof(call)=='function') {
|
|
|
- // call();
|
|
|
- // }
|
|
|
+
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -93,7 +99,8 @@ App({
|
|
|
var params = {
|
|
|
encryptedData: param.encryptedData,
|
|
|
iv: param.iv,
|
|
|
- sessionKey:Activity.getSessionKey(),
|
|
|
+ // sessionKey:Activity.getSessionKey(),
|
|
|
+ openId:wx.getStorageSync('loginInfo').openId,
|
|
|
};
|
|
|
try {
|
|
|
let res = Activity.getAuthMobile(params);
|