From 2735dcf93921c738ee8ffb375d37b2d81ae5121f Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 11 Nov 2024 21:51:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=99=BB=E5=BD=95=E5=90=8E=E9=81=97=E6=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E8=A1=8C=E4=B8=BA=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/email/index.vue | 36 ++++++++++++++++------
 src/views/login/components/phone/index.vue | 26 ++++++++--------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/views/login/components/email/index.vue b/src/views/login/components/email/index.vue
index 8fd682d..9fb5c08 100644
--- a/src/views/login/components/email/index.vue
+++ b/src/views/login/components/email/index.vue
@@ -28,12 +28,20 @@
         <a-button disabled class="btn" type="primary" :loading="loading" html-type="submit" size="large" long>立即登录</a-button>
       </a-space>
     </a-form-item>
+    <Verify
+      ref="VerifyRef"
+      :captcha-type="captchaType"
+      :mode="captchaMode"
+      :img-size="{ width: '330px', height: '155px' }"
+      @success="getCaptcha"
+    />
   </a-form>
 </template>
 
 <script setup lang="ts">
-// import { getEmailCaptcha } from '@/apis'
 import { type FormInstance, Message } from '@arco-design/web-vue'
+import type { BehaviorCaptchaReq } from '@/apis'
+// import { type BehaviorCaptchaReq, getEmailCaptcha } from '@/apis'
 import { useTabsStore, useUserStore } from '@/stores'
 import * as Regexp from '@/utils/regexp'
 
@@ -64,7 +72,7 @@ const handleLogin = async () => {
     await userStore.emailLogin(form)
     tabsStore.reset()
     const { redirect, ...othersQuery } = router.currentRoute.value.query
-    router.push({
+    await router.push({
       path: (redirect as string) || '/',
       query: {
         ...othersQuery,
@@ -78,6 +86,19 @@ const handleLogin = async () => {
   }
 }
 
+const VerifyRef = ref<InstanceType<any>>()
+const captchaType = ref('blockPuzzle')
+const captchaMode = ref('pop')
+const captchaLoading = ref(false)
+
+// 弹出行为验证码
+const onCaptcha = async () => {
+  if (captchaLoading.value) return
+  const isInvalid = await formRef.value?.validateField('email')
+  if (isInvalid) return
+  VerifyRef.value.show()
+}
+
 const captchaTimer = ref()
 const captchaTime = ref(60)
 const captchaBtnName = ref('获取验证码')
@@ -90,18 +111,13 @@ const resetCaptcha = () => {
   captchaDisable.value = false
 }
 
-const captchaLoading = ref(false)
 // 获取验证码
-const onCaptcha = async () => {
-  if (captchaLoading.value) return
-  const isInvalid = await formRef.value?.validateField('email')
-  if (isInvalid) return
+// eslint-disable-next-line unused-imports/no-unused-vars
+const getCaptcha = async (captchaReq: BehaviorCaptchaReq) => {
   try {
     captchaLoading.value = true
     captchaBtnName.value = '发送中...'
-    // await getEmailCaptcha({
-    //   email: form.email
-    // })
+    // await getEmailCaptcha(form.email, captchaReq)
     captchaLoading.value = false
     captchaDisable.value = true
     captchaBtnName.value = `获取验证码(${(captchaTime.value -= 1)}s)`
diff --git a/src/views/login/components/phone/index.vue b/src/views/login/components/phone/index.vue
index 990a8be..3d08610 100644
--- a/src/views/login/components/phone/index.vue
+++ b/src/views/login/components/phone/index.vue
@@ -28,19 +28,20 @@
         <a-button disabled class="btn" type="primary" :loading="loading" html-type="submit" size="large" long>立即登录</a-button>
       </a-space>
     </a-form-item>
+    <Verify
+      ref="VerifyRef"
+      :captcha-type="captchaType"
+      :mode="captchaMode"
+      :img-size="{ width: '330px', height: '155px' }"
+      @success="getCaptcha"
+    />
   </a-form>
-  <Verify
-    ref="VerifyRef"
-    :captcha-type="captchaType"
-    :mode="captchaMode"
-    :img-size="{ width: '330px', height: '155px' }"
-    @success="getCaptcha"
-  />
 </template>
 
 <script setup lang="ts">
-// import { getSmsCaptcha } from '@/apis'
 import { type FormInstance, Message } from '@arco-design/web-vue'
+import type { BehaviorCaptchaReq } from '@/apis'
+// import { type BehaviorCaptchaReq, getSmsCaptcha } from '@/apis'
 import { useTabsStore, useUserStore } from '@/stores'
 import * as Regexp from '@/utils/regexp'
 
@@ -71,7 +72,7 @@ const handleLogin = async () => {
     await userStore.phoneLogin(form)
     tabsStore.reset()
     const { redirect, ...othersQuery } = router.currentRoute.value.query
-    router.push({
+    await router.push({
       path: (redirect as string) || '/',
       query: {
         ...othersQuery,
@@ -110,13 +111,12 @@ const resetCaptcha = () => {
 }
 
 // 获取验证码
-const getCaptcha = async () => {
+// eslint-disable-next-line unused-imports/no-unused-vars
+const getCaptcha = async (captchaReq: BehaviorCaptchaReq) => {
   try {
     captchaLoading.value = true
     captchaBtnName.value = '发送中...'
-    // await getSmsCaptcha({
-    //   phone: form.phone
-    // })
+    // await getSmsCaptcha(form.phone, captchaReq)
     captchaLoading.value = false
     captchaDisable.value = true
     captchaBtnName.value = `获取验证码(${(captchaTime.value -= 1)}s)`