魏熙美 преди 6 години
родител
ревизия
a4ca403e6d
променени са 2 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 2
    1
      src/layout/default/User.vue
  2. 6
    1
      src/layout/default/index.vue

+ 2
- 1
src/layout/default/User.vue Целия файл

@@ -6,7 +6,8 @@
6 6
     <el-dropdown @command="clickUser">
7 7
       <span>
8 8
         <xm-icon name="user" :style="{ fontSize: '18px' }"></xm-icon>
9
-        <xm-icon name="arrowdown"></xm-icon>
9
+<!--        <xm-icon name="arrowdown"></xm-icon>-->
10
+        <span>{{ user.username }}</span>
10 11
       </span>
11 12
       <el-dropdown-menu slot="dropdown">
12 13
         <!-- <el-dropdown-item command="resetPassword">重置密码</el-dropdown-item> -->

+ 6
- 1
src/layout/default/index.vue Целия файл

@@ -9,7 +9,7 @@
9 9
     <el-container>
10 10
       <el-header class="head">
11 11
         <div class="h-item">&nbsp;</div>
12
-        <user class="h-item-noflex" :messages="[1]" @logout="logout" @resetPassword="resetPassword"></user>
12
+        <user class="h-item-noflex" :user="userAuthority" :messages="[1]" @logout="logout" @resetPassword="resetPassword"></user>
13 13
       </el-header>
14 14
       <el-breadcrumb class="breadcrumb" separator-class="el-icon-arrow-right">
15 15
         <el-breadcrumb-item :to="{ name: 'index' }">首页</el-breadcrumb-item>
@@ -69,6 +69,11 @@ export default {
69 69
     //     this.menus = pages
70 70
     //   })
71 71
     // }
72
+    this.$store.dispatch('getUser').then((data) => {
73
+      this.menuArray = pageArray
74
+      this.menus = pages
75
+      this.userAuthority = data
76
+    })
72 77
     this.menuArray = pageArray
73 78
     this.menus = pages
74 79
   },