Commit 6aeef5b6 by hxx

协议 fix

parent 3fdc1595
......@@ -164,6 +164,8 @@ export default {
userAgreement: {},
privacyPolicy: {},
tempData: null,
registerFlag: false, // 是否注册
onceFlag: false,
};
},
computed: {
......@@ -465,17 +467,22 @@ export default {
title: '登录中...',
mask: true
})
if (this.tempData) {
if(this.content&&!this.checked) {
if(this.content&&!this.checked&&this.onceFlag) {
wx.hideLoading()
if (this.registerFlag) {
this.showRegisterProtocol();
} else {
wx.showToast({
title: '您还未同意协议',
icon: "none"
});
return;
}
this.handleSuccess();
return
}
if (this.userInfo) {
if (this.tempData) return this.handleSuccess()
return this.initUserInfo();
}
// 推荐使用wx.getUserProfile获取用户信息,开发者每次通过该接口获取用户个人信息均需用户确认
// 开发者妥善保管用户快速填写的头像昵称,避免重复弹窗
wx.getUserProfile({
......@@ -493,6 +500,7 @@ export default {
})
},
async initUserInfo() {
this.onceFlag = true;
this.initUser().then(res => {
wx.hideLoading();
//存入openid
......@@ -510,9 +518,32 @@ export default {
this.unionId = res.data.data.unionId || '';
this.sessionId = res.data.data.sessionId || '';
this.tempData = res.data.data;
if(this.content&&!this.checked) {
// 第一次注册
if (!res.data.data.isHaveUnion) {
if (this.content&&!this.checked) {
if (this.registerFlag) {
this.showRegisterProtocol();
} else {
wx.showToast({
title: '您还未同意协议',
icon: "none"
});
}
return;
}
this.handleSuccess();
}).catch(err => {
wx.hideLoading();
if (err == '请勾选用户协议') {
this.showRegisterProtocol();
} else {
log.info("err", err);
wx.showToast({
title: err,
icon: "none"
});
}
});
},
showRegisterProtocol() {
let text = '';
if (this.userAgreement && this.privacyPolicy) {
text = `《${this.userAgreement.agreementName}》和《${this.privacyPolicy.agreementName}》`;
......@@ -528,28 +559,19 @@ export default {
cancelText: "再想想",
confirmText: "查看协议",
success: (res) => {
if (!this.registerFlag) {
wx.login({
success: res => {
this.code = res.code;
this.registerFlag = true;
}
})
}
if (res.confirm) {
this.handleDetail(0);
}
}
})
} else {
wx.showToast({
title: '您还未同意协议',
icon: "none"
});
}
return;
}
this.handleSuccess();
}).catch(err => {
wx.hideLoading();
log.info("err", err);
wx.showToast({
title: err,
icon: "none"
});
});
},
handleSuccess() {
if (this.tempData.isHaveUnion == "true" || this.mpApp.globalData.shopInfo.haveBindUserPhone == '1') {
......
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