From e8241decc705f9db3e46aed7b3a3f8b3188cf820 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 10 三月 2022 15:46:46 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
PAMapp/components/NavBar.vue | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 13c53a4..75290c0 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -9,9 +9,12 @@
<div class="pam-header__action-bar">
<i
v-if="isShowNotification"
- class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
+ class="icon-bell text--dark-blue cursor--pointer"
@click="$router.push('/notification')"
- ></i>
+ >
+ <span :class="{'newNotification': isNewNotification}"></span>
+ </i>
+
<el-dropdown :class="{'is-open':isOpenDropdown}"
ref="dropdown"
trigger="click"
@@ -142,18 +145,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();
+ }
}
//////////////////////////////////////////////////////////////////////
@@ -185,6 +180,12 @@
}
if (this.isAdminLogin) {
return this.notificationList.length
+ }
+ }
+
+ get isNewNotification() {
+ if (this.currentRole) {
+ return this.notificationList.filter(item => !item.readDate).length;
}
}
@@ -253,6 +254,7 @@
i {
padding: 0px 15px;
+ @extend .fix-chrome-click--issue;
@media screen and (max-width: 352px) {
padding: 0px 10px;
@@ -265,6 +267,19 @@
margin: 0px 10px;
}
}
+
+ .icon-bell {
+ position: relative;
+ .newNotification {
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ top: 0;
+ right: 15px;
+ border-radius: 50px;
+ background: $PRIMARY_RED;
+ }
+ }
}
}
--
Gitblit v1.8.0