From ebfa524fa2d200b9c3fcb7d3abd51f86e6d5efde Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 20 Apr 2023 20:34:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BA=95=E5=B1=82?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/lang/en/sys.ts | 2 +- src/locales/lang/zh-CN/sys.ts | 2 +- src/utils/http/axios/checkStatus.ts | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/locales/lang/en/sys.ts b/src/locales/lang/en/sys.ts index 95356fc..929f8a6 100644 --- a/src/locales/lang/en/sys.ts +++ b/src/locales/lang/en/sys.ts @@ -15,7 +15,7 @@ export default { errMsg405: 'Network request error, request method not allowed!', errMsg408: 'Network request timed out!', errMsg424: 'theTokenExpired,pleaseLogInAgain!', - errMsg426: 'The username does not exist or the password is incorrect,If the current user does not exist,contact the system administrator to check whether the multi-tenant has expired or been frozen!', + errMsg426: 'Incorrect user name or password!', errMsg428: 'verificationCodeError,pleaseEnterAgain!', errMsg429: 'tooManyRequests!', errMsg500: 'Server error, please contact the administrator!', diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts index ac8237f..9839563 100644 --- a/src/locales/lang/zh-CN/sys.ts +++ b/src/locales/lang/zh-CN/sys.ts @@ -15,7 +15,7 @@ export default { errMsg405: '网络请求错误,请求方法未允许!', errMsg408: '网络请求超时!', errMsg424: '令牌过期,请重新登录!', - errMsg426: '用户名或密码错误又或者当前用户多租户不存在,请联系统管理员检查多租户是否过期或者冻结!', + errMsg426: '用户名或密码错误!', errMsg428: '验证码错误,请重新输入!', errMsg429: '请求过频繁!', errMsg500: '服务器错误,请联系管理员!', diff --git a/src/utils/http/axios/checkStatus.ts b/src/utils/http/axios/checkStatus.ts index de3c3c6..b90a88f 100644 --- a/src/utils/http/axios/checkStatus.ts +++ b/src/utils/http/axios/checkStatus.ts @@ -11,7 +11,6 @@ import { useI18n } from '/@/hooks/web/useI18n'; import { useUserStoreWithOut } from '/@/store/modules/user'; const { createMessage, createErrorModal } = useMessage(); -const error = createMessage.error!; export function checkStatus(status: number, msg: string, errorMessageMode: ErrorMessageMode = 'message'): boolean { const { t } = useI18n(); @@ -78,7 +77,7 @@ export function checkStatus(status: number, msg: string, errorMessageMode: Error createErrorModal({ title: t('sys.api.errorTip'), content: errMessage }); break; case 'message': - error({ content: errMessage, key: `global_error_message_status_${status}` }); + createMessage.error({ content: errMessage, key: `global_error_message_status_${status}` }); break; } return true;