|
|
@ -34,8 +34,8 @@ Page({ |
|
|
this.setData({ ['form.mobile']: options.mobile }) |
|
|
this.setData({ ['form.mobile']: options.mobile }) |
|
|
} |
|
|
} |
|
|
this.wxLogin() |
|
|
this.wxLogin() |
|
|
var check = wx.getStorageSync('AgreeCheck') |
|
|
|
|
|
app.globalData.kg = wx.getStorageSync('ztb-kg') |
|
|
|
|
|
|
|
|
var check = storage.get('AgreeCheck') |
|
|
|
|
|
app.globalData.kg = storage.get('ztb-kg') |
|
|
if (check) { |
|
|
if (check) { |
|
|
this.setData({check: true}) |
|
|
this.setData({check: true}) |
|
|
} |
|
|
} |
|
|
@ -50,7 +50,7 @@ Page({ |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
fetchUserInfo: function () { |
|
|
fetchUserInfo: function () { |
|
|
var authorization = app.globalData.token || wx.getStorageSync('Authorization') |
|
|
|
|
|
|
|
|
var authorization = app.globalData.token || storage.get('Authorization') |
|
|
if (util.isEmpty(authorization)) { |
|
|
if (util.isEmpty(authorization)) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
@ -64,9 +64,13 @@ Page({ |
|
|
pconfig.header = { 'Authorization': 'QNT ' + result.data.token } |
|
|
pconfig.header = { 'Authorization': 'QNT ' + result.data.token } |
|
|
mconfig.header = { 'Authorization': 'QNT ' + result.data.token } |
|
|
mconfig.header = { 'Authorization': 'QNT ' + result.data.token } |
|
|
// 登录流程完成;
|
|
|
// 登录流程完成;
|
|
|
wx.hideLoading() |
|
|
|
|
|
wx.navigateBack() |
|
|
|
|
|
event.emit('EventMessage', { what: 888, desc: 'Logined' }) |
|
|
|
|
|
|
|
|
if(!util.isEmpty(result.data.userToken)){ |
|
|
|
|
|
this.handleUserToken(result.data.userToken) |
|
|
|
|
|
} else { |
|
|
|
|
|
wx.hideLoading() |
|
|
|
|
|
wx.navigateBack() |
|
|
|
|
|
event.emit('EventMessage', { what: 888, desc: 'Logined' }) |
|
|
|
|
|
} |
|
|
}).catch(err => { |
|
|
}).catch(err => { |
|
|
console.log(err) |
|
|
console.log(err) |
|
|
app.globalData.token = null |
|
|
app.globalData.token = null |
|
|
@ -82,6 +86,10 @@ Page({ |
|
|
this.setData({ loging: false}) |
|
|
this.setData({ loging: false}) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
handleUserToken: function(userToken){ |
|
|
|
|
|
storage.put('accessToken', userToken) |
|
|
|
|
|
sconfig.header = {'userToken': userToken } |
|
|
|
|
|
}, |
|
|
changePwd: function () { |
|
|
changePwd: function () { |
|
|
if (this.data.pwdType === 'password') { |
|
|
if (this.data.pwdType === 'password') { |
|
|
this.setData({ pwdType: 'text' }) |
|
|
this.setData({ pwdType: 'text' }) |
|
|
@ -125,9 +133,8 @@ Page({ |
|
|
} |
|
|
} |
|
|
wx.showLoading({ title: '登录中', mask: true }) |
|
|
wx.showLoading({ title: '登录中', mask: true }) |
|
|
if (this.data.type == 1) { |
|
|
if (this.data.type == 1) { |
|
|
// /authorize/by-captcha 验证码认证
|
|
|
|
|
|
loginCaptcha(this.data.form).then(result => { |
|
|
loginCaptcha(this.data.form).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 => { |
|
|
|