diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 33f4cf9..e2995d9 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -28,9 +28,10 @@
-
-
@@ -76,21 +77,31 @@ const handleAgreeAndGetPhone = () => {
return;
}
- refreshToken(true).then(() => goBack());
+ refreshToken(true).then(() => loginSuccess());
};
+/// 获取授权后绑定手机号登录
const getPhoneNumber = (e) => {
- onLogin(e)
- .then(() => {
- uni.showToast({
- title: "登录成功",
- icon: "success",
- });
- goBack();
- })
+ if (!isAgree.value) {
+ uni.showToast({
+ title: "请先同意服务协议和隐私协议",
+ icon: "none",
+ });
+ return;
+ }
+ onLogin(e).then(() => loginSuccess())
.catch(() => { });
};
+/// 登录成功返回上一页
+const loginSuccess = () => {
+ uni.showToast({
+ title: "登录成功",
+ icon: "success",
+ });
+ goBack();
+};
+
// 处理同意协议点击事件
const handleAgreeClick = (type) => {
visible.value = true;
@@ -111,7 +122,6 @@ const getServiceAgreementData = async () => {
const { data } = await getServiceAgreement();
serviceAgreement.value = data;
};
-
getServiceAgreementData();
// 获取隐私协议数据
@@ -119,15 +129,15 @@ const getPrivacyAgreementData = async () => {
const { data } = await getPrivacyAgreement();
privacyAgreement.value = data;
};
-
getPrivacyAgreementData();
// 页面显示时刷新token
onShow(async () => {
const res = await refreshToken();
-
needWxLogin.value = res;
});
+
+