From 376be3ab35d682a1cdd86611382cc7de757152cb 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 09:06:28 +0800
Subject: [PATCH 1/3] =?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/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index b033fcf..c0e9ad7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,6 +13,6 @@ const router = [
 
 export default new Router({
   base: '/digitization/',
-  mode: 'history',
+  // mode: 'history',
   routes: [...configRouter, ...kpiRouter, ...router]
 })

From 7c586cb6fd83bb99fd6d34291bf052bd5d7d2f3a 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 09:19:24 +0800
Subject: [PATCH 2/3] =?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/components/kpi-layout/NavBar.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/kpi-layout/NavBar.vue b/src/components/kpi-layout/NavBar.vue
index a44eb06..9b02e1b 100644
--- a/src/components/kpi-layout/NavBar.vue
+++ b/src/components/kpi-layout/NavBar.vue
@@ -20,8 +20,10 @@
         </div> -->
        </transition>
        <div>{{isNav}}---{{this.userInfo.realName}}</div>
-       <div class="navBar-right" v-if="isNav">
-          <span>{{this.userInfo.realName}}</span>
+       <div class="navBar-right">
+          <span>{{this.userInfo.realName}}</span><span>{{this.userInfo}}</span><span>熊承强</span>
+          <img  src="/static/default.jpg" />
+          <img src="../../..//static/default.jpg" />
           <img onerror="javascript:this.src='/static/default.jpg';" :src="this.userInfo.avatar || ''" alt="">
         </div>
     </div>

From 0e4c30f0c19d09c70d6c0418a477111deb2ccbaa 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 09:25:11 +0800
Subject: [PATCH 3/3] =?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/components/kpi-layout/NavBar.vue    | 1 +
 src/components/kpi-layout/NavHeader.vue | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/kpi-layout/NavBar.vue b/src/components/kpi-layout/NavBar.vue
index 9b02e1b..781026c 100644
--- a/src/components/kpi-layout/NavBar.vue
+++ b/src/components/kpi-layout/NavBar.vue
@@ -56,6 +56,7 @@ export default {
   },
   beforeMount () {},
   mounted () {
+    console.log('userInfo: ', this.userInfo)
   },
   methods: {
     handleToRouter (item) {
diff --git a/src/components/kpi-layout/NavHeader.vue b/src/components/kpi-layout/NavHeader.vue
index 43b2208..a1dc32f 100644
--- a/src/components/kpi-layout/NavHeader.vue
+++ b/src/components/kpi-layout/NavHeader.vue
@@ -33,7 +33,9 @@ export default {
       console.log('this.isPopup: ', this.isPopup)
       if (this.isPopup) return this.open()
       history.go(-1)
-      // this.$router.go(-1)
+      console.log('history: ', history)
+      console.log('this.$router: ', this.$router)
+      this.$router.go(-1)
     },
     open () {
       const obj = {