From c754a36ee5f9fbaa0e99573c169729be579d7203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Sat, 21 May 2022 19:46:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9i18n=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en/index.ts      |  3 ++-
 src/i18n/zh/index.ts      |  2 ++
 src/i18n/zh/login.ts      |  2 +-
 src/utils/router.ts       | 16 ++++++++++------
 src/views/login/index.vue |  4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts
index c55b33bb..a83af4ab 100644
--- a/src/i18n/en/index.ts
+++ b/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',
diff --git a/src/i18n/zh/index.ts b/src/i18n/zh/index.ts
index 81918edc..c67bb103 100644
--- a/src/i18n/zh/index.ts
+++ b/src/i18n/zh/index.ts
@@ -11,6 +11,8 @@ const global = {
   help: '帮助中心',
   contact: '联系我们',
   logout: '退出登录',
+  logout_success: '退出成功！',
+  logout_failure: '退出失败！',
   // 系统设置
   sys_set: '系统设置',
   lang_set: '语言设置',
diff --git a/src/i18n/zh/login.ts b/src/i18n/zh/login.ts
index 38d53eab..96182694 100644
--- a/src/i18n/zh/login.ts
+++ b/src/i18n/zh/login.ts
@@ -2,6 +2,6 @@ export default {
   desc: "登录",
   form_auto: "自动登录",
   form_button: "登录",
-  login_success: "登录成功",
   login_message: "请填写完整信息",
+  login_success: "登录成功！",
 }
\ No newline at end of file
diff --git a/src/utils/router.ts b/src/utils/router.ts
index f4a1396c..e5235399 100644
--- a/src/utils/router.ts
+++ b/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)
 }
 
 /**
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 734087e1..616ecae8 100644
--- a/src/views/login/index.vue
+++ b/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'))
     }
   })
 }