fixbug: 请求拦截问题

jsxiaosi · Jun 14, 2022 · 70c7bc4 · 70c7bc4
1 parent 1070948
commit 70c7bc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/utils/axios/errorConfig.ts b/src/utils/axios/errorConfig.ts
@@ -1,9 +1,10 @@
-import type { AxiosError } from 'axios';
+import { Result } from '#/axios';
+import type { AxiosResponse } from 'axios';
 
-export const errorData = (res: AxiosError) => {
+export const errorData = (res: AxiosResponse<Result<any>>) => {
   return {
     data: null,
-    message: res.message,
-    code: res.code,
+    message: res.data.message,
+    code: res.data.code,
   };
 };
diff --git a/src/utils/axios/index.ts b/src/utils/axios/index.ts
@@ -3,7 +3,6 @@ import { iAxios } from './iAxios';
 import { checkStatus } from './axiosStatus';
 import { isString } from 'lodash';
 import { useMessage } from '@/hooks/web/useMessage';
-import { AxiosError } from 'axios';
 import { errorData } from './errorConfig';
 
 const { createErrorModal, createErrorMsg } = useMessage();
@@ -22,14 +21,14 @@ const interceptor: AxiosInterceptor = {
      */
     const { data } = res;
     const { errorMessageMode } = options;
-    if (!data || !data.data) return errorData(res as unknown as AxiosError);
 
     if (data.code === -1) {
       if (errorMessageMode === 'modal') {
         createErrorModal(data.message);
       } else if (errorMessageMode === 'message') {
         createErrorMsg(data.message);
       }
+      return errorData(res);
     }
 
     return data;