From 9686272b62233df1ec8d3e33c8b81a2deeccac1e Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 06 十二月 2021 13:14:43 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
PAMapp/components/NavBar.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index e55c62c..c3fc5b3 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"
@@ -45,6 +45,7 @@
@roleStorage.Mutation storageClearRecommendConsultant!: () => void;
@roleStorage.Getter idToken!: string | null;
@roleStorage.Getter currentRole!: string | null;
+ @roleStorage.Getter consultantId!: string | null;
navBarList = [{
authorityOfRoleList: [Role.NOT_LOGIN],
@@ -58,7 +59,7 @@
},
{
authorityOfRoleList:[Role.ADMIN],
- routeUrl: '/consultantAccountSetting',
+ routeUrl: '/agentInfo/',
title: '���董�����',
},
{
@@ -96,15 +97,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();
this.storageClearQuickFilter();
this.storageClearRecommendConsultant();
--
Gitblit v1.8.0