From c20a0f1a1dbaa23d1b073f9a9377cac5d572f277 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 23 十二月 2021 15:10:18 +0800
Subject: [PATCH] fixed TODO#131357 進行預約: 職業選擇畫面調整

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

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index b782eb9..ca0cc1e 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -7,8 +7,8 @@
       <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 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"
@@ -34,17 +34,17 @@
 <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 consultantId!: string | null;
 
     navBarList = [{
         authorityOfRoleList: [Role.NOT_LOGIN],
@@ -57,19 +57,29 @@
         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: '�������',
       },
       {
         authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
         routeUrl: '/myConsultantList/consultantList',
         title: '���“���',
+      },
+      {
+        authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
+        routeUrl: '/faq',
+        title: 'F&Q 撣貉����',
       },
       {
         authorityOfRoleList: [Role.USER, Role.ADMIN],
@@ -85,24 +95,24 @@
     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();
-      this.storageClearQuickFilter();
-      this.storageClearRecommendConsultant();
       _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
     }
   }

--
Gitblit v1.8.0