From 202f69ff07a2840a9746cda72361f0f67a20a85a Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期二, 30 十一月 2021 19:47:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- PAMapp/components/BackActionBar.vue | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue index c3aef12..a57cb21 100644 --- a/PAMapp/components/BackActionBar.vue +++ b/PAMapp/components/BackActionBar.vue @@ -41,6 +41,19 @@ break; case 'questionnaire': featureLabel = '�脰����'; + break; + case 'notification': + featureLabel = '�'; + break; + case 'record': + featureLabel = '�������'; + break; + case 'accountSetting': + featureLabel = '�犖撣唾�身摰�'; + break; + case 'consultantAccountSetting': + featureLabel = '���董�����'; + break; } return featureLabel; } else { @@ -48,8 +61,7 @@ } } pushRouterByLoginRole():void{ - const link = _.isEqual(this.currentRole,Role.ADMIN)? '/myAppointmentList/appointmentList':'/'; - this.$router.push(link); + this.$router.go(-1); } } </script> -- Gitblit v1.8.0