From 202f69ff07a2840a9746cda72361f0f67a20a85a Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 19:47:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/NavBar.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 515332f..e55c62c 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -41,13 +41,15 @@
@Component
export default class NavBar extends Vue {
@roleStorage.Mutation storageClear!: () => void;
+ @roleStorage.Mutation storageClearQuickFilter!: () => void;
+ @roleStorage.Mutation storageClearRecommendConsultant!: () => void;
@roleStorage.Getter idToken!: string | null;
@roleStorage.Getter currentRole!: string | null;
navBarList = [{
authorityOfRoleList: [Role.NOT_LOGIN],
routeUrl: '/login',
- title: '��',
+ title: '�� | 閮餃��',
},
{
authorityOfRoleList: [Role.USER],
@@ -55,13 +57,18 @@
title: '�犖撣唾�身摰�',
},
{
- authorityOfRoleList: [Role.ADMIN],
- routeUrl: '/notFinish',
+ authorityOfRoleList:[Role.ADMIN],
+ routeUrl: '/consultantAccountSetting',
title: '���董�����',
},
{
- authorityOfRoleList: [Role.USER, Role.ADMIN],
- routeUrl: '/record/contactRecord',
+ authorityOfRoleList:[Role.ADMIN],
+ routeUrl: '/record',
+ title: '�������',
+ },
+ {
+ authorityOfRoleList: [Role.USER],
+ routeUrl: '/userReviewsRecord',
title: '�������',
},
{
@@ -99,6 +106,8 @@
// TODO: ��TP隤����� ���蝙�
fakeLogout(): void {
this.storageClear();
+ this.storageClearQuickFilter();
+ this.storageClearRecommendConsultant();
_.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