Merge remote-tracking branch 'origin/master'

wayne

2021-11-30 202f69ff07a2840a9746cda72361f0f67a20a85a

 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>