From f5c3e5e9254b7af10ddbc8b5cb81cd78f531e8d1 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期五, 10 六月 2022 14:01:00 +0800
Subject: [PATCH] Merge branch 'Phase3' of ssh://192.168.0.10:29418/pcalife/PAM into Phase3
---
PAMapp/components/BackActionBar.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index 0f628c3..9623972 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -14,7 +14,8 @@
import * as _ from 'lodash';
import { Role } from '~/shared/models/enum/Role';
-const roleStorage = namespace('localStorage');
+const appointmentStore = namespace('appointment.store');
+const roleStorage = namespace('localStorage');
@Component
export default class UiCarousel extends Vue {
@@ -22,11 +23,16 @@
@roleStorage.Getter
currentRole!:string;
+ @appointmentStore.Getter
+ isCloseAppointment!: boolean;
+
//////////////////////////////////////////////////////////////////////
goBack(): void {
const pathName = this.$route.name;
- pathName?.includes('myConsultantList') ? this.$router.push('/') : this.$router.go(-1);
+ pathName?.includes('myConsultantList')
+ ? this.$router.push('/')
+ : this.$router.go(-1);
}
get label(): string {
@@ -68,21 +74,28 @@
case 'accountSetting':
featureLabel = '�犖撣唾�身摰�';
break;
- case 'appointmentAgenda':
- featureLabel = '�撠�赤����';
- break;
case 'consultantAccountSetting':
featureLabel = '���董�����';
break;
case 'faq':
- featureLabel = 'F&Q 撣貉����';
+ featureLabel = 'FAQ 撣貉����';
break;
case 'appointment':
- const appointmentFeatureLabel = this.$route.name.includes('close') ? '蝯��' : '������';
+ const appointmentFeatureLabel = this.$route.name.includes('close')
+ ? '蝯��'
+ : this.isCloseAppointment ? '蝯��敦' : '������';
const inInterview = this.$route.name.includes('interview');
const addNewInterview = this.$route.name.includes('new');
- if (inInterview) {
- featureLabel = addNewInterview ? '�憓�赤蝝����' : '蝺刻摩蝝赤蝝����';
+ const interviewList = this.$route.name.includes('interviewList');
+ const recordList = this.$route.name.includes('recordList');
+ if (interviewList) {
+ featureLabel = '蝝赤蝝����';
+ } else if (recordList) {
+ featureLabel = '蝟餌絞�蝝����';
+ } else if (inInterview) {
+ featureLabel = addNewInterview
+ ? '�憓�赤蝝����'
+ : '蝺刻摩蝝赤蝝����';
} else {
featureLabel = appointmentFeatureLabel;
}
--
Gitblit v1.8.0