From 8914d65fbb8cf4cdfce8bca2f647ba9b127167e9 Mon Sep 17 00:00:00 2001
From: huppygo <huppygo@qq.com>
Date: Sat, 22 Mar 2025 12:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=92=E7=BB=9D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8D=8F=E8=AE=AE=E4=B8=8E=E9=9A=90=E7=A7=81=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=EF=BC=8C=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20=E6=BB=A1=E8=B6=B3=E9=83=A8=E5=88=86=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=88=86=E5=8F=91=E5=B8=82=E5=9C=BA=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=9C=80=E6=B1=82=20=E6=8B=92=E7=BB=9D=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=82=B9=E5=87=BB=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-auth-modal/components/account-login.vue | 16 ++--
 .../s-auth-modal/components/sms-login.vue     | 35 +++++--
 .../components/s-auth-modal/s-auth-modal.vue  | 94 +++++++++++++++----
 3 files changed, 111 insertions(+), 34 deletions(-)

diff --git a/sheep/components/s-auth-modal/components/account-login.vue b/sheep/components/s-auth-modal/components/account-login.vue
index 579614c3..d5d60563 100644
--- a/sheep/components/s-auth-modal/components/account-login.vue
+++ b/sheep/components/s-auth-modal/components/account-login.vue
@@ -60,8 +60,8 @@
 
   const props = defineProps({
     agreeStatus: {
-      type: Boolean,
-      default: false,
+      type: [Boolean, null],
+      default: null,
     },
   });
 
@@ -87,10 +87,14 @@
       });
     if (!validate) return;
 
-    // 同意协议
-    if (!props.agreeStatus) {
-      emits('onConfirm', true)
-      sheep.$helper.toast('请勾选同意');
+    // 检查协议状态
+    if (props.agreeStatus !== true) {
+      emits('onConfirm', true);
+      if (props.agreeStatus === false) {
+        sheep.$helper.toast('您已拒绝协议，无法继续登录');
+      } else {
+        sheep.$helper.toast('请选择是否同意协议');
+      }
       return;
     }
 
diff --git a/sheep/components/s-auth-modal/components/sms-login.vue b/sheep/components/s-auth-modal/components/sms-login.vue
index 0651b780..8b728acd 100644
--- a/sheep/components/s-auth-modal/components/sms-login.vue
+++ b/sheep/components/s-auth-modal/components/sms-login.vue
@@ -31,9 +31,9 @@
           <template v-slot:right>
             <button
               class="ss-reset-button code-btn code-btn-start"
-              :disabled="state.isMobileEnd"
-              :class="{ 'code-btn-end': state.isMobileEnd }"
-              @tap="getSmsCode('smsLogin', state.model.mobile)"
+              :disabled="state.isMobileEnd || props.agreeStatus === false"
+              :class="{ 'code-btn-end': state.isMobileEnd || props.agreeStatus === false }"
+              @tap="checkAgreementAndGetSmsCode"
             >
               {{ getSmsTimer('smsLogin') }}
             </button>
@@ -71,8 +71,8 @@
 
   const props = defineProps({
     agreeStatus: {
-      type: Boolean,
-      default: false,
+      type: [Boolean, null],
+      default: null,
     },
   });
 
@@ -90,6 +90,20 @@
     },
   });
 
+  // 检查协议并获取验证码
+  function checkAgreementAndGetSmsCode() {
+    if (props.agreeStatus !== true) {
+      emits('onConfirm', true);
+      if (props.agreeStatus === false) {
+        sheep.$helper.toast('您已拒绝协议，无法发送验证码');
+      } else {
+        sheep.$helper.toast('请选择是否同意协议');
+      }
+      return;
+    }
+    getSmsCode('smsLogin', state.model.mobile);
+  }
+
   // 短信登录
   async function smsLoginSubmit() {
     // 参数校验
@@ -101,9 +115,14 @@
     if (!validate) {
       return;
     }
-    if (!props.agreeStatus) {
-      emits('onConfirm', true)
-      sheep.$helper.toast('请勾选同意');
+    // 检查协议状态
+    if (props.agreeStatus !== true) {
+      emits('onConfirm', true);
+      if (props.agreeStatus === false) {
+        sheep.$helper.toast('您已拒绝协议，无法继续登录');
+      } else {
+        sheep.$helper.toast('请选择是否同意协议');
+      }
       return;
     }
     // 提交数据
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index 41a7dbbb..2b396893 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -77,23 +77,48 @@
       <!-- 用户协议的勾选 -->
       <view
         v-if="['accountLogin', 'smsLogin'].includes(authType)"
-        class="agreement-box ss-flex ss-row-center"
+        class="agreement-box ss-flex ss-flex-col ss-col-center"
         :class="{ shake: currentProtocol }"
       >
-        <label class="radio ss-flex ss-col-center" @tap="onChange">
-          <radio
-            :checked="state.protocol"
-            color="var(--ui-BG-Main)"
-            style="transform: scale(0.8)"
-            @tap.stop="onChange"
-          />
-          <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
-            我已阅读并遵守
-            <view class="tcp-text" @tap.stop="onProtocol('用户协议')"> 《用户协议》 </view>
-            <view class="agreement-text">与</view>
-            <view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
+        <view class="agreement-title ss-m-b-20">请选择是否同意以下协议(请联网查看)：</view>
+        
+        <view class="agreement-options-container">
+          <!-- 同意选项 -->
+          <view class="agreement-option ss-m-b-20">
+            <label class="radio ss-flex ss-col-center" @tap="onAgree">
+              <radio
+                :checked="state.protocol === true"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onAgree"
+              />
+              <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
+                我已阅读并同意遵守
+                <view class="tcp-text" @tap.stop="onProtocol('用户协议')"> 《用户协议》 </view>
+                <view class="agreement-text">与</view>
+                <view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
+              </view>
+            </label>
+          </view>
+          
+          <!-- 拒绝选项 -->
+          <view class="agreement-option">
+            <label class="radio ss-flex ss-col-center" @tap="onRefuse">
+              <radio
+                :checked="state.protocol === false"
+                color="#ff4d4f"
+                style="transform: scale(0.8)"
+                @tap.stop="onRefuse"
+              />
+              <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
+                我拒绝遵守
+                <view class="tcp-text" @tap.stop="onProtocol('用户协议')"> 《用户协议》 </view>
+                <view class="agreement-text">与</view>
+                <view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
+              </view>
+            </label>
           </view>
-        </label>
+        </view>
       </view>
       <view class="safe-box" />
     </view>
@@ -116,14 +141,19 @@
   const authType = computed(() => modalStore.auth);
 
   const state = reactive({
-    protocol: false,
+    protocol: null, // null表示未选择，true表示同意，false表示拒绝
   });
 
   const currentProtocol = ref(false);
 
-  // 勾选协议
-  function onChange() {
-    state.protocol = !state.protocol;
+  // 同意协议
+  function onAgree() {
+    state.protocol = true;
+  }
+  
+  // 拒绝协议
+  function onRefuse() {
+    state.protocol = false;
   }
 
   // 查看协议
@@ -144,12 +174,17 @@
 
   // 第三方授权登陆（微信小程序、Apple）
   const thirdLogin = async (provider) => {
-    if (!state.protocol) {
+    if (state.protocol !== true) {
       currentProtocol.value = true;
       setTimeout(() => {
         currentProtocol.value = false;
       }, 1000);
-      sheep.$helper.toast('请勾选同意');
+      
+      if (state.protocol === false) {
+        sheep.$helper.toast('您已拒绝协议，无法继续登录');
+      } else {
+        sheep.$helper.toast('请选择是否同意协议');
+      }
       return;
     }
     const loginRes = await sheep.$platform.useProvider(provider).login();
@@ -244,4 +279,23 @@
   .agreement-text {
     color: $dark-9;
   }
+  
+  .agreement-title {
+    font-size: 28rpx;
+    color: $dark-9;
+    text-align: left;
+    width: 100%;
+    padding-left: 60rpx;
+  }
+  
+  .agreement-options-container {
+    width: 100%;
+    padding-left: 100rpx;
+  }
+  
+  .agreement-option {
+    width: 100%;
+    display: flex;
+    justify-content: flex-start;
+  }
 </style>
-- 
Gitee