From c20a0f1a1dbaa23d1b073f9a9377cac5d572f277 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 23 十二月 2021 15:10:18 +0800
Subject: [PATCH] fixed TODO#131357 進行預約: 職業選擇畫面調整
---
PAMapp/components/NavBar.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index c3fc5b3..ca0cc1e 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -34,15 +34,14 @@
<script lang="ts">
import { Vue, Component } from 'vue-property-decorator';
import { namespace } from 'nuxt-property-decorator';
- import { Role } from '~/assets/ts/models/enum/Role';
+ import { Role } from '~/shared/models/enum/role';
import * as _ from 'lodash';
const roleStorage = namespace('localStorage');
@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;
@roleStorage.Getter consultantId!: string | null;
@@ -78,6 +77,11 @@
title: '���“���',
},
{
+ authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
+ routeUrl: '/faq',
+ title: 'F&Q 撣貉����',
+ },
+ {
authorityOfRoleList: [Role.USER, Role.ADMIN],
routeUrl: '',
title: '��',
@@ -91,8 +95,8 @@
login_role = Role.NOT_LOGIN;
isOpenDropdown = false;
- get loginRole(): string {
- return this.idToken && this.currentRole ? this.currentRole : Role.NOT_LOGIN;
+ get loginRole(): Role {
+ return this.idToken && this.currentRole ? (this.currentRole as Role): Role.NOT_LOGIN;
}
routerNavigateTo(url: string): void {
@@ -109,8 +113,6 @@
logout(): void {
this.storageClear();
- this.storageClearQuickFilter();
- this.storageClearRecommendConsultant();
_.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
}
}
--
Gitblit v1.8.0