From 98a92f7083e4ca742340b8f01abe46ea8278c490 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 09 十二月 2021 15:22:10 +0800
Subject: [PATCH] fixed TODO#132182 [我的顧問清單] 新增顧問後，最新一筆的顧問應顯示加入的時間，目前未顯示
---
PAMapp/components/NavBar.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 07ba188..f635551 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -7,8 +7,8 @@
<div class="pam-header__title--sub">�����兢蝳�風��</div>
</div>
<div class="pam-header__action-bar">
- <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
- @click="$router.push('/notification')"></i>
+ <!-- <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
+ @click="$router.push('/notification')"></i> -->
<el-dropdown :class="{'is-open':isOpenDropdown}"
ref="dropdown"
trigger="click"
@@ -41,8 +41,10 @@
@Component
export default class NavBar extends Vue {
@roleStorage.Mutation storageClear!: () => void;
+
@roleStorage.Getter idToken!: string | null;
@roleStorage.Getter currentRole!: string | null;
+ @roleStorage.Getter consultantId!: string | null;
navBarList = [{
authorityOfRoleList: [Role.NOT_LOGIN],
@@ -55,13 +57,18 @@
title: '�犖撣唾�身摰�',
},
{
- authorityOfRoleList: [Role.ADMIN],
- routeUrl: '/notFinish',
+ authorityOfRoleList:[Role.ADMIN],
+ routeUrl: '/agentInfo/',
title: '���董�����',
},
{
- authorityOfRoleList: [Role.USER, Role.ADMIN],
- routeUrl: '/record/contactRecord',
+ authorityOfRoleList:[Role.ADMIN],
+ routeUrl: '/record',
+ title: '�������',
+ },
+ {
+ authorityOfRoleList: [Role.USER],
+ routeUrl: '/userReviewsRecord',
title: '�������',
},
{
@@ -89,15 +96,17 @@
routerNavigateTo(url: string): void {
(this.$refs.dropdown as any).hide();
- _.isEqual(url, '') ? this.fakeLogout() : this.$router.push(url);
+ _.isEqual(url,'')
+ ? this.logout()
+ : this.$router.push(_.isEqual(url,'/agentInfo/') ? url+this.consultantId :url);
}
pushRouterByLoginRole(): void {
const link = _.isEqual(this.currentRole, Role.ADMIN) ? '/myAppointmentList/appointmentList' : '/';
this.$router.push(link);
}
- // TODO: ��TP隤����� ���蝙�
- fakeLogout(): void {
+
+ logout(): void {
this.storageClear();
_.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
}
@@ -114,7 +123,7 @@
display: flex;
align-items: center;
background-color: $PRIMARY_WHITE;
- z-index: 3;
+ z-index: 6;
.pam-header__logo {
height: 30px;
--
Gitblit v1.8.0