Commit 4f0e91a3 by 高淑倩

modify: relogin

parent 3dc4e11e
......@@ -55,6 +55,8 @@ wxService.page({
const baseUserInfo = wx.getStorageSync('_baseUserInfo')
baseUserInfo.memberActivateStatus = true
wx.setStorageSync('_baseUserInfo',baseUserInfo)
// 更新缓存信息 relogin
wxService.relogin()
wx.hideLoading()
wxService.router(`/pages/userCenter/userCenter`)
......
......@@ -263,6 +263,7 @@ function getUserInfoByBtn(userInfo) {
return Promise.all([Promise.resolve(userInfo), Promise.resolve(res)])
}).then((res) => {
logger.log(' wx _userInfo success res --->', res)
wx.setStorageSync('_wechatInfo', res[0])
wx.setStorageSync('_userInfo', res[0].userInfo)
wx.showLoading({
title: '正在加载...',
......
......@@ -49,22 +49,25 @@ class WXService extends Http {
}).catch(res => {
console.log(res)
if (res.msg.indexOf('未登录') > -1) {
wx.setStorageSync('token', '')
var _this = this
let userInfo = wx.getStorageSync('_baseUserInfo')
_this.login().then(result=>{
if(result.code){
_this.post(`/member/minaLogin`, {
code: result.code,
wechatInfo: userInfo,
brandId: 1001,
}).then(response=>{
let dataResp = response.data.data
wx.setStorageSync('token', dataResp.token)
wx.setStorageSync('_baseUserInfo', dataResp)
})
}
})
// 重新登陆 更新缓存
this.reLogin()
// wx.setStorageSync('token', '')
// const app = getApp()
// var _this = this
// let userInfo = wx.getStorageSync('_baseUserInfo')
// _this.login().then(result=>{
// if(result.code){
// _this.post(`/member/minaLogin`, {
// code: result.code,
// wechatInfo: userInfo,
// brandId: app.globalData.brandId,
// }).then(response=>{
// let dataResp = response.data.data
// wx.setStorageSync('token', dataResp.token)
// wx.setStorageSync('_baseUserInfo', dataResp)
// })
// }
// })
} else if (res.state === 402) {
return this.getUserInfo().then(() => {
......@@ -108,6 +111,7 @@ class WXService extends Http {
})
}
}
/**
* 页面导航
* @param url
......@@ -128,6 +132,30 @@ class WXService extends Http {
all () {
return Promise.all.apply(Promise, arguments)
}
/**
* 更新缓存 登陆
*
*/
reLogin() {
wx.setStorageSync('token', '')
const app = getApp()
var _this = this
let wechatInfo = wx.getStorageSync('_wechatInfo')
_this.login().then(result=>{
if(result.code){
_this.post(`/member/minaLogin`, {
code: result.code,
wechatInfo,
brandId: app.globalData.brandId,
}).then(response=>{
let dataResp = response.data.data
wx.setStorageSync('token', dataResp.token)
wx.setStorageSync('_baseUserInfo', dataResp)
})
}
})
}
login () {
return new Promise((resolve, reject) => {
......
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 to comment