From 70c7bc4af28113352297048436cf9e18720ba277 Mon Sep 17 00:00:00 2001
From: SuperCuteXiaoSi <1531733886@qq.com>
Date: Tue, 14 Jun 2022 21:58:52 +0800
Subject: [PATCH] =?UTF-8?q?fixbug:=20=E8=AF=B7=E6=B1=82=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios/errorConfig.ts | 9 +++++----
 src/utils/axios/index.ts       | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/utils/axios/errorConfig.ts b/src/utils/axios/errorConfig.ts
index 7f5f49ab..4b201e1b 100644
--- 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
index 27ddf8b6..18fcab41 100644
--- 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,7 +21,6 @@ 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') {
@@ -30,6 +28,7 @@ const interceptor: AxiosInterceptor = {
       } else if (errorMessageMode === 'message') {
         createErrorMsg(data.message);
       }
+      return errorData(res);
     }
 
     return data;