From bdae23a40c461c2c6b6ee614f661eac731c949c8 Mon Sep 17 00:00:00 2001 From: Mila <Mila@pollex.com.tw> Date: 星期三, 22 十二月 2021 14:12:05 +0800 Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM --- PAMapp/components/BackActionBar.vue | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index a26b20f..dc671d9 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,24 +1,24 @@ <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="pushRouterByLoginRole"> + <i class="icon-left "></i> </a> + <div class="label">{{ label }}</div> </nav> </template> <script lang="ts"> -import { namespace, Watch } from 'nuxt-property-decorator'; +import { namespace } from 'nuxt-property-decorator'; import { Vue, Component,} from 'vue-property-decorator'; -import { Role } from '~/assets/ts/models/enum/role.enum'; import * as _ from 'lodash'; -import { isLogin } from '~/assets/ts/auth'; +import { Role } from '~/shared/models/enum/role'; const roleStorage = namespace('localStorage'); @Component export default class UiCarousel extends Vue { @roleStorage.Getter currentRole!:string; - questionnaireState: boolean = true; get label(): string { + if (this.$route.name) { const routeName = this.$route.name.split('-')[0]; let featureLabel = ''; @@ -47,6 +47,7 @@ case 'notification': featureLabel = '�'; break; + case 'userReviewsRecord': case 'record': featureLabel = '�������'; break; @@ -55,6 +56,9 @@ break; case 'consultantAccountSetting': featureLabel = '���董�����'; + break; + case 'faq': + featureLabel = 'F&Q 撣貉����'; break; } return featureLabel; @@ -68,9 +72,6 @@ pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1); } - set label(value) { - this.questionnaireState = value === '�脰����' ? isLogin() : true; - } } </script> @@ -86,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