diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 8198646..ec71c19 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -50,9 +50,6 @@
忘记密码
注册
-
- 暂不登录,先去逛逛
-
@@ -318,15 +315,24 @@ export default {
// 微信登录
async wechatOneLogin() {
+ const then = this;
this.loading = true;
- console.log("微信登录", this.isPolicy);
+
// 检查是否同意协议
if (!this.isPolicy) {
- this.$refs.uToastRef.show({
- type: "error",
- message: "请阅读完相关协议以及政策,并且勾选同意选项",
+ uni.showModal({
+ title: '温馨提示',
+ content: '请您阅读并同意《服务协议》与《隐私政策》',
+ confirmText: "同意并登录",
+ success: (res) => {
+ if (res.confirm) {
+ this.isPolicy = true;
+ this.wechatOneLogin();
+ } else {
+ this.loading = false;
+ }
+ }
});
- this.loading = false;
return;
}
@@ -351,7 +357,7 @@ export default {
"微信登录接口返回-2:",
response,
response.data,
- response.data.token,
+ response.data.token
);
if (response && response.bizcode === 100) {
@@ -444,7 +450,7 @@ export default {
});
}
});
- },
+ }
);
},
},
@@ -532,15 +538,4 @@ export default {
margin-bottom: 80rpx;
}
}
-
-.skip_login_warp {
- margin-top: 40rpx;
- text-align: center;
- font-size: 28rpx;
- color: #999;
- padding: 20rpx;
- border: 1px solid #999;
- border-radius: 20rpx;
- color: #7934F6;
-}
\ No newline at end of file