From 921e56017c29cf97c0ffe90c879243d5fd79a19b Mon Sep 17 00:00:00 2001 From: Mila <Mila@pollex.com.tw> Date: 星期一, 06 十二月 2021 14:00:42 +0800 Subject: [PATCH] fixed TODO#131490 [預約清單] 資料排序 --- PAMapp/components/BackActionBar.vue | 47 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index 428fab1..ea00720 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,27 +1,30 @@ <template> <nav class="pam-back-action-bar fix-chrome-click--issue"> - <a @click="pushRouterByLoginRole"> + <a @click="pushRouterByLoginRole" v-if="questionnaireState"> <i class="icon-left "></i>{{ label }} </a> </nav> </template> <script lang="ts"> -import { namespace } from 'nuxt-property-decorator'; +import { namespace, Watch } from 'nuxt-property-decorator'; import { Vue, Component,} from 'vue-property-decorator'; +import { Role } from '~/assets/ts/models/enum/Role'; import * as _ from 'lodash'; -import { Role } from './NavBar.vue'; -const localStorage = namespace('localStorage'); +import { isLogin } from '~/assets/ts/auth'; + +const roleStorage = namespace('localStorage'); @Component export default class UiCarousel extends Vue { - @localStorage.Getter currentRole!:string; + @roleStorage.Getter currentRole!:string; + questionnaireState: boolean = true; get label(): string { if (this.$route.name) { const routeName = this.$route.name.split('-')[0]; let featureLabel = ''; switch(routeName) { case 'login': - featureLabel = '��'; + featureLabel = '�� | 閮餃��'; break; case 'recommendConsultant': featureLabel = '������'; @@ -33,22 +36,40 @@ featureLabel = '���“���'; break; case 'agentInfo': - featureLabel = '璆剖�鞈��' + featureLabel = _.isEqual(this.currentRole,Role.ADMIN) ? '���董�����' : '璆剖�鞈��' break; default: featureLabel = '�����'; break; case 'questionnaire': featureLabel = '�脰����'; + break; + case 'notification': + featureLabel = '�'; + break; + case 'record': + featureLabel = '�������'; + break; + case 'accountSetting': + featureLabel = '�犖撣唾�身摰�'; + break; + case 'consultantAccountSetting': + featureLabel = '���董�����'; + break; } return featureLabel; } else { return '�����'; } } + pushRouterByLoginRole():void{ - const link = _.isEqual(this.currentRole,Role.ADMIN)? '/myAppointmentList/appointmentList':'/'; - this.$router.push(link); + const pathName = this.$route.name; + pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1); + } + + set label(value) { + this.questionnaireState = value === '�脰����' ? isLogin() : true; } } </script> @@ -60,7 +81,7 @@ display: flex; align-items: center; position: fixed; - top: 0; + top: $MOB_NAV_BAR; left: 0; width: 100%; background-color: $PRIMARY_WHITE; @@ -76,4 +97,10 @@ padding: 20px; } } + +@include desktop { + .pam-back-action-bar { + top: $DESKTOP_NAV_BAR; + } +} </style> -- Gitblit v1.8.0