用户中心

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
   })

src/layout/components/Navbar.vue

@@ -55,7 +55,7 @@
               我的消息
             </el-dropdown-item>
           </router-link>
-          <span style="display:block;" @click="logoutVisible=true">
+          <span style="display:block;" @click="open">
             <el-dropdown-item>
               退出登录
             </el-dropdown-item>
@@ -63,21 +63,6 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-
-    <!-- 退出登录 -->
-    <el-dialog title="退出登录" :modal-append-to-body="false" :close-on-click-modal="false" :visible.sync="logoutVisible" :before-close="handleClose">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
-        <div class="dialog-delt">
-          <p><span>确定注销并退出系统吗？</span></p>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="logoutVisible = false">取消</el-button>
-          <el-button type="primary" @click="logout">确定</el-button>
-        </div>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -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()

src/views/system/user/center.vue

@@ -23,7 +23,7 @@
               <li><p><i class="iconfont icon-yonghuming" style="font-size: 13px;" />用户名</p><div class="user-right">{{ user.nickName }}</div></li>
               <li><p><i class="iconfont icon-xingbie" />性别</p><div class="user-right">{{ user.gender ? user.gender : '-' }}</div></li>
               <li><p><i class="iconfont icon-yonghujiaose" style="font-size: 12px;" />用户角色</p><div class="user-right"><span v-for="item in user.roles" :key="item.id">{{ item.name }}</span></div></li>
-              <li><p><i class="iconfont icon-suoshuquanzong" />所属全宗</p><div class="user-right">{{ user.fondsId ? user.fondsId : '/' }}</div></li>
+              <li><p><i class="iconfont icon-suoshuquanzong" />所属全宗</p><div class="user-right">{{ user.fonds ? user.fonds.fondsName : '/' }}</div></li>
               <li><p><i class="iconfont icon-suoshubumen" />所属部门</p><div class="user-right">{{ user.dept ? user.dept.deptsName : '/' }}</div></li>
               <li><p><i class="iconfont icon-shoujihaoma" />手机号码</p><div class="user-right">{{ user.email ? user.phone : '-' }}</div></li>
               <li><p><i class="iconfont icon-yonghuyouxiang" style="font-size: 12px;" />用户邮箱</p><div class="user-right">{{ user.email ? user.email : '-' }}</div></li>
@@ -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