diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg index b3a940b..dd95b88 100644 Binary files a/src/assets/images/profile.jpg and b/src/assets/images/profile.jpg differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ba5e9d0..c812257 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -50,10 +50,7 @@ trigger="hover" >
- + {{ userInfo.name }} diff --git a/src/permission.js b/src/permission.js index 5b905fc..53f4777 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,8 +36,8 @@ router.beforeEach((to, from, next) => { if (store.getters.roles.length === 0) { isRelogin.show = true // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(() => { - store.dispatch('GetNetConfig').then(res => { + store.dispatch('GetNetConfig').then(res => { + store.dispatch('GetInfo').then(() => { isRelogin.show = false store.dispatch('GenerateRoutes').then(accessRoutes => { // 根据roles权限生成可访问的路由表 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 987a215..e5f602c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,7 +7,7 @@ import { getToken, getLoginInfo, setToken, setLoginInfo, removeToken, removeLogi import { isHttp, isEmpty } from "@/utils/validate" import defAva from '@/assets/images/profile.jpg' import { initMinioClient, parseMinioFilePath } from '@/utils/requestMinio' - +import Cookies from 'js-cookie' const user = { state: { loginInfo: getLoginInfo(), @@ -78,7 +78,9 @@ const user = { } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } - commit('SET_USER_INFO', user) + Cookies.set("avatar", state.netConfig.MINIO_ENDPOINT_HTTPS + user.avatar || defAva, { expires: 30 }); + Cookies.set("name", user.name || "", { expires: 30 }); + commit('SET_USER_INFO', { ...user, avatar: state.netConfig.MINIO_ENDPOINT_HTTPS + user.avatar || defAva }) cache.session.set('pwrChrtype', res.pwdChrtype) /* 初始密码提示 */ if (res.isDefaultModifyPwd) { diff --git a/src/views/login.vue b/src/views/login.vue index fdc4e9b..a80816c 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -29,9 +29,9 @@ >
- +
-

你好, {{ $store.state.user.userName }}

+

你好, {{ loginForm.name }}

{ + console.log(this.loginForm); if (valid) { this.loading = true; if (this.loginForm.rememberMe) { + Cookies.set("avatar", this.loginForm.avatar, { expires: 30 }); + Cookies.set("name", this.loginForm.name, { expires: 30 }); Cookies.set("username", this.loginForm.username, { expires: 30 }); Cookies.set("password", encrypt(this.loginForm.password), { expires: 30, @@ -185,6 +196,8 @@ export default { expires: 30, }); } else { + Cookies.remove("avatar"); + Cookies.remove("name"); Cookies.remove("username"); Cookies.remove("password"); Cookies.remove("rememberMe"); @@ -194,7 +207,9 @@ export default { username: this.loginForm.username, password: this.md5Encrypt(this.loginForm.password), psign: this.md5Encrypt("xycloud_" + this.loginForm.password), - version: this.$store.getters.loginInfo?.upgrade_data?.version || "V01.01.16", + version: + this.$store.getters.loginInfo?.upgrade_data?.version || + "V01.01.16", }) .then(() => { this.$router.push({ path: this.redirect || "/" }).catch(() => {});