From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 17 二月 2022 11:41:19 +0800 Subject: [PATCH] Merge branch 'sit' into uat --- PAMapp/components/BackActionBar.vue | 106 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 75 insertions(+), 31 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index 83d03bb..29fc5ee 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,22 +1,40 @@ <template> <nav class="pam-back-action-bar fix-chrome-click--issue"> - <a @click="pushRouterByLoginRole" v-if="questionnaireState"> - <i class="icon-left "></i>{{ label }} + <a @click="goBack"> + <i class="icon-left "></i> </a> + <div class="label">{{ label }}</div> </nav> </template> <script lang="ts"> import { namespace } from 'nuxt-property-decorator'; import { Vue, Component,} from 'vue-property-decorator'; -import { Role } from '~/assets/ts/models/enum/Role'; -import * as _ from 'lodash'; -const roleStorage = namespace('localStorage'); +import * as _ from 'lodash'; +import { Role } from '~/shared/models/enum/Role'; + +const appointmentStore = namespace('appointment.store'); +const roleStorage = namespace('localStorage'); + @Component export default class UiCarousel extends Vue { - @roleStorage.Getter currentRole!:string; - questionnaireState: boolean = true; + + @roleStorage.Getter + currentRole!:string; + + @appointmentStore.Getter + isCloseAppointment!: boolean; + + ////////////////////////////////////////////////////////////////////// + + goBack(): void { + const pathName = this.$route.name; + pathName?.includes('myConsultantList') + ? this.$router.push('/') + : this.$router.go(-1); + } + get label(): string { if (this.$route.name) { const routeName = this.$route.name.split('-')[0]; @@ -35,7 +53,10 @@ featureLabel = '���“���'; break; case 'agentInfo': - featureLabel = _.isEqual(this.currentRole,Role.ADMIN) ? '���董�����' : '璆剖�鞈��' + const agentFeatureLabel = this.$route.name.includes('edit') ? '蝺刻摩撣唾����' : '���董�����'; + featureLabel = _.isEqual(this.currentRole,Role.ADMIN) + ? agentFeatureLabel + : '璆剖�鞈��' break; default: featureLabel = '�����'; @@ -46,6 +67,7 @@ case 'notification': featureLabel = '�'; break; + case 'userReviewsRecord': case 'record': featureLabel = '�������'; break; @@ -55,6 +77,29 @@ case 'consultantAccountSetting': featureLabel = '���董�����'; break; + case 'faq': + featureLabel = 'F&Q 撣貉����'; + break; + case 'appointment': + const appointmentFeatureLabel = this.$route.name.includes('close') + ? '蝯��' + : this.isCloseAppointment ? '蝯��敦' : '������'; + const inInterview = this.$route.name.includes('interview'); + const addNewInterview = this.$route.name.includes('new'); + const interviewList = this.$route.name.includes('interviewList'); + const recordList = this.$route.name.includes('recordList'); + if (interviewList) { + featureLabel = '蝝赤蝝����'; + } else if (recordList) { + featureLabel = '蝟餌絞�蝝����'; + } else if (inInterview) { + featureLabel = addNewInterview + ? '�憓�赤蝝����' + : '蝺刻摩蝝赤蝝����'; + } else { + featureLabel = appointmentFeatureLabel; + } + break; } return featureLabel; } else { @@ -62,44 +107,43 @@ } } - pushRouterByLoginRole():void{ - const pathName = this.$route.name; - pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1); - } - - set label(value) { - this.questionnaireState = value === '�脰����' ? this.currentRole === Role.USER : true; - } } </script> <style lang="scss" scoped> .pam-back-action-bar { - height: $MOB_NAV_BAR; - border: 1px solid #CCCCCC; - display: flex; - align-items: center; - position: fixed; - top: $MOB_NAV_BAR; - left: 0; - width: 100%; + height : $MOB_NAV_BAR; + border : 1px solid #CCCCCC; + display : flex; + align-items : center; + position : fixed; + top : $MOB_NAV_BAR; + left : 0; + width : 100%; background-color: $PRIMARY_WHITE; - z-index: 6; + z-index : 6; + font-size : 20px; + font-weight : bold; i { - font-size: 20px; + display : block; padding-right: 14px; } a { - cursor: pointer; - font-size: 24px; - font-weight: bold; - padding: 20px; + cursor : pointer; + padding: 0 20px; + width : 26px; + } + .label { + margin : 0 auto; + transform: translateX(-33px); } } @include desktop { .pam-back-action-bar { - top: $DESKTOP_NAV_BAR; + top : $DESKTOP_NAV_BAR; + font-size: 24px; } } + </style> -- Gitblit v1.8.0