From 7521c6641773e25c2ebefeb228fa8733856a849e Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期一, 14 八月 2023 23:02:43 +0800
Subject: [PATCH] Update: 登出時呼叫 API logout
---
PAMapp/components/NavBar.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index af197ad..3242e17 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -3,15 +3,18 @@
<div class="pam-header__logo"
@click="pushRouterByLoginRole"></div>
<div class="pam-header__title">
- <div class="pam-header__title--main">���兢蝳��蜓</div>
- <div class="pam-header__title--sub">�����兢蝳�風��</div>
+ <div class="pam-header__title--main">�憿找�����</div>
+ <div class="pam-header__title--sub">��������“���</div>
</div>
<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"
@@ -54,6 +57,7 @@
import * as _ from 'lodash';
import { NotificationList } from '~/shared/models/reviews.model';
import { AppointmentLog } from '~/shared/models/appointment.model';
+ import loginService from '~/shared/services/login.service'
const roleStorage = namespace('localStorage');
@Component
@@ -124,7 +128,7 @@
{
authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
routeUrl: '/faq',
- title: 'F&Q 撣貉����',
+ title: 'FAQ 撣貉����',
},
{
authorityOfRoleList: [Role.USER, Role.ADMIN],
@@ -163,8 +167,10 @@
}
logout(): void {
- this.storageClear();
- _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
+ loginService.logout().then(() => {
+ this.storageClear();
+ _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
+ });
}
get loginRole(): Role {
@@ -177,6 +183,12 @@
}
if (this.isAdminLogin) {
return this.notificationList.length
+ }
+ }
+
+ get isNewNotification() {
+ if (this.currentRole) {
+ return this.notificationList.filter(item => !item.readDate).length;
}
}
@@ -245,6 +257,7 @@
i {
padding: 0px 15px;
+ @extend .fix-chrome-click--issue;
@media screen and (max-width: 352px) {
padding: 0px 10px;
@@ -257,6 +270,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