From 0ba2f8dbd6072c488223b77deb63965a25cbfb1b Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 23 Sep 2021 11:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example             |  2 ++
 src/App.vue              | 18 +++++++++---------
 src/store/index.ts       |  2 +-
 src/utils/request.ts     |  2 +-
 src/views/User/index.vue |  9 ++-------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.env.example b/.env.example
index 5b02577..1056ed4 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,8 @@
 NODE_ENV=production
 BASE_URL=/
 
+VUE_APP_VUEX_KEY=vuex
+
 VUE_APP_TITLE=Jason.Chen
 VUE_APP_API_URL=/api
 
diff --git a/src/App.vue b/src/App.vue
index a9ad213..af3420b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,13 +5,15 @@
     </keep-alive>
   </router-view>
 
-  <router-link :to="{name:'Home'}">Home</router-link>
-  |
-  <router-link :to="{name:'User'}">User</router-link>
-  |
-  <router-link :to="{name:'AuthLogin'}">Login</router-link>
-  |
-  <router-link :to="{name:'AuthRegister'}">Register</router-link>
+  <div>
+    <router-link :to="{name:'Home'}">Home</router-link>
+    |
+    <router-link :to="{name:'User'}">User</router-link>
+    |
+    <router-link :to="{name:'AuthLogin'}">Login</router-link>
+    |
+    <router-link :to="{name:'AuthRegister'}">Register</router-link>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -30,8 +32,6 @@ if (search && search.indexOf('?') !== -1) {
   invite && localStorage.setItem(INVITE_CODE, invite)
 }
 
-// console.log(
-
 watch(route, (to: RouteLocationNormalizedLoaded) => {
   if (to.meta?.keepAlive && includeList.value.indexOf(to.name as string) === -1) {
     includeList.value.push(to.name as string)
diff --git a/src/store/index.ts b/src/store/index.ts
index 165816e..85794b2 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -6,7 +6,7 @@ import createPersistedState from 'vuex-persistedstate'
 import auth, { AuthState } from './modules/auth'
 import refresh, { RefreshState } from './modules/refresh'
 
-export const PERSISTED_KEY = 'vuex_persisted'
+export const PERSISTED_KEY = process.env.VUE_APP_VUEX_KEY
 export const INVITE_CODE = 'invite_code'
 
 export const key: InjectionKey<Store<State>> = Symbol()
diff --git a/src/utils/request.ts b/src/utils/request.ts
index b57e615..ab6149a 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -35,7 +35,7 @@ request.interceptors.response.use(async (response) => {
     }
 
     if (response.status === 200 && response.data?.status_code === 200) {
-        return response.data?.data
+        return Promise.resolve(response.data?.data)
     }
 
     return Promise.reject(response.data)
diff --git a/src/views/User/index.vue b/src/views/User/index.vue
index b083e6f..737943a 100644
--- a/src/views/User/index.vue
+++ b/src/views/User/index.vue
@@ -18,19 +18,14 @@ export default {
 import { user } from '@/api'
 import { useStore } from '@/store'
 import type { BaseInfo, UserIndex } from '@/types/user'
-import { onActivated, onMounted, ref } from 'vue'
+import { onActivated, ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
 
 const store = useStore()
 const router = useRouter()
-const info = ref<BaseInfo>({})
+const info = computed<BaseInfo>(() => store.getters.userInfo)
 const data = ref<UserIndex>({})
 
-onMounted(() => {
-  info.value = store.getters.userInfo
-  loadUserData()
-})
-
 onActivated(() => {
   if (store.getters['refresh/user']) {
     loadUserData()