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 | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index c3aef12..a26b20f 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 { 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];
@@ -34,22 +36,40 @@
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;
} else {
return '�����';
}
}
+
pushRouterByLoginRole():void{
- const link = _.isEqual(this.currentRole,Role.ADMIN)? '/myAppointmentList/appointmentList':'/';
- this.$router.push(link);
+ 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