diff --git a/src/views/layout/main-navbar-update-password.vue b/src/views/layout/main-navbar-update-password.vue index d8caba6..77c607f 100644 --- a/src/views/layout/main-navbar-update-password.vue +++ b/src/views/layout/main-navbar-update-password.vue @@ -56,11 +56,22 @@ }, computed: { userName: { - get () { return this.$store.state.user.name } + get () { + return this.$store.state.user.username + } + }, + realName: { + get () { + return this.$store.state.user.realName + } }, mainTabs: { - get () { return this.$store.state.common.mainTabs }, - set (val) { this.$store.commit('common/updateMainTabs', val) } + get () { + return this.$store.state.common.mainTabs + }, + set (val) { + this.$store.commit('common/updateMainTabs', val) + } } }, methods: { diff --git a/src/views/layout/main-navbar.vue b/src/views/layout/main-navbar.vue index f88307d..4696326 100644 --- a/src/views/layout/main-navbar.vue +++ b/src/views/layout/main-navbar.vue @@ -38,7 +38,7 @@ - {{ userName }} + {{ realName }} 修改密码 @@ -80,7 +80,10 @@ set (val) { this.$store.commit('common/updateMainTabs', val) } }, userName: { - get () { return this.$store.state.user.name } + get () { return this.$store.state.user.username } + }, + realName: { + get () { return this.$store.state.user.realName } } }, methods: { diff --git a/src/views/layout/main.vue b/src/views/layout/main.vue index c52cb31..138c088 100644 --- a/src/views/layout/main.vue +++ b/src/views/layout/main.vue @@ -19,7 +19,7 @@ import MainSidebar from './main-sidebar' import MainContent from './main-content' import { apiGetUserInfo } from '@/api/api_sys' - + export default { provide () { return { @@ -55,7 +55,9 @@ set (val) { this.$store.commit('user/updateId', val) } }, userName: { - get () { return this.$store.state.user.name }, + get () { + return this.$store.state.user.userName + }, set (val) { this.$store.commit('user/updateName', val) } } }, @@ -63,9 +65,9 @@ this.handleGetUserInfo() }, mounted () { - + this.resetDocumentClientHeight() - + }, methods: { // 重置窗口可视高度 @@ -82,6 +84,7 @@ this.loading = false this.userId = res.user.userId this.userName = res.user.username + this.$store.state.user = res.user this.mobile = res.user.mobile this.$watermark.set(this.userName + ' ' + this.mobile.substr(0, 4)) } else { @@ -89,8 +92,8 @@ } }) } - + } } - +