From 2961569ad7a13d74bd55b33c588d22a7bb1f705d Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 15 十二月 2021 13:09:16 +0800
Subject: [PATCH] Merge branch 'master' of https://dev.pollex.com.tw:8443/r/pcalife/PAM

---
 PAMapp/components/BackActionBar.vue |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index d5da906..11cfcaf 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -22,7 +22,7 @@
       let featureLabel = '';
       switch(routeName) {
         case 'login':
-          featureLabel = '��';
+          featureLabel = '�� | 閮餃��';
           break;
         case 'recommendConsultant':
           featureLabel = '������';
@@ -34,23 +34,38 @@
           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 {
       return '�����';
     }
   }
+
   pushRouterByLoginRole():void{
-    const link = _.isEqual(this.currentRole,Role.ADMIN)? '/myAppointmentList/appointmentList':'/';
-    this.$router.push(link); 
+    const pathName = this.$route.name;
+    pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1);
   }
+
 }
 </script>
 
@@ -61,7 +76,7 @@
   display: flex;
   align-items: center;
   position: fixed;
-  top: 0;
+  top: $MOB_NAV_BAR;
   left: 0;
   width: 100%;
   background-color: $PRIMARY_WHITE;
@@ -77,4 +92,10 @@
     padding: 20px;
   }
 }
+
+@include desktop {
+  .pam-back-action-bar {
+    top: $DESKTOP_NAV_BAR;
+  }
+}
 </style>

--
Gitblit v1.8.0