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/BackActionBar.vue | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index 1bfc41a..dc671d9 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,22 +1,24 @@ <template> <nav class="pam-back-action-bar fix-chrome-click--issue"> <a @click="pushRouterByLoginRole"> - <i class="icon-left "></i>{{ label }} + <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'; +import { Role } from '~/shared/models/enum/role'; const roleStorage = namespace('localStorage'); @Component export default class UiCarousel extends Vue { @roleStorage.Getter currentRole!:string; get label(): string { + if (this.$route.name) { const routeName = this.$route.name.split('-')[0]; let featureLabel = ''; @@ -45,6 +47,7 @@ case 'notification': featureLabel = '�'; break; + case 'userReviewsRecord': case 'record': featureLabel = '�������'; break; @@ -54,6 +57,9 @@ case 'consultantAccountSetting': featureLabel = '���董�����'; break; + case 'faq': + featureLabel = 'F&Q 撣貉����'; + break; } return featureLabel; } else { @@ -62,10 +68,10 @@ } pushRouterByLoginRole():void{ - const backToPrevious = ['recommendConsultant-result', 'agentInfo-agentNo', 'questionnaire-agentNo']; - const find = backToPrevious.findIndex(item => this.$route.name?.includes(item)); - find > -1 ? this.$router.go(-1) : this.$router.push('/'); + const pathName = this.$route.name; + pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1); } + } </script> @@ -81,21 +87,28 @@ width: 100%; background-color: $PRIMARY_WHITE; 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; + padding: 0 20px; + width: 26px; + } + .label { + margin: 0 auto; + transform: translateX(-33px); } } @include desktop { .pam-back-action-bar { top: $DESKTOP_NAV_BAR; + font-size: 24px; } } + </style> -- Gitblit v1.8.0