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 |   87 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index e55c62c..3754bfb 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -7,13 +7,29 @@
       <div class="pam-header__title--sub">�����兢蝳�風��</div>
     </div>
     <div class="pam-header__action-bar">
-      <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
-        @click="$router.push('/notification')"></i>
+      <i
+        v-if="currentRole"
+        class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
+        @click="$router.push('/notification')"
+      ></i>
         <el-dropdown :class="{'is-open':isOpenDropdown}"
           ref="dropdown"
           trigger="click"
           @command="routerNavigateTo">
-          <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue" @click="isOpenDropdown =!isOpenDropdown" @blur="isOpenDropdown =false"></i>
+          <div
+            @click="isOpenDropdown =!isOpenDropdown"
+            @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">
@@ -34,17 +50,29 @@
 <script lang="ts">
   import { Vue, Component } from 'vue-property-decorator';
   import { namespace } from 'nuxt-property-decorator';
-  import { Role } from '~/assets/ts/models/enum/Role';
+  import { Role } from '~/shared/models/enum/Role';
   import * as _ from 'lodash';
 
   const roleStorage = namespace('localStorage');
   @Component
   export default class NavBar extends Vue {
-    @roleStorage.Mutation storageClear!: () => void;
-    @roleStorage.Mutation storageClearQuickFilter!: () => void;
-    @roleStorage.Mutation storageClearRecommendConsultant!: () => void;
-    @roleStorage.Getter idToken!: string | null;
-    @roleStorage.Getter currentRole!: string | null;
+
+    @roleStorage.Getter
+    idToken!: string | null;
+
+    @roleStorage.Getter
+    currentRole!: string | null;
+
+    @roleStorage.Getter
+    consultantId!: string | null;
+
+    @roleStorage.Mutation
+    storageClear!: () => void;
+
+    @roleStorage.Getter
+    isAdminLogin!: boolean;
+
+    isOpenDropdown = false;
 
     navBarList = [{
         authorityOfRoleList: [Role.NOT_LOGIN],
@@ -58,7 +86,7 @@
       },
       {
         authorityOfRoleList:[Role.ADMIN],
-        routeUrl: '/consultantAccountSetting',
+        routeUrl: '/agentInfo/',
         title: '���董�����',
       },
       {
@@ -77,6 +105,11 @@
         title: '���“���',
       },
       {
+        authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
+        routeUrl: '/faq',
+        title: 'F&Q 撣貉����',
+      },
+      {
         authorityOfRoleList: [Role.USER, Role.ADMIN],
         routeUrl: '',
         title: '��',
@@ -87,29 +120,30 @@
         title: '憿批��',
       },
     ];
-    login_role = Role.NOT_LOGIN;
-    isOpenDropdown = false;
 
-    get loginRole(): string {
-      return this.idToken && this.currentRole ? this.currentRole : Role.NOT_LOGIN;
-    }
+    //////////////////////////////////////////////////////////////////////
 
     routerNavigateTo(url: string): void {
       (this.$refs.dropdown as any).hide();
-      _.isEqual(url, '') ? this.fakeLogout() : this.$router.push(url);
+      _.isEqual(url,'')
+        ? this.logout()
+        : this.$router.push(_.isEqual(url,'/agentInfo/') ? url+this.consultantId :url);
     }
 
     pushRouterByLoginRole(): void {
       const link = _.isEqual(this.currentRole, Role.ADMIN) ? '/myAppointmentList/appointmentList' : '/';
       this.$router.push(link);
     }
-    // TODO: ��TP隤����� ���蝙�
-    fakeLogout(): void {
+
+    logout(): void {
       this.storageClear();
-      this.storageClearQuickFilter();
-      this.storageClearRecommendConsultant();
       _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
     }
+
+    get loginRole(): Role {
+      return this.idToken && this.currentRole ? (this.currentRole as Role): Role.NOT_LOGIN;
+    }
+
   }
 
 </script>
@@ -180,6 +214,13 @@
           padding: 0px 10px;
         }
       }
+
+      .admin-avatar {
+        margin: 0px 15px;
+        @media screen and (max-width: 352px) {
+          margin: 0px 10px;
+        }
+      }
     }
   }
 
@@ -200,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