Commit 8638651d by 李嘉林

feat: 登录优先校验协议

parent 98428123
...@@ -467,12 +467,7 @@ export default { ...@@ -467,12 +467,7 @@ export default {
getUserProfile() { getUserProfile() {
log.info('点击了微信一键登录'); log.info('点击了微信一键登录');
console.log('点击了微信一键登录'); console.log('点击了微信一键登录');
wx.showLoading({ if(this.content&&!this.checked) {
title: '登录中...',
mask: true
})
console.log('登录中...');
if(this.content&&!this.checked&&this.onceFlag) {
wx.hideLoading() wx.hideLoading()
if (this.registerFlag) { if (this.registerFlag) {
this.showRegisterProtocol(); this.showRegisterProtocol();
...@@ -484,6 +479,11 @@ export default { ...@@ -484,6 +479,11 @@ export default {
} }
return return
} }
wx.showLoading({
title: '登录中...',
mask: true
})
console.log('登录中...');
console.log('同意协议...',this.userInfo); console.log('同意协议...',this.userInfo);
if (this.userInfo) { if (this.userInfo) {
if (this.tempData) return this.handleSuccess() if (this.tempData) return this.handleSuccess()
...@@ -507,7 +507,6 @@ export default { ...@@ -507,7 +507,6 @@ export default {
}) })
}, },
async initUserInfo() { async initUserInfo() {
this.onceFlag = true;
this.initUser().then(res => { this.initUser().then(res => {
wx.hideLoading(); wx.hideLoading();
//存入openid //存入openid
......
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