From c25690c2dd239028b05f67fc41f7e62741d7ab27 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 01 十二月 2021 17:10:54 +0800
Subject: [PATCH] [fix] 修正db連線url 

---
 PAMapp/components/BackActionBar.vue |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index c07372b..1bfc41a 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -34,22 +34,37 @@
           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 backToPrevious = ['recommendConsultant-result', 'agentInfo-agentNo', 'questionnaire-agentNo'];
+    const find = backToPrevious.findIndex(item => this.$route.name?.includes(item));
+    find > -1 ? this.$router.go(-1) : this.$router.push('/');
   }
 }
 </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