From 27513e775a91e24ef305e9962bd2d795d1f97353 Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期五, 03 十二月 2021 10:57:44 +0800 Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM --- PAMapp/components/BackActionBar.vue | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index 1bfc41a..ea00720 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -1,21 +1,23 @@ <template> <nav class="pam-back-action-bar fix-chrome-click--issue"> - <a @click="pushRouterByLoginRole"> + <a @click="pushRouterByLoginRole" v-if="questionnaireState"> <i class="icon-left "></i>{{ label }} </a> </nav> </template> <script lang="ts"> -import { namespace } from 'nuxt-property-decorator'; +import { namespace, Watch } from 'nuxt-property-decorator'; import { Vue, Component,} from 'vue-property-decorator'; import { Role } from '~/assets/ts/models/enum/Role'; 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]; @@ -62,9 +64,12 @@ } 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); + } + + set label(value) { + this.questionnaireState = value === '�脰����' ? isLogin() : true; } } </script> -- Gitblit v1.8.0