From aa109c6e83f23a3c81ccc4645ce233492364307d Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期一, 18 七月 2022 23:06:16 +0800
Subject: [PATCH] [UPDATE] 驗證碼驗證失敗改為回傳401 [BUG] 調整spring security設定

---
 PAMapp/components/NavBar.vue |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index af197ad..e9aab05 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"
@@ -124,7 +127,7 @@
       {
         authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
         routeUrl: '/faq',
-        title: 'F&Q 撣貉����',
+        title: 'FAQ 撣貉����',
       },
       {
         authorityOfRoleList: [Role.USER, Role.ADMIN],
@@ -177,6 +180,12 @@
       }
       if (this.isAdminLogin) {
         return this.notificationList.length
+      }
+    }
+
+    get isNewNotification() {
+      if (this.currentRole) {
+        return this.notificationList.filter(item => !item.readDate).length;
       }
     }
 
@@ -245,6 +254,7 @@
 
       i {
         padding: 0px 15px;
+        @extend .fix-chrome-click--issue;
 
         @media screen and (max-width: 352px) {
           padding: 0px 10px;
@@ -257,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