From 41dd085e98b9eecdf9ccc3028a97f1391bc35bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com>
Date: Tue, 7 Jul 2026 19:23:14 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=BF=AB=E6=8D=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login_package/login/login.vue | 37 +++++++++++++----------------
 1 file changed, 16 insertions(+), 21 deletions(-)

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 @@
         <view @click="jumpForgot">忘记密码</view>
         <view @click="jumpRegister">注册</view>
       </view>
-      <view class="skip_login_warp" @click="onSkipLogin">
-        暂不登录，先去逛逛
-      </view>
     </view>
     <view>
       <!-- #ifdef APP-PLUS -->
@@ -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;
-}
 </style>
\ No newline at end of file