fix(front): 修改Promise.reject返回response.data,并去掉axios的属性catchFirst

@@ -145,11 +145,8 @@ const transform: AxiosTransform = {
     } catch (error: any) {
     } catch (error: any) {
       throw new Error(error);
       throw new Error(error);
     }
     }
-
-    if (!config?.requestOptions?.catchFirst) {
-      checkStatus(error?.response?.status, msg, errorMessageMode);
-    }
-    return Promise.reject(error);
+    checkStatus(error?.response?.status, msg, errorMessageMode);
+    return Promise.reject(response.data);
   },
   },
 };
 };
 
 

@@ -60,16 +60,10 @@
       </ACol>
       </ACol>
     </ARow>
     </ARow>
   </Form>
   </Form>
-  <Modal v-model:visible="visible" :footer="null" centered>
-    <template #title>
-      <CloseCircleFilled class="modal-icon-error" /><span class="ml-2">错误提示</span>
-    </template>
-    <span class="ml-2" style="color: red">用户名或密码不正确</span>
-  </Modal>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { reactive, ref, unref, computed } from 'vue';
   import { reactive, ref, unref, computed } from 'vue';
-  import { Checkbox, Form, Input, Row, Col, Button, Modal } from 'ant-design-vue';
+  import { Checkbox, Form, Input, Row, Col, Button } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
   import LoginFormTitle from './LoginFormTitle.vue';
 
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -78,16 +72,15 @@
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { getPlatForm } from '/@/api/oem/index';
-  import { createLocalStorage } from '/@/utils/cache/index';
-  import { CloseCircleFilled } from '@ant-design/icons-vue';
+  import { getPlatForm } from '/@/api/oem';
+  import { createLocalStorage } from '/@/utils/cache';
 
 
   const ACol = Col;
   const ACol = Col;
   const ARow = Row;
   const ARow = Row;
   const FormItem = Form.Item;
   const FormItem = Form.Item;
   const InputPassword = Input.Password;
   const InputPassword = Input.Password;
   const { t } = useI18n();
   const { t } = useI18n();
-  const { notification, createErrorModal } = useMessage();
+  const { notification, createMessage } = useMessage();
   const { prefixCls } = useDesign('login');
   const { prefixCls } = useDesign('login');
   const userStore = useUserStore();
   const userStore = useUserStore();
 
 
@@ -116,34 +109,33 @@
     } else {
     } else {
       storage.set('userInfo', null);
       storage.set('userInfo', null);
     }
     }
-    try {
-      loading.value = true;
-      const userInfo = await userStore.login({
+    loading.value = true;
+    const userInfo = await userStore
+      .login({
         password: data.password,
         password: data.password,
         username: data.account,
         username: data.account,
         mode: 'modal', //不要默认的错误提示
         mode: 'modal', //不要默认的错误提示
+      })
+      .catch((data) => {
+        createMessage.error(data.message);
       });
       });
-      if (userInfo) {
-        notification.success({
-          message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
-          duration: 3,
-        });
-        const res = await getPlatForm();
-        storage.set('platformInfo', res);
-        userStore.setPlatInfo(res);
-        // 设置icon
-        let link = (document.querySelector("link[rel*='icon']") ||
-          document.createElement('link')) as HTMLLinkElement;
-        link.type = 'image/x-icon';
-        link.rel = 'shortcut icon';
-        link.href = res.icon ?? '/favicon.ico';
-        document.getElementsByTagName('head')[0].appendChild(link);
-      }
-    } catch (error: any) {
-      visible.value = true;
-    } finally {
-      loading.value = false;
+    if (userInfo) {
+      notification.success({
+        message: t('sys.login.loginSuccessTitle'),
+        description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
+        duration: 3,
+      });
+      const res = await getPlatForm();
+      storage.set('platformInfo', res);
+      userStore.setPlatInfo(res);
+      // 设置icon
+      let link = (document.querySelector("link[rel*='icon']") ||
+        document.createElement('link')) as HTMLLinkElement;
+      link.type = 'image/x-icon';
+      link.rel = 'shortcut icon';
+      link.href = res.icon ?? '/favicon.ico';
+      document.getElementsByTagName('head')[0].appendChild(link);
     }
     }
+    loading.value = false;
   }
   }
 </script>
 </script>

@@ -21,7 +21,6 @@ export interface RequestOptions {
   ignoreCancelToken?: boolean;
   ignoreCancelToken?: boolean;
   // Whether to send token in header
   // Whether to send token in header
   withToken?: boolean;
   withToken?: boolean;
-  catchFirst?: boolean;
 }
 }
 
 
 export interface Result<T = any> {
 export interface Result<T = any> {