|
|
|
@ -57,8 +57,7 @@ Page({ |
|
|
|
app.globalData.token = authorization |
|
|
|
config.header = { 'Authorization': 'QNT ' + authorization } |
|
|
|
getUserInfo().then(result => { |
|
|
|
app.globalData.userInfo = result.data |
|
|
|
this.setData({ loging: false}) |
|
|
|
app.globalData.userInfo = result.data |
|
|
|
loginToken({loginToken: app.globalData.token}).then(result => { |
|
|
|
zconfig.header = { 'Authorization': 'QNT ' + result.data.token } |
|
|
|
pconfig.header = { 'Authorization': 'QNT ' + result.data.token } |
|
|
|
@ -67,13 +66,15 @@ Page({ |
|
|
|
if(!util.isEmpty(result.data.userToken)){ |
|
|
|
this.handleUserToken(result.data.userToken) |
|
|
|
} else { |
|
|
|
this.setData({ loging: false}) |
|
|
|
wx.hideLoading() |
|
|
|
wx.navigateBack() |
|
|
|
event.emit('EventMessage', { what: 888, desc: 'Logined' }) |
|
|
|
} |
|
|
|
}).catch(err => { |
|
|
|
console.log(err) |
|
|
|
this.setData({ loging: false}) |
|
|
|
app.globalData.token = null |
|
|
|
storage.remove('Authorization') |
|
|
|
config.header = null |
|
|
|
wx.hideLoading() |
|
|
|
util.showToast(err) |
|
|
|
@ -81,14 +82,17 @@ Page({ |
|
|
|
}) |
|
|
|
}).catch(err => { |
|
|
|
wx.hideLoading() |
|
|
|
this.setData({ loging: false}) |
|
|
|
app.globalData.token = null |
|
|
|
storage.remove('Authorization') |
|
|
|
config.header = null |
|
|
|
this.setData({ loging: false}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
handleUserToken: function(userToken){ |
|
|
|
storage.put('accessToken', userToken) |
|
|
|
sconfig.header = {'userToken': userToken } |
|
|
|
sconfig.header = {'user-token': userToken } |
|
|
|
|
|
|
|
}, |
|
|
|
changePwd: function () { |
|
|
|
if (this.data.pwdType === 'password') { |
|
|
|
@ -184,7 +188,7 @@ Page({ |
|
|
|
onGotUserInfo: function (e) { |
|
|
|
this.setData({ loging: true }) |
|
|
|
loginWechat({ encryptedData: e.detail.encryptedData, iv: e.detail.iv }).then(result => { |
|
|
|
wx.setStorageSync('Authorization', result.data.token) |
|
|
|
storage.put('Authorization', result.data.token) |
|
|
|
app.globalData.token = result.data.token |
|
|
|
this.fetchUserInfo() |
|
|
|
}).catch(error => { |
|
|
|
|