From 18098111cc905e88524e7d9ce788b742637e0824 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 14 十二月 2021 16:02:04 +0800
Subject: [PATCH] refactor: 快速篩選 1. 整理 methods 順序 2. 整理 interface、const

---
 PAMapp/components/NavBar.vue |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 20578a1..6e3d2ab 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -7,9 +7,9 @@
       <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>
-        <el-dropdown :class="{'is-open':isOpenDropdown}" 
+      <!-- <i 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">
@@ -36,18 +36,20 @@
   import { namespace } from 'nuxt-property-decorator';
   import { Role } from '~/assets/ts/models/enum/Role';
   import * as _ from 'lodash';
-  
+
   const roleStorage = namespace('localStorage');
   @Component
   export default class NavBar extends Vue {
     @roleStorage.Mutation storageClear!: () => void;
+
     @roleStorage.Getter idToken!: string | null;
     @roleStorage.Getter currentRole!: string | null;
+    @roleStorage.Getter consultantId!: string | null;
 
     navBarList = [{
         authorityOfRoleList: [Role.NOT_LOGIN],
         routeUrl: '/login',
-        title: '��',
+        title: '�� | 閮餃��',
       },
       {
         authorityOfRoleList: [Role.USER],
@@ -55,13 +57,18 @@
         title: '�犖撣唾�身摰�',
       },
       {
-        authorityOfRoleList: [Role.ADMIN],
-        routeUrl: '/notFinish',
+        authorityOfRoleList:[Role.ADMIN],
+        routeUrl: '/agentInfo/',
         title: '���董�����',
       },
       {
-        authorityOfRoleList: [Role.USER, Role.ADMIN],
-        routeUrl: '/record/contactRecord',
+        authorityOfRoleList:[Role.ADMIN],
+        routeUrl: '/record',
+        title: '�������',
+      },
+      {
+        authorityOfRoleList: [Role.USER],
+        routeUrl: '/userReviewsRecord',
         title: '�������',
       },
       {
@@ -83,21 +90,23 @@
     login_role = Role.NOT_LOGIN;
     isOpenDropdown = false;
 
-    get loginRole(): string {
-      return this.idToken && this.currentRole ? this.currentRole : Role.NOT_LOGIN;
+    get loginRole(): Role {
+      return this.idToken && this.currentRole ? (this.currentRole as Role): 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();
       _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
     }
@@ -114,7 +123,7 @@
     display: flex;
     align-items: center;
     background-color: $PRIMARY_WHITE;
-    z-index: 3;
+    z-index: 6;
 
     .pam-header__logo {
       height: 30px;
@@ -184,7 +193,7 @@
         color: $PRIMARY_WHITE;
       }
     }
-  } 
+  }
 
   @include desktop {
     .pam-header {
@@ -202,7 +211,7 @@
 
       .pam-header__title {
         display: flex;
-        justify-content: start;
+        justify-content: flex-start;
         align-items: center;
         border: none;
         padding-left: 30px;

--
Gitblit v1.8.0