From 9a5ecf5d2989b2d01f3fff93daab37441eb9dabd Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Tue, 29 Jul 2025 16:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/modules/common.js |  4 +++
 src/utils/request.js       |  5 ++-
 src/views/login/index.vue  | 72 ++++++++++++++++----------------------
 3 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/apis/modules/common.js b/src/apis/modules/common.js
index cc86512..568b547 100644
--- a/src/apis/modules/common.js
+++ b/src/apis/modules/common.js
@@ -5,5 +5,9 @@ export const getRegion = (params) => request.basic.get('/region', params)
 
 // 获取 验证码ID
 export const getCaptcha = (params) => request.basic.get('/api/v1/captcha/id', params)
+
+// 获取图片
+export const getCaptchaImage = (params) => request.basic.get('/api/v1/captcha/image', params , { responseType: 'blob' })
+
 //上传图片
 export const uploadImg=(params)=>request.basic.post('/api/v1/upload',params,{Headers:{'Content-Type': 'multipart/form-data'}})
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 5e1ccda..d8d7e11 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,11 +20,10 @@ const options = {
     },
     interceptorRequestCatch: () => {},
     interceptorResponse: (response) => {
-        console.log('response',response)
-        const list=['/api/v1/activity-details/export']
+        const list = ['/api/v1/activity-details/export', '/api/v1/captcha/image']
         // 错误处理
         const { success, msg = 'Network Error' } = response.data || {}
-        if (![true].includes(success)&&!list.includes(response.config.url)){
+        if (![true].includes(success) && !list.includes(response.config.url)){
             message.error({
                 content: msg,
                 key: MSG_ERROR_KEY,
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index acb7a4a..a3ff58a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -2,17 +2,10 @@
     <div>
         <a-tabs>
             <!-- 账号登录 -->
-            <a-tab-pane
-                key="account"
-                :tab="$t('pages.login.accountLogin.tab')">
-                <a-form
-                    :model="formData"
-                    :rules="formRules"
-                    ref="formRef">
+            <a-tab-pane key="account" :tab="$t('pages.login.accountLogin.tab')">
+                <a-form :model="formData" :rules="formRules" ref="formRef">
                     <a-form-item name="username">
-                        <a-input
-                            :placeholder="$t('pages.login.username.placeholder')"
-                            v-model:value="formData.username"
+                        <a-input :placeholder="$t('pages.login.username.placeholder')" v-model:value="formData.username"
                             size="large">
                             <template #prefix>
                                 <user-outlined></user-outlined>
@@ -20,18 +13,14 @@
                         </a-input>
                     </a-form-item>
                     <a-form-item name="password">
-                        <a-input
-                            v-model:value="formData.password"
-                            size="large"
-                            type="password"
-                            :placeholder="$t('pages.login.password.placeholder')"
-                            @pressEnter="handleLogin">
+                        <a-input v-model:value="formData.password" size="large" type="password"
+                            :placeholder="$t('pages.login.password.placeholder')" @pressEnter="handleLogin">
                             <template #prefix>
                                 <lock-outlined></lock-outlined>
                             </template>
                         </a-input>
                     </a-form-item>
-                    <!-- <a-form-item name="captcha_code">
+                    <a-form-item name="captcha_code">
                         <a-space>
                             <a-input
                                 v-model:value="formData.captcha_code"
@@ -50,15 +39,10 @@
                                 :height="42"
                                 :src="captcha_img" />
                         </a-space>
-                    </a-form-item> -->
+                    </a-form-item>
                     <a-form-item>
-                        <a-button
-                            type="primary"
-                            size="large"
-                            block
-                            :loading="loading"
-                            @click="handleLogin"
-                            >{{ $t('pages.login.submit') }}
+                        <a-button type="primary" size="large" block :loading="loading" @click="handleLogin">{{
+                            $t('pages.login.submit') }}
                         </a-button>
                     </a-form-item>
                 </a-form>
@@ -124,27 +108,33 @@ async function getCaptcha() {
 async function handleLogin() {
     formRef.value.validate().then(async (values) => {
         values.captcha_id = captcha_id.value
-        if (values.password === 'abc-123') values.password = md5(values.password)
+        if (values.password === 'abc-123') {
+            values.password = md5(values.password)
+        }
 
         loading.value = true
-        const { success } = await userStore
-            .login({
-                ...values,
-            })
-            .catch(() => {
-                loading.value = false
-                getCaptcha()
-            })
-        loading.value = false
-        if (config('http.code.success') === success) {
-            // 加载完成
-            if (appStore.complete) {
-                goIndex()
+        try {
+            const response = await userStore.login({ ...values })
+            loading.value = false
+            if (config('http.code.success') === response.success) {
+                if (appStore.complete) {
+                    goIndex()
+                } else {
+                    await appStore.init()
+                    goIndex()
+                }
             } else {
-                await appStore.init()
-                goIndex()
+                message.error(t(response.msg))
             }
+        } catch (error) {
+            loading.value = false
+            getCaptcha()
+            const msg = error.msg || error.message || '登录失败，请重试'
+            message.error(t(msg))
+            console.log("登录出错：", error)
         }
+    }).catch(validationError => {
+        console.log('表单校验失败', validationError)
     })
 }