From 41bc5df9cda6a43ef47313622dd1ffde1480d06f Mon Sep 17 00:00:00 2001
From: KillerADO <wayne8692wayne8692@gmail.com>
Date: 星期四, 23 十二月 2021 10:49:04 +0800
Subject: [PATCH] [update] 調整簡訊的service url與新增簡訊的標題欄位

---
 PAMapp/components/NavBar.vue |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 515332f..6e3d2ab 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"
@@ -41,13 +41,15 @@
   @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;

--
Gitblit v1.8.0