diff --git a/src/api/system/user.js b/src/api/system/user.js index 3c4fe2c..91254c6 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -36,7 +36,7 @@ export function edit(data) { export function editUser(data) { return request({ - url: 'api/users/center', + url: 'api/users/updateOwn', method: 'put', data }) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 511d494..3c0edae 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -55,7 +55,7 @@ 我的消息 - + 退出登录 @@ -63,21 +63,6 @@ - - - - - -
-
-

确定注销并退出系统吗?

-
- -
-
@@ -108,7 +93,6 @@ export default { return { Avatar: Avatar, defaultImg: 'this.src="' + require('@/assets/images/avatar.png') + '"', - logoutVisible: false, msgList: [], themeValue: localStorage.getItem('themeValue') ? localStorage.getItem('themeValue') : 'dark' } @@ -210,15 +194,15 @@ export default { this.$router.push({ path: '/user/center', query: { activeIndex: 1 }}) this.$refs.messageDrop.hide() }, - // open() { - // this.$confirm('确定注销并退出系统吗?', '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { - // this.logout() - // }) - // }, + open() { + this.$confirm('确定注销并退出系统吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.logout() + }) + }, logout() { this.$store.dispatch('LogOut').then(() => { location.reload() diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue index 406547a..0971960 100644 --- a/src/views/system/user/center.vue +++ b/src/views/system/user/center.vue @@ -23,7 +23,7 @@
  • 用户名

    {{ user.nickName }}
  • 性别

    {{ user.gender ? user.gender : '-' }}
  • 用户角色

    {{ item.name }}
  • -
  • 所属全宗

    {{ user.fondsId ? user.fondsId : '/' }}
  • +
  • 所属全宗

    {{ user.fonds ? user.fonds.fondsName : '/' }}
  • 所属部门

    {{ user.dept ? user.dept.deptsName : '/' }}
  • 手机号码

    {{ user.email ? user.phone : '-' }}
  • 用户邮箱

    {{ user.email ? user.email : '-' }}
  • @@ -159,7 +159,7 @@ export default { } }, created() { - this.form = { id: this.user.id, nickName: this.user.nickName, gender: this.user.gender, phone: this.user.phone, email: this.user.email } + this.form = { userId: this.user.id, nickName: this.user.nickName, gender: this.user.gender, phone: this.user.phone, email: this.user.email } store.dispatch('GetInfo').then(() => {}) if (this.$route.query) { this.activeIndex = this.$route.query.activeIndex