From 6e536c90b4f71788e79a1c3718000329803bfe5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Mon, 9 Nov 2020 12:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                          | 9 ++++-----
 src/components/kpi-layout/NavBar.vue | 8 ++++----
 src/views/kpi/workbench/index.vue    | 6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2adcd43..1a63dab 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex'
+import { mapState, mapActions, mapMutations } from 'vuex'
 import * as dd from 'dingtalk-jsapi'
 import { apiDingtalkLogin, apiUserInfo } from '@/api/login'
 export default {
@@ -37,7 +37,8 @@ export default {
     onCancel () {
 
     },
-    ...mapActions(['GET_DEPLIST', 'SET_USER_INFO']),
+    ...mapActions(['GET_DEPLIST']),
+    ...mapMutations(['SET_USER_INFO']),
     // 获取钉钉鉴权码
     handleGetDingtalkCode () {
       return new Promise((resolve, reject) => {
@@ -77,9 +78,7 @@ export default {
       let res = await apiUserInfo()
       console.log('获取用户信息res: ', res)
       if (res.code === 200) {
-        console.log('this.SET_USER_INFO: ', this.SET_USER_INFO)
-        // this.SET_USER_INFO(res.user)
-        this.$store.commit('SET_USER_INFO', res.user)
+        this.SET_USER_INFO(res.user)
       }
     }
   }
diff --git a/src/components/kpi-layout/NavBar.vue b/src/components/kpi-layout/NavBar.vue
index 93c58cb..c54c760 100644
--- a/src/components/kpi-layout/NavBar.vue
+++ b/src/components/kpi-layout/NavBar.vue
@@ -14,8 +14,8 @@
         <nav-header v-if="!isNav"/>
        </transition>
        <div class="navBar-right" v-if="isNav">
-          <span>{{this.info.realName}}</span>
-          <img  :src="this.info || ''" alt="">
+          <span>{{this.userInfo.realName}}</span>
+          <img  :src="this.userInfo.avatar || ''" alt="">
         </div>
     </div>
 </template>
@@ -23,7 +23,7 @@
 <script>
 import routeList from '@/router/kpi_route'
 import NavHeader from './NavHeader'
-import { mapState } from 'vuex'
+import { mapGetters } from 'vuex'
 export default {
   name: 'NavBar',
   data () {
@@ -37,7 +37,7 @@ export default {
     NavHeader
   },
   computed: {
-    ...mapState({ info: state => state.user.info }),
+    ...mapGetters(['userInfo']),
     isNav () {
       return !!this.$route.meta.isNav
     },
diff --git a/src/views/kpi/workbench/index.vue b/src/views/kpi/workbench/index.vue
index 40b70ef..9cf3c70 100644
--- a/src/views/kpi/workbench/index.vue
+++ b/src/views/kpi/workbench/index.vue
@@ -56,13 +56,11 @@ export default {
         this.token = res.token
         this.$cookies.set('token', res.token, res.expire)
         let ress = await apiUserInfo()
-        console.log('ress.user: ', ress.user)
         if (ress.code === 200) {
-          // this.SET_USER_INFO(ress.user)
-          this.$store.commit('SET_USER_INFO', ress.user)
+          this.SET_USER_INFO(ress.user)
         }
         console.log('ress: ', ress)
-        // location.reload()
+        location.reload()
       }
     }
   },