From 9b60a142dac3294e389ea0f0bf3264494a01fc9e Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Thu, 4 Sep 2025 14:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8B=BE=E9=80=89=E5=90=8C=E6=84=8F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95=E6=97=A0=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=20=E6=9F=A5=E7=9C=8B=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E4=BC=9A=E6=89=93=E5=BC=80=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue | 206 +++++++++++++++++++++++-------------------
 1 file changed, 111 insertions(+), 95 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 02c5bbf..5fd8e36 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,7 +79,7 @@
 
 <script>
 import { wxLogin } from '@/api/auth/auth.js'
-import { forceHideLoading, AutoLoadingManager } from '@/utils/request.js'
+import { forceHideLoading } from '@/utils/request.js'
 import { getServiceTerms, getPrivacyPolicy } from '@/api/article/article.js'
 import { commonEnum } from '../../enum/commonEnum'
 import { getNavBarHeight, getTitleBarHeight } from '../../utils/system'
@@ -142,14 +142,7 @@ export default {
       return match ? decodeURIComponent(match[1]) : null
     },
     toggleAgreement() {
-      if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) {
-        this.hasAgreed = !this.hasAgreed
-      } else {
-        uni.showToast({
-          title: '请先阅读服务条款和隐私政策',
-          icon: 'none',
-        })
-      }
+      this.hasAgreed = !this.hasAgreed
     },
 
     async showServiceTerms() {
@@ -214,24 +207,12 @@ export default {
       this.hasReadServiceTerms = true
       this.closeServiceTermsPopup()
       this.checkAgreementStatus()
-
-      if (!this.hasReadPrivacyPolicy) {
-        setTimeout(() => {
-          this.showPrivacyPolicy()
-        }, 500)
-      }
     },
 
     async agreePrivacyPolicy() {
       this.hasReadPrivacyPolicy = true
       this.closePrivacyPolicyPopup()
       this.checkAgreementStatus()
-
-      if (!this.hasReadServiceTerms) {
-        setTimeout(() => {
-          this.showServiceTerms()
-        }, 500)
-      }
     },
 
     checkAgreementStatus() {
@@ -240,94 +221,129 @@ export default {
       }
     },
 
-    async showUnreadTerms() {
-      if (!this.hasReadServiceTerms) {
-        await this.showServiceTerms()
-        return
-      }
-
-      if (!this.hasReadPrivacyPolicy) {
-        await this.showPrivacyPolicy()
-      }
-    },
-
     goToLogin() {
       this.$uv.throttle(this.Login, 3000)
     },
 
-    Login() {
+    async Login() {
       console.log('开始登录流程')
+      this.showLoading()
 
-      // 显示加载状态
+      try {
+        // 1. 未同意显示协议确认弹窗
+        if (!this.hasAgreed) {
+          const confirmed = await this.showLoginConfirmation()
+          if (!confirmed) return
+        }
+
+        // 2. 获取微信登录code
+        const wxCode = await this.getWxLoginCode()
+
+        // 3. 执行登录请求
+        const loginResult = await this.executeLogin(wxCode)
+
+        // 4. 处理登录成功
+        this.handleLoginSuccess(loginResult)
+      } catch (error) {
+        this.handleLoginError(error)
+      } finally {
+        this.hideLoading()
+      }
+    },
+
+    // 显示加载状态
+    showLoading() {
       this.pageLoading?.show('登录中...')
+    },
 
-      uni.showModal({
-        title: '确认登录',
-        content: '我已阅读并同意服务协议和隐私政策',
-        confirmText: '确定登录',
-        cancelText: '取消',
-        success: async modalRes => {
-          if (modalRes.confirm) {
-            this.hasAgreed = true
-            try {
-              // 1. 获取微信登录code
-              const loginRes = await new Promise((resolve, reject) => {
-                uni.login({
-                  success: resolve,
-                  fail: reject,
-                })
-              })
+    // 隐藏加载状态
+    hideLoading() {
+      this.pageLoading?.hide()
+      forceHideLoading()
+    },
 
-              if (!loginRes.code) {
-                throw new Error('获取登录code失败')
-              }
+    // 显示登录确认弹窗
+    showLoginConfirmation() {
+      return new Promise(resolve => {
+        uni.showModal({
+          title: '确认登录',
+          content: '我已阅读并同意服务协议和隐私政策',
+          confirmText: '确定登录',
+          cancelText: '取消',
+          success: res => {
+            this.hasAgreed = res.confirm
+            resolve(res.confirm)
+          },
+          fail: err => {
+            console.error('弹窗操作失败:', err)
+            resolve(false)
+          },
+        })
+      })
+    },
 
-              console.log('获取到登录code:', loginRes.code)
-              console.log('携带的agentId:', this.agentId)
-
-              // 2. 调用登录接口
-              const loginData = {
-                loginCode: loginRes.code,
-                agentId: this.agentId,
-              }
-
-              const res = await wxLogin(loginData)
-
-              if (res.code === 200) {
-                console.log('登录成功:', res)
-                uni.setStorageSync('token', res.token)
-
-                uni.showToast({
-                  title: '登录成功',
-                  icon: 'success',
-                  duration: 1500,
-                  complete: () => {
-                    uni.switchTab({
-                      url: '/pages/index/index',
-                    })
-                  },
-                })
-              } else {
-                throw new Error(res.msg || '登录失败')
-              }
-            } catch (error) {
-              console.error('登录流程出错:', error)
-              uni.showToast({
-                title: error.message || '登录失败',
-                icon: 'none',
-              })
-            } finally {
-              this.pageLoading?.hide()
-              forceHideLoading()
+    // 获取微信登录code
+    getWxLoginCode() {
+      return new Promise((resolve, reject) => {
+        uni.login({
+          success: res => {
+            if (!res.code) {
+              reject(new Error('获取登录code失败'))
+              return
             }
-          }
-        },
-        fail: err => {
-          console.error('弹窗操作失败:', err)
-          this.pageLoading?.hide()
+            console.log('获取到登录code:', res.code)
+            resolve(res.code)
+          },
+          fail: err => {
+            reject(new Error(`微信登录失败: ${err.errMsg}`))
+          },
+        })
+      })
+    },
+
+    // 执行登录请求
+    async executeLogin(wxCode) {
+      console.log('携带的agentId:', this.agentId)
+
+      const loginData = {
+        loginCode: wxCode,
+        agentId: this.agentId,
+      }
+
+      const res = await wxLogin(loginData)
+
+      if (res.code !== 200) {
+        throw new Error(res.msg || '登录失败')
+      }
+
+      return res
+    },
+
+    // 处理登录成功
+    handleLoginSuccess(loginResult) {
+      console.log('登录成功:', loginResult)
+      uni.setStorageSync('token', loginResult.token)
+
+      uni.showToast({
+        title: '登录成功',
+        icon: 'success',
+        duration: 1500,
+        complete: () => {
+          uni.switchTab({
+            url: '/pages/index/index',
+          })
         },
       })
     },
+
+    // 处理登录错误
+    handleLoginError(error) {
+      console.error('登录流程出错:', error)
+      uni.showToast({
+        title: error.message || '登录失败',
+        icon: 'none',
+      })
+    },
   },
 }
 </script>