diff --git a/src/i18n/index.js b/src/i18n/index.js index 4358092..f03b3fe 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -41,7 +41,8 @@ const i18n = createI18n({ ...en, ...pageLoginEn, ...pagemenuEn - } + }, + //... 在这里添加其他语言支持 } }) @@ -49,9 +50,7 @@ const loadLocale = () => { listLangByLocale(language.value).then(res => { const { code, data } = res if (code == 200) { - i18n.global.mergeLocaleMessage('zh-cn', data.cn) - i18n.global.mergeLocaleMessage('zh-tw', data.tw) - i18n.global.mergeLocaleMessage('en', data.en) + i18n.global.mergeLocaleMessage(language.value, data) } }) } diff --git a/src/utils/request.js b/src/utils/request.js index eb144ca..3d61019 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -41,9 +41,9 @@ service.interceptors.response.use(res => { return res.data } if (code == 401) { - ElMessageBox.confirm($t('login.loginTimeOut'), $t('common.systemTips'), { - confirmButtonText: $t('login.reLogin'), - cancelButtonText: $t('btn.cancel'), + ElMessageBox.confirm('登录状态已过期,请重新登录', '系统提示', { + confirmButtonText: '重新登陆', + cancelButtonText: '取消', type: 'warning' }).then(() => { useUserStore().logOut().then(() => { @@ -52,7 +52,7 @@ service.interceptors.response.use(res => { }) }) - return Promise.reject($t('login.invalidSession')) + return Promise.reject('无效的会话,或者会话已过期,请重新登录。') } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500 || code == 429) { ElMessage({ message: msg, diff --git a/src/views/index.vue b/src/views/index.vue index 788e944..0c092a1 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -132,13 +132,6 @@ - - - diff --git a/src/views/system/commonLang/index.vue b/src/views/system/commonLang/index.vue index ae3b3a9..b97de28 100644 --- a/src/views/system/commonLang/index.vue +++ b/src/views/system/commonLang/index.vue @@ -12,7 +12,7 @@ - + @@ -76,7 +76,7 @@ @selection-change="handleSelectionChange"> - +