From 5855ffa0442395f36faca2bf4a51fd5d1e052f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com>
Date: Wed, 29 Jun 2022 20:30:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=9A=E5=91=98=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=90=8E=E8=87=AA=E5=8A=A8=E6=B3=A8=E9=94=80=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layouts/frontend/components/header.vue     | 14 +-------------
 web/src/stores/userInfo.ts                         | 11 +++++++++++
 .../views/frontend/user/account/changePassword.vue |  6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/web/src/layouts/frontend/components/header.vue b/web/src/layouts/frontend/components/header.vue
index 41a28b28..cad704a7 100644
--- a/web/src/layouts/frontend/components/header.vue
+++ b/web/src/layouts/frontend/components/header.vue
@@ -19,7 +19,7 @@
                             </div>
                         </template>
                         <el-menu-item @click="router.push({ name: 'user' })" v-blur index="user-index">{{ $t('index.Member Center') }}</el-menu-item>
-                        <el-menu-item @click="logout()" v-blur index="user-logout">{{ $t('user.user.Logout login') }}</el-menu-item>
+                        <el-menu-item @click="userInfo.logout()" v-blur index="user-logout">{{ $t('user.user.Logout login') }}</el-menu-item>
                     </el-sub-menu>
                     <el-menu-item v-else @click="router.push({ name: 'user' })" v-blur index="user">{{ $t('index.Member Center') }}</el-menu-item>
                     <el-sub-menu v-blur index="switch-language">
@@ -50,10 +50,7 @@ import { useSiteConfig } from '/@/stores/siteConfig'
 import { useConfig } from '/@/stores/config'
 import { useMemberCenter } from '/@/stores/memberCenter'
 import { editDefaultLang } from '/@/lang/index'
-import { postLogout } from '/@/api/frontend/user/index'
 import 'element-plus/theme-chalk/display.css'
-import { Local } from '/@/utils/storage'
-import { USER_INFO } from '/@/stores/constant/cacheKey'
 import Aside from '/@/layouts/frontend/components/aside.vue'
 import 'element-plus/theme-chalk/display.css'
 
@@ -76,15 +73,6 @@ switch (route.name) {
         state.activeMenu = 'user'
         break
 }
-
-const logout = () => {
-    postLogout().then((res) => {
-        if (res.code == 1) {
-            Local.remove(USER_INFO)
-            router.go(0)
-        }
-    })
-}
 </script>
 
 <style scoped lang="scss">
diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts
index 9a46eb85..64df7fc2 100644
--- a/web/src/stores/userInfo.ts
+++ b/web/src/stores/userInfo.ts
@@ -1,6 +1,9 @@
 import { defineStore } from 'pinia'
 import { USER_INFO } from '/@/stores/constant/cacheKey'
 import { UserInfo } from '/@/stores/interface'
+import { postLogout } from '/@/api/frontend/user/index'
+import { Local } from '/@/utils/storage'
+import router from '../router'
 
 export const useUserInfo = defineStore('userInfo', {
     state: (): UserInfo => {
@@ -40,6 +43,14 @@ export const useUserInfo = defineStore('userInfo', {
             }
             return icon
         },
+        logout() {
+            postLogout().then((res) => {
+                if (res.code == 1) {
+                    Local.remove(USER_INFO)
+                    router.go(0)
+                }
+            })
+        },
     },
     persist: {
         key: USER_INFO,
diff --git a/web/src/views/frontend/user/account/changePassword.vue b/web/src/views/frontend/user/account/changePassword.vue
index a300399d..b8534c70 100644
--- a/web/src/views/frontend/user/account/changePassword.vue
+++ b/web/src/views/frontend/user/account/changePassword.vue
@@ -47,11 +47,11 @@ import { buildValidatorData } from '/@/utils/validate'
 import { changePassword } from '/@/api/frontend/user/index'
 import { useI18n } from 'vue-i18n'
 import FormItem from '/@/components/formItem/index.vue'
-import { useRouter } from 'vue-router'
+import { useUserInfo } from '/@/stores/userInfo'
 
 const { t } = useI18n()
 
-const router = useRouter()
+const userInfo = useUserInfo()
 const formRef = ref<FormInstance>()
 const state = reactive({
     formSubmitLoading: false,
@@ -92,7 +92,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
                 .then((res) => {
                     state.formSubmitLoading = false
                     if (res.code == 1) {
-                        router.push({ name: 'userLogin' })
+                        userInfo.logout()
                     }
                 })
                 .catch(() => {