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>) => { 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;