From a7b7bc7f3a29dd6d435ff3320211e7edbba81bdf Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期三, 01 十二月 2021 11:34:15 +0800
Subject: [PATCH] [ Update ] : 修正錯誤訊息 css ,新增顧問登入查看帳號資訊

---
 PAMapp/components/BackActionBar.vue |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index 428fab1..fbcfa5c 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -9,19 +9,20 @@
 <script lang="ts">
 import { namespace } from 'nuxt-property-decorator';
 import { Vue, Component,} from 'vue-property-decorator';
+import { Role } from '~/assets/ts/models/enum/Role';
 import * as _ from 'lodash';
-import { Role } from './NavBar.vue';
-const localStorage = namespace('localStorage');
+
+const roleStorage = namespace('localStorage');
 @Component
 export default class UiCarousel extends Vue {
-  @localStorage.Getter currentRole!:string;
+  @roleStorage.Getter currentRole!:string;
   get label(): string {
     if (this.$route.name) {
       const routeName = this.$route.name.split('-')[0];
       let featureLabel = '';
       switch(routeName) {
         case 'login':
-          featureLabel = '��';
+          featureLabel = '�� | 閮餃��';
           break;
         case 'recommendConsultant':
           featureLabel = '������';
@@ -33,13 +34,26 @@
           featureLabel = '���“���';
           break;
         case 'agentInfo':
-          featureLabel = '璆剖�鞈��'
+          featureLabel = _.isEqual(this.currentRole,Role.ADMIN) ? '���董�����' : '璆剖�鞈��'
           break;
         default:
           featureLabel = '�����';
           break;
         case 'questionnaire':
           featureLabel = '�脰����';
+          break;
+        case 'notification':
+          featureLabel = '�';
+          break;
+        case 'record':
+          featureLabel = '�������';
+          break;
+        case 'accountSetting':
+          featureLabel = '�犖撣唾�身摰�';
+          break;
+        case 'consultantAccountSetting':
+          featureLabel = '���董�����';
+          break;
       }
       return featureLabel;
     } else {
@@ -47,8 +61,7 @@
     }
   }
   pushRouterByLoginRole():void{
-    const link = _.isEqual(this.currentRole,Role.ADMIN)? '/myAppointmentList/appointmentList':'/';
-    this.$router.push(link); 
+    this.$router.go(-1);
   }
 }
 </script>
@@ -60,7 +73,7 @@
   display: flex;
   align-items: center;
   position: fixed;
-  top: 0;
+  top: $MOB_NAV_BAR;
   left: 0;
   width: 100%;
   background-color: $PRIMARY_WHITE;
@@ -76,4 +89,10 @@
     padding: 20px;
   }
 }
+
+@include desktop {
+  .pam-back-action-bar {
+    top: $DESKTOP_NAV_BAR;
+  }
+}
 </style>

--
Gitblit v1.8.0