From 7133491370940f9442dbac79af1408845f0ac5d2 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 25 一月 2022 09:04:28 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3

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

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 13c53a4..af197ad 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -142,18 +142,10 @@
 
     @Watch('$route', {immediate: true})
     onRouterChange() {
-        this.getNotificationAndReviewLog();
-    }
-
-    private getNotificationAndReviewLog() {
-      if (this.isUserLogin) {
-        this.storeMyPersonalNotification();
-        this.storeMyAppointmentReviewLog();
-      }
-
-      if (this.isAdminLogin) {
-        this.storeMyPersonalNotification();
-      }
+        if (this.currentRole) {
+          this.storeMyPersonalNotification();
+          this.storeMyAppointmentReviewLog();
+        }
     }
 
     //////////////////////////////////////////////////////////////////////

--
Gitblit v1.8.0