소스 검색

fix: 修改i18n错误提示

奔跑的面条 3 년 전
부모
커밋
c754a36ee5
5개의 변경된 파일17개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 1
      src/i18n/en/index.ts
  2. 2 0
      src/i18n/zh/index.ts
  3. 1 1
      src/i18n/zh/login.ts
  4. 10 6
      src/utils/router.ts
  5. 2 2
      src/views/login/index.vue

+ 2 - 1
src/i18n/en/index.ts

@@ -11,7 +11,8 @@ const global = {
   help: 'Help',
   contact: 'Contact Us',
   logout: 'Logout',
-  logout_success: 'Logout success',
+  logout_success: 'Logout success!',
+  logout_failure: 'Logout Failed!',
   // system setting
   sys_set: 'System Setting',
   lang_set: 'Language Setting',

+ 2 - 0
src/i18n/zh/index.ts

@@ -11,6 +11,8 @@ const global = {
   help: '帮助中心',
   contact: '联系我们',
   logout: '退出登录',
+  logout_success: '退出成功!',
+  logout_failure: '退出失败!',
   // 系统设置
   sys_set: '系统设置',
   lang_set: '语言设置',

+ 1 - 1
src/i18n/zh/login.ts

@@ -2,6 +2,6 @@ export default {
   desc: "登录",
   form_auto: "自动登录",
   form_button: "登录",
-  login_success: "登录成功",
   login_message: "请填写完整信息",
+  login_success: "登录成功!",
 }

+ 10 - 6
src/utils/router.ts

@@ -105,13 +105,17 @@ export const reloadRoutePage = () => {
  * * 退出登录
  */
 export const logout = async () => {
-  const res:any = await logoutApi()
-  if(res.code === ResultEnum.SUCCESS) {
-    window['$message'].success((`${window['$t']('global.logout_success')}!`))
+  try {
+    const res:any = await logoutApi()
+    if(res.code === ResultEnum.SUCCESS) {
+      window['$message'].success(window['$t']('global.logout_success'))
+      clearCookie(RequestHttpHeaderEnum.COOKIE)
+      clearLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+    }
+  } catch (error) {
+    window['$message'].success(window['$t']('global.logout_success'))
   }
-  clearCookie(RequestHttpHeaderEnum.COOKIE)
-  clearLocalStorage(StorageEnum.GO_SYSTEM_STORE)
-  routerTurnByName(PageEnum.BASE_LOGIN_NAME)
 }
 
 /**

+ 2 - 2
src/views/login/index.vue

@@ -229,11 +229,11 @@ const handleSubmit = async (e: Event) => {
           nickName: nickname,
         })
         
-        window['$message'].success(`${t('login.login_success')}`)
+        window['$message'].success(t('login.login_success'))
         routerTurnByName(PageEnum.BASE_HOME_NAME, true)
       }
     } else {
-      window['$message'].error(`${t('login.login_message')}`)
+      window['$message'].error(t('login.login_message'))
     }
   })
 }