Browse Source

no message

featrue/v4.1
xpz2018 5 years ago
parent
commit
d725ac7681
1 changed files with 9 additions and 5 deletions
  1. 14
      pages/login/index.js

14
pages/login/index.js

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

Loading…
Cancel
Save