root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复用户昵称显示与登录跳转问题

Browse Source
This commit is contained in:
liyd
2022-12-01 17:30:26 +08:00
parent 2e1b5ce5ac
commit 5573b0c02b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nladmin-ui/src/layout/components/Navbar.vue
View File

@@ -25,7 +25,8 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover"> <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<!-- <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">--> <!-- <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">-->
<span class="user-nickname">{{ user.nickName }}</span> <span class="user-nickname">{{ user.personName }}</span>
<!-- <span class="user-nickname">258</span>-->
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<span style="display:block;" @click="show = true"> <span style="display:block;" @click="show = true">

4
nladmin-ui/src/store/modules/user.js
View File

@@ -85,10 +85,10 @@ export const logOut = (commit) => {
export const setUserInfo = (res, commit) => { export const setUserInfo = (res, commit) => {
// 如果没有任何权限，则赋予一个默认的权限，避免请求死循环 // 如果没有任何权限，则赋予一个默认的权限，避免请求死循环
if (res.roles.length === 0) { if (res.permissions.length === 0) {
commit('SET_ROLES', ['ROLE_SYSTEM_DEFAULT']) commit('SET_ROLES', ['ROLE_SYSTEM_DEFAULT'])
} else { } else {
commit('SET_ROLES', res.roles) commit('SET_ROLES', res.permissions)
} }
commit('SET_USER', res.user) commit('SET_USER', res.user)
} }