feat: 调整了登录的代码

src/pages/login/index.vue

@@ -28,9 +28,10 @@
     <!-- 按钮区域 -->
     <view class="login-btn-area">
       <!-- 同意隐私协议并获取手机号按钮 -->
-
-      <button class="login-btn" type="primary" :open-type="needWxLogin ? 'getPhoneNumber' : ''"
-        @getphonenumber="getPhoneNumber" @click="handleAgreeAndGetPhone">
+      <button v-if="needWxLogin" class="login-btn" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+        手机号快捷登录
+      </button>
+      <button v-else class="login-btn" type="primary" @click="handleAgreeAndGetPhone">
         手机号快捷登录
       </button>
     </view>
@@ -76,19 +77,29 @@ const handleAgreeAndGetPhone = () => {
     return;
   }
 
-  refreshToken(true).then(() => goBack());
+  refreshToken(true).then(() => loginSuccess());
 };
 
+/// 获取授权后绑定手机号登录
 const getPhoneNumber = (e) => {
-  onLogin(e)
-    .then(() => {
+  if (!isAgree.value) {
+    uni.showToast({
+      title: "请先同意服务协议和隐私协议",
+      icon: "none",
+    });
+    return;
+  }
+  onLogin(e).then(() => loginSuccess())
+    .catch(() => { });
+};
+
+/// 登录成功返回上一页
+const loginSuccess = () => {
   uni.showToast({
     title: "登录成功",
     icon: "success",
   });
   goBack();
-    })
-    .catch(() => { });
 };
 
 // 处理同意协议点击事件
@@ -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;
 });
+
+
 </script>
 
 <style lang="scss" scoped>