Commit 4f0e91a3 by 高淑倩

modify: relogin

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