From 2961569ad7a13d74bd55b33c588d22a7bb1f705d Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期三, 15 十二月 2021 13:09:16 +0800 Subject: [PATCH] Merge branch 'master' of https://dev.pollex.com.tw:8443/r/pcalife/PAM --- PAMapp/components/BackActionBar.vue | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index c3aef12..11cfcaf 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -34,23 +34,38 @@ 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); } + } </script> -- Gitblit v1.8.0