From cafca0ec114e1517d21c85b24acac68828bbb11b Mon Sep 17 00:00:00 2001
From: zhongzm <zhongzm@agt.com>
Date: Thu, 26 Dec 2024 18:35:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=B8=8B=E8=B0=83?=
 =?UTF-8?q?=EF=BC=9Awhere=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 10 +++++---
 .../_builtin/login/modules/pwd-login.vue      | 25 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 297a6e1..78a143a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import { ConfigProvider } from 'ant-design-vue';
+import { ConfigProvider, StyleProvider } from 'ant-design-vue'; // 添加 StyleProvider
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
 import { antdLocales } from './locales/antd';
@@ -20,9 +20,11 @@ const antdLocale = computed(() => {
 
 <template>
   <ConfigProvider :theme="themeStore.antdTheme" :locale="antdLocale">
-    <AppProvider>
-      <RouterView class="bg-layout" />
-    </AppProvider>
+    <StyleProvider hash-priority="high">
+      <AppProvider>
+        <RouterView class="bg-layout" />
+      </AppProvider>
+    </StyleProvider>
   </ConfigProvider>
 </template>
 
diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
index 363a65c..4333f29 100644
--- a/src/views/_builtin/login/modules/pwd-login.vue
+++ b/src/views/_builtin/login/modules/pwd-login.vue
@@ -5,12 +5,23 @@ import { useRouterPush } from '@/hooks/common/router';
 import { useAntdForm, useFormRules } from '@/hooks/common/form';
 import { useAuthStore } from '@/store/modules/auth';
 import { useI18n } from "vue-i18n";
+import { sessionStg } from '@/utils/storage';
 
 // Add interface for check code response
 interface CheckCodeResponse {
   uuid: string;
   img: string;
-  text?: string; // Make text optional since it might not always be present
+  text?: string;
+}
+
+// Add interface for LoginForm
+interface LoginForm {
+  username: string;
+  password: string;
+  code: string;
+  uuid: string;
+  authType: string;
+  wanfiRedirectParams: Record<string, any>;
 }
 
 defineOptions({
@@ -26,7 +37,7 @@ const codeImg = ref('');
 
 getCheckCode();
 
-const model = reactive({
+const model = reactive<LoginForm>({
   username: '123456',
   password: '123456',
   code: '',
@@ -41,12 +52,14 @@ const rules = {
 };
 
 async function handleSubmit() {
-  await validate();//验证表单内容
-  model.wanfiRedirectParams = sessionStg.get('wanfiRedirectParams');
+  await validate();
+  const redirectParams = sessionStg.get('wanfiRedirectParams');
+  model.wanfiRedirectParams = redirectParams ? JSON.parse(redirectParams) : {};
+
   await authStore.login({
-    loginForm: model, //发送表单的数据
+    loginForm: model,
     onError() {
-      getCheckCode();//重新获取验证码
+      getCheckCode();
     }
   });
 }