From 38b68f92b9a47ca3947985d6b581603fe05106c7 Mon Sep 17 00:00:00 2001
From: charlie <charlie@lvguanqingdeMacBook-Pro.local>
Date: 星期六, 22 一月 2022 11:56:00 +0800
Subject: [PATCH] update: 1. 新增約訪預約資訊頭像圖片和型別icon,微調對齊方式         2. 約訪結案列表的樣式修正並調整進度條色彩

---
 PAMapp/components/NavBar.vue |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 58a73cd..3754bfb 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -16,11 +16,20 @@
           ref="dropdown"
           trigger="click"
           @command="routerNavigateTo">
-          <i
-            class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue"
+          <div
             @click="isOpenDropdown =!isOpenDropdown"
-            @blur="isOpenDropdown =false"
-          ></i>
+            @blur="isOpenDropdown =false">
+            <template v-if="isAdminLogin">
+              <UiAvatar
+              :size="30"
+              :agentNo="consultantId"
+              class="admin-avatar"
+              ></UiAvatar>
+            </template>
+            <template v-else>
+              <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue"></i>
+            </template>
+          </div>
           <el-dropdown-menu
             class="pam-header__dropdown">
             <template v-for="(item,index) in navBarList">
@@ -48,11 +57,20 @@
   @Component
   export default class NavBar extends Vue {
 
-    @roleStorage.Getter idToken!: string | null;
-    @roleStorage.Getter currentRole!: string | null;
-    @roleStorage.Getter consultantId!: string | null;
+    @roleStorage.Getter
+    idToken!: string | null;
 
-    @roleStorage.Mutation storageClear!: () => void;
+    @roleStorage.Getter
+    currentRole!: string | null;
+
+    @roleStorage.Getter
+    consultantId!: string | null;
+
+    @roleStorage.Mutation
+    storageClear!: () => void;
+
+    @roleStorage.Getter
+    isAdminLogin!: boolean;
 
     isOpenDropdown = false;
 
@@ -196,6 +214,13 @@
           padding: 0px 10px;
         }
       }
+
+      .admin-avatar {
+        margin: 0px 15px;
+        @media screen and (max-width: 352px) {
+          margin: 0px 10px;
+        }
+      }
     }
   }
 
@@ -216,11 +241,11 @@
       height: $DESKTOP_NAV_BAR;
 
       .pam-header__logo {
-        width: 180px;
-        height: 100%;
+        width: 160px;
+        height: 70px;
         margin: 0;
         background-image: url('~/assets/images/logo.png');
-        background-size: cover;
+        background-size: contain;
         background-repeat: no-repeat;
         background-position: center;
       }

--
Gitblit v1.8.0