From 4158cdb2fdd45d5d6d5c6dd11002bd59524396a6 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 4 Aug 2020 10:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu.vue           | 7 +++----
 src/pages/workbench/workPlace.vue | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/menu.vue b/src/components/menu.vue
index a25e254..cce92cb 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -13,11 +13,10 @@
       >{{ userInfo.user_name }}</span>
       <span v-else @click="gotopage('login')" class="user">请登录</span>
       <img
-        :class="userInfo.picture_path ? 'user_pic' : 'user_default'"
-        :src="
-          userInfo.picture_path || require('../assets/imgs/home_ic_user.png')
-        "
+        :class="userInfo.picture_path&&false ? 'user_pic' : 'user_default'"
+        src="../assets/imgs/home_ic_user.png"
       />
+      <!-- 菜单图片不需要动态渲染，只用ui给的图标 -->
       <div v-if="userInfo.user_name && userInfo.user_name != ''" class="user_menu">
         <div
           v-for="(item, index) in user_arr"
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index abe7786..f2b4d47 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -3,7 +3,7 @@
     <div class="person_info">
       <div class="preson">
         <div class="person_text">
-          <img src="@/assets/imgs/img_head.png" alt />
+          <img style="width:40px;" :src="picture_path" alt />
           <span>你好，{{ person }}！{{login_time?'最近登录 ':''}}{{ login_time }}</span>
         </div>
         <div class="person_menu">
@@ -357,6 +357,7 @@ export default {
       helper: helper,
       service_data: [],
       app_data: [],
+      picture_path:'',
       listTotal: 0,
       currentPage: 1,
       listTotal1: 0,
@@ -1346,6 +1347,7 @@ export default {
       this.$router.push("/fwzc/fwcs");
     },
     getUserData() {
+      this.picture_path = this.userInfo.picture_path;
       this.person = this.userInfo.user_name;
       this.login_time = decodeURIComponent(getCookie("lastLogin")).replace(
         "+",
-- 
2.26.0