Merge branch 'baoming-jiaofei' into test

src/views/resetTeaming/modals/user-pay-form.vue

@@ -664,14 +664,14 @@ export default {
         let hasCourseFee = false
 
         for (const item of data.musicGroupPaymentCalenderCourseSettingsList) {
-          if (item.courseCurrentPrice > 0) {
+          if (item.courseCurrentPrice > 0 || item.isStudentOptional == true) {
             hasCourseFee = true
             break
           }
         }
         // console.log(this.baseInfo?.musicGroup?.courseViewType, this.paymentType, hasCourseFee, this.type)
         if (this.baseInfo?.musicGroup?.courseViewType == 2 && this.paymentType == 0 && hasCourseFee && this.type === 'user') {
-          this.$message.error('报名缴费云教练收费模式课程费用不得大于0')
+          this.$message.error('报名缴费云教练收费模式课程费用不得大于0且不可选')
           return
         }