fix(sys-client): fix nav styles & user state;

maslow · Sep 8, 2021 · 4885ecd · 4885ecd
1 parent b91ba2b
commit 4885ecd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/packages/system-client/src/api/user.js b/packages/system-client/src/api/user.js
@@ -18,7 +18,7 @@ export function login(data) {
  * @param {string} token
  * @returns
  */
-export function getInfo() {
+export function getUserProfile() {
   return request({
     url: '/account/profile',
     method: 'get'

diff --git a/packages/system-client/src/layout/app.vue b/packages/system-client/src/layout/app.vue
@@ -34,6 +34,11 @@ export default {
   },
   async created() {
     console.log('app layout created', this.$route)
+    if (!this.app) {
+      this.$router.push({
+        path: '/applications'
+      })
+    }
   },
   beforeDestroy() {
     resetRouter()

diff --git a/packages/system-client/src/layout/components/Navbar.vue b/packages/system-client/src/layout/components/Navbar.vue
@@ -11,9 +11,7 @@
       <tags-view v-if="!hideTags" />
     </div>
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-      </template>
+      <screenfull id="screenfull" class="right-menu-item hover-effect" />
       <div class="github right-menu-item">
         <a target="_blank" href="https://github.com/Maslow/laf/">
           GitHub
@@ -35,7 +33,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import Screenfull from '@/components/Screenfull'
 import TagsView from './TagsView'
 export default {
@@ -54,10 +51,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([
-      'name',
-      'device'
-    ])
+    name() {
+      const profile = this.$store.state.user.user_profile
+      return profile?.username || profile?.name
+    }
   },
   methods: {
     async logout() {
@@ -118,7 +115,6 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    width: 200px;
     line-height: 50px;
     display: flex;
 

diff --git a/packages/system-client/src/store/modules/user.js b/packages/system-client/src/store/modules/user.js
@@ -1,30 +1,25 @@
-import { login, getInfo } from '@/api/user'
+import { login, getUserProfile } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { resetRouter } from '@/router'
 import { Message } from 'element-ui'
 
 const state = {
   token: getToken(),
-  name: '',
-  avatar: ''
+  user_profile: null
 }
 
 const mutations = {
   SET_TOKEN: (state, token) => {
     state.token = token
   },
-  SET_NAME: (state, name) => {
-    state.name = name
-  },
-  SET_AVATAR: (state, avatar) => {
-    state.avatar = avatar
+  SET_USER_PROFILE: (state, user_profile) => {
+    state.user_profile = user_profile
   }
 }
 
 const actions = {
   // user login
-  async login({ commit }, userInfo) {
-    const { username, password } = userInfo
+  async login({ commit }, { username, password }) {
     const res = await login({ username: username.trim(), password: password })
     const { data } = res
     if (res.error) {
@@ -38,29 +33,26 @@ const actions = {
 
   // get user info
   async getInfo({ commit, dispatch }) {
-    const res = await getInfo()
+    const res = await getUserProfile()
     const { data } = res
     if (!data) {
       return dispatch('/user/logout')
     }
     const account = data
-    commit('SET_NAME', account.name || account.username)
-    commit('SET_AVATAR', account.avatar)
+    commit('SET_USER_PROFILE', account)
     return data
   },
 
   // user logout
   logout({ commit, state, dispatch }) {
     return new Promise((resolve, reject) => {
-      commit('SET_TOKEN', '')
-      commit('SET_NAME', '')
-      commit('SET_AVATAR', '')
       removeToken()
       resetRouter()
 
       // reset visited views and cached views
       // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
       dispatch('tagsView/delAllViews', null, { root: true })
+      dispatch('app/clearStates')
       resolve()
     })
   },
@@ -69,6 +61,8 @@ const actions = {
   resetToken({ commit }) {
     return new Promise(resolve => {
       commit('SET_TOKEN', '')
+      commit('SET_USER_PROFILE', null)
+      commit('SET_USER_PROFILE', null)
       removeToken()
       resolve()
     })