From 89d44ebbbffd9138e3e56ca091643fd3ce1f321d Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 02 十二月 2021 11:36:53 +0800
Subject: [PATCH] fixed TODO#131428 從我的顧問清單或是進行預約來登入，登入成功後自動跳轉回原來頁面
---
PAMapp/components/BackActionBar.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index a57cb21..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];
@@ -34,7 +36,7 @@
featureLabel = '���“���';
break;
case 'agentInfo':
- featureLabel = '璆剖�鞈��'
+ featureLabel = _.isEqual(this.currentRole,Role.ADMIN) ? '���董�����' : '璆剖�鞈��'
break;
default:
featureLabel = '�����';
@@ -60,8 +62,14 @@
return '�����';
}
}
+
pushRouterByLoginRole():void{
- this.$router.go(-1);
+ 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