diff --git a/src/App.vue b/src/App.vue index 9e2725f..bc3acbe 100644 --- a/src/App.vue +++ b/src/App.vue @@ -45,7 +45,7 @@ watch( } else if (val == 'zh-tw') { locale.value = tw } else { - locale.value = en + locale.value = zh } }, { diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index efc98b5..ef0b69b 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -110,7 +110,8 @@ "today": "today", "female": "Female", "male": "male", - "sex": "gender" + "sex": "gender", + "systemTips": "system hint" }, "btn": { "add": "Add", diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json index 08956e7..5901e69 100644 --- a/src/i18n/lang/zh-cn.json +++ b/src/i18n/lang/zh-cn.json @@ -110,7 +110,8 @@ "lastMonth": "上月", "sex": "性别", "male": "男", - "female": "女" + "female": "女", + "systemTips": "系统提示" }, "btn": { "add": "新增", diff --git a/src/i18n/lang/zh-tw.json b/src/i18n/lang/zh-tw.json index f16eba8..4857ce3 100644 --- a/src/i18n/lang/zh-tw.json +++ b/src/i18n/lang/zh-tw.json @@ -110,7 +110,8 @@ "today": "今天", "female": "女", "male": "男", - "sex": "性別" + "sex": "性別", + "systemTips": "系統提示" }, "btn": { "add": "新增", diff --git a/src/plugins/modal.js b/src/plugins/modal.js index b59e14d..e1d71be 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -79,4 +79,4 @@ export default { closeLoading() { loadingInstance.close(); } -} +} \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index ebca41a..eb144ca 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('登录状态已过期,请重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', + ElMessageBox.confirm($t('login.loginTimeOut'), $t('common.systemTips'), { + confirmButtonText: $t('login.reLogin'), + cancelButtonText: $t('btn.cancel'), type: 'warning' }).then(() => { useUserStore().logOut().then(() => { @@ -52,7 +52,7 @@ service.interceptors.response.use(res => { }) }) - return Promise.reject('无效的会话,或者会话已过期,请重新登录。') + return Promise.reject($t('login.invalidSession')) } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500 || code == 429) { ElMessage({ message: msg,