Merge branch 'develop_lsy' into develop

src/App.vue

@@ -6,14 +6,19 @@ export default {
   components:{
     SideMenu
   },
+  methods:{
+    getInfo(){
+      this.$refs.sideMenu.updataUserInfo()
+    }
+  }
 }
 </script>
 
 <template>
   <div id="app">
     <el-container v-if="$route.fullPath.indexOf('/login') === -1 && $route.fullPath.indexOf('/Create') === -1 && $route.fullPath.indexOf('/forgotpassword') === -1">
-      <el-aside width="260px" class="relative"><SideMenu /></el-aside>
-      <el-main><router-view /></el-main>
+      <el-aside width="260px" class="relative"><SideMenu ref="sideMenu" /></el-aside>
+      <el-main><router-view :getInfo="getInfo" /></el-main>
     </el-container>
     <router-view v-else />
   </div>

src/components/sideMenu.vue

@@ -31,12 +31,8 @@ export default {
       role:''
     }
   },
-  mounted() {
-    if (userStore().user) {
-    this.userName = userStore().user.userName
-    this.email = userStore().user.email
+  mounted(){
     this.role = userStore().user.role
-    }
   },
   methods:{
     logout(){
@@ -47,6 +43,15 @@ export default {
       })
       this.$cookies.remove('accessToken')
       userStore().clearUserInfo()
+    },
+    updataUserInfo(){
+      get(
+        '/pdf-tech/vppMember/getMemberInfo'
+      ).then((res) => {
+        if (res.data.code === 200 && res.data.msg == 'success') {
+          userStore().setUserInfo(res.data.result)
+        }
+      })
     }
   },
   filters:{
@@ -54,7 +59,17 @@ export default {
       if (userStore().user.userName) {
         return userStore().user.userName.substr(0, 1).toUpperCase()
       }
-    }  
+    },
+    name(){
+      if (userStore().user.userName) {
+        return userStore().user.userName
+      }
+    },
+    email(){
+      if (userStore().user.userName) {
+        return userStore().user.email
+      }
+    }
   },
   computed:{
     path () {
@@ -89,42 +104,44 @@ export default {
       <div class="user-info">
         <div class="head-photo"><p>{{ userName | avant() }}</p></div>
         <div class="info">
-          <p>{{ userName }}</p>
-          <p>{{ email }}</p>
+          <p>{{ userName | name() }}</p>
+          <p>{{ email | email() }}</p>
         </div>
         <div class="type">{{ roles }}</div>
       </div>
       <el-menu :default-active="path" active-text-color="#1460F3" text-color="#232A40" router>
-        <el-menu-item index="/dashboard">
-          <Dashboard />
-          <span>Dashboard</span>
-        </el-menu-item>
-        <el-menu-item index="/productManagement">
-          <Product />
-          <span>Product Management</span>
-        </el-menu-item>
-        <el-submenu index="3">
-          <template slot="title">
-            <Team />
-            <span>Team Management</span>
-          </template>
-          <el-menu-item index="/manage-team">Manage Team</el-menu-item>
-          <el-menu-item index="/manage-member">Manage Member</el-menu-item>
-          <el-menu-item index="/manageAdmin">Manage Admin</el-menu-item>
-        </el-submenu>
-        <el-submenu index="4">
-          <template slot="title"> 
-            <License />
-            <span>License Management</span>
-          </template>
-          <el-menu-item index="/licenseManage">Manage License</el-menu-item>
-          <el-menu-item index="/assignlicense">Assign License</el-menu-item>
-          <el-menu-item index="/volumecancel">Volume Cancel</el-menu-item> 
-        </el-submenu>
-        <el-menu-item index="/device">
-          <Device />
-          <span>Device Management</span>
-        </el-menu-item>
+        <div v-if="parseInt(role) === 1 || parseInt(role) === 2">
+          <el-menu-item index="/dashboard">
+            <Dashboard />
+            <span>Dashboard</span>
+          </el-menu-item>
+          <el-menu-item index="/productManagement">
+            <Product />
+            <span>Product Management</span>
+          </el-menu-item>
+          <el-submenu index="3">
+            <template slot="title">
+              <Team />
+              <span>Team Management</span>
+            </template>
+            <el-menu-item index="/manage-team">Manage Team</el-menu-item>
+            <el-menu-item index="/manage-member">Manage Member</el-menu-item>
+            <el-menu-item index="/manageAdmin">Manage Admin</el-menu-item>
+          </el-submenu>
+          <el-submenu index="4">
+            <template slot="title"> 
+              <License />
+              <span>License Management</span>
+            </template>
+            <el-menu-item index="/licenseManage">Manage License</el-menu-item>
+            <el-menu-item index="/assignlicense">Assign License</el-menu-item>
+            <el-menu-item index="/volumecancel">Volume Cancel</el-menu-item> 
+          </el-submenu>
+          <el-menu-item index="/device">
+            <Device />
+            <span>Device Management</span>
+          </el-menu-item>
+        </div>
         <el-menu-item index="/settings">
           <Settings />
           <span>Settings</span>

src/components/tooltip.vue

@@ -1,9 +0,0 @@
-<script>
-export default {
-    
-}
-</script>
-
-<template>
-    
-</template>

src/views/Settings.vue

@@ -3,6 +3,12 @@ import { post, put } from '../../utils/request'
 import { country } from '../../utils/country.js'
 
 export default {
+  props: {
+    getInfo: {
+      type: Function,
+      default: null
+    }
+  },
   data() {
     return {
       active: 0,
@@ -99,6 +105,7 @@ export default {
                 message: 'Change Success',
                 type: 'success'
               })
+              this.getInfo()
             } else if (
               res.data.code === 306 &&
               res.data.msg === '账号或者密码错误'