修改

src/layout/components/Navbar.vue

@@ -7,11 +7,7 @@
       @toggleClick="toggleSideBar"
     />
 
-    <breadcrumb
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
-      id="breadcrumb-container"
-      class="breadcrumb-container"
-      v-if="!topNav"
-    />
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
@@ -24,7 +20,7 @@
 
         <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
         <ruo-yi-doc id="xinyilu-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -33,10 +29,7 @@
         </el-tooltip>
       </template>
 
-      <el-dropdown
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        class="avatar-container right-menu-item hover-effect"
-        trigger="click"
-      >
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
@@ -77,7 +70,7 @@ export default {
     SizeSelect,
     Search,
     xinyiluGit,
-    xinyiluDoc,
+    xinyiluDoc
   },
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),
@@ -88,15 +81,15 @@ export default {
       set(val) {
         this.$store.dispatch("settings/changeSetting", {
           key: "showSettings",
-          value: val,
+          value: val
         });
-      },
+      }
     },
     topNav: {
       get() {
         return this.$store.state.settings.topNav;
-      },
+      }
-    },
+    }
   },
   methods: {
     toggleSideBar() {
@@ -106,7 +99,7 @@ export default {
       this.$confirm("确定注销并退出系统吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
           this.$store.dispatch("LogOut").then(() => {
@@ -114,8 +107,8 @@ export default {
           });
         })
         .catch(() => {});
-    },
+    }
-  },
+  }
 };
 </script>
 

src/store/modules/user.js

@@ -2,95 +2,95 @@ import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const user = {
-  state: {
+    state: {
-    token: getToken(),
+        token: getToken(),
-    name: '',
+        name: '',
-    avatar: '',
+        avatar: '',
-    roles: [],
+        roles: [],
-    permissions: []
+        permissions: []
-  },
+    },
 
-  mutations: {
+    mutations: {
-    SET_TOKEN: (state, token) => {
+        SET_TOKEN: (state, token) => {
-      state.token = token
+            state.token = token
+        },
+        SET_NAME: (state, name) => {
+            state.name = name
+        },
+        SET_AVATAR: (state, avatar) => {
+            state.avatar = avatar
+        },
+        SET_ROLES: (state, roles) => {
+            state.roles = roles
+        },
+        SET_PERMISSIONS: (state, permissions) => {
+            state.permissions = permissions
+        }
     },
-    SET_NAME: (state, name) => {
+
-      state.name = name
+    actions: {
-    },
+        // 登录
-    SET_AVATAR: (state, avatar) => {
+        Login({ commit }, userInfo) {
-      state.avatar = avatar
+            const username = userInfo.username.trim()
-    },
+            const password = userInfo.password
-    SET_ROLES: (state, roles) => {
+            const code = userInfo.code
-      state.roles = roles
+            const uuid = userInfo.uuid
-    },
+            return new Promise((resolve, reject) => {
-    SET_PERMISSIONS: (state, permissions) => {
+                login(username, password, code, uuid).then(res => {
-      state.permissions = permissions
+                    setToken(res.token)
+                    commit('SET_TOKEN', res.token)
+                    resolve()
+                }).catch(error => {
+                    reject(error)
+                })
+            })
+        },
+
+        // 获取用户信息
+        GetInfo({ commit, state }) {
+            return new Promise((resolve, reject) => {
+                getInfo().then(res => {
+                    const user = res.user
+                    const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/logo/logo.png") : process.env.VUE_APP_BASE_API + user.avatar;
+                    if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+                        commit('SET_ROLES', res.roles)
+                        commit('SET_PERMISSIONS', res.permissions)
+                    } else {
+                        commit('SET_ROLES', ['ROLE_DEFAULT'])
+                    }
+                    commit('SET_NAME', user.userName)
+                    commit('SET_AVATAR', avatar)
+                    resolve(res)
+                }).catch(error => {
+                    reject(error)
+                })
+            })
+        },
+
+        // 退出系统
+        LogOut({ commit, state }) {
+            return new Promise((resolve, reject) => {
+                logout(state.token).then(() => {
+                    commit('SET_TOKEN', '')
+                    commit('SET_ROLES', [])
+                    commit('SET_PERMISSIONS', [])
+                    removeToken()
+                    resolve()
+                }).catch(error => {
+                    reject(error)
+                })
+            })
+        },
+
+        // 前端 登出
+        FedLogOut({ commit }) {
+            return new Promise(resolve => {
+                commit('SET_TOKEN', '')
+                removeToken()
+                resolve()
+            })
+        }
     }
-  },
-
-  actions: {
-    // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-      return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          setToken(res.token)
-          commit('SET_TOKEN', res.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 获取用户信息
-    GetInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', user.userName)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 退出系统
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 前端 登出
-    FedLogOut({ commit }) {
-      return new Promise(resolve => {
-        commit('SET_TOKEN', '')
-        removeToken()
-        resolve()
-      })
-    }
-  }
 }
 
-export default user
+export default user