From ac235850a9287dae6977c964213176fa7c86b140 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期四, 09 十二月 2021 14:42:20 +0800 Subject: [PATCH] Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PAM into refactor/separate-vue --- PAMapp/components/BackActionBar.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index 41c3cca..a26b20f 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,24 +1,30 @@ <template> - <nav class="pam-back-action-bar"> - <a @click="$router.push('/')"> - <i class="icon-left"></i>{{ label }} + <nav class="pam-back-action-bar fix-chrome-click--issue"> + <a @click="pushRouterByLoginRole" v-if="questionnaireState"> + <i class="icon-left "></i>{{ label }} </a> </nav> </template> <script lang="ts"> -import { Vue, Component } from 'vue-property-decorator'; +import { namespace, Watch } 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'; +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 = ''; switch(routeName) { case 'login': - featureLabel = '��'; + featureLabel = '�� | 閮餃��'; break; case 'recommendConsultant': featureLabel = '������'; @@ -30,10 +36,25 @@ 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; @@ -42,15 +63,29 @@ } } + pushRouterByLoginRole():void{ + const pathName = this.$route.name; + pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1); + } + + set label(value) { + this.questionnaireState = value === '�脰����' ? isLogin() : true; + } } </script> <style lang="scss" scoped> .pam-back-action-bar { - height: 53px; + 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; i { font-size: 20px; padding-right: 14px; @@ -62,4 +97,10 @@ padding: 20px; } } + +@include desktop { + .pam-back-action-bar { + top: $DESKTOP_NAV_BAR; + } +} </style> -- Gitblit v1.8.0