From f5c3e5e9254b7af10ddbc8b5cb81cd78f531e8d1 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期五, 10 六月 2022 14:01:00 +0800 Subject: [PATCH] Merge branch 'Phase3' of ssh://192.168.0.10:29418/pcalife/PAM into Phase3 --- PAMapp/components/BackActionBar.vue | 94 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 65 insertions(+), 29 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index 11bdb80..9623972 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,7 +1,7 @@ <template> <nav class="pam-back-action-bar fix-chrome-click--issue"> - <a @click="pushRouterByLoginRole"> - <i class="icon-left "></i> + <a @click="goBack"> + <i class="icon-left "></i> </a> <div class="label">{{ label }}</div> </nav> @@ -10,13 +10,31 @@ <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; + + @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 = '�����'; @@ -57,7 +78,27 @@ featureLabel = '���董�����'; break; case 'faq': - featureLabel = 'F&Q 撣貉����'; + featureLabel = 'FAQ 撣貉����'; + 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; @@ -66,46 +107,41 @@ } } - pushRouterByLoginRole():void{ - const pathName = this.$route.name; - pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1); - } - } </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; - font-size: 20px; - font-weight: bold; + z-index : 6; + font-size : 20px; + font-weight : bold; i { - display: block; + display : block; padding-right: 14px; } a { - cursor: pointer; + cursor : pointer; padding: 0 20px; - width: 26px; + width : 26px; } .label { - margin: 0 auto; + margin : 0 auto; transform: translateX(-33px); } } @include desktop { .pam-back-action-bar { - top: $DESKTOP_NAV_BAR; + top : $DESKTOP_NAV_BAR; font-size: 24px; } } -- Gitblit v1.8.0