Merge branch 'baoming-jiaofei' into test

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

@@ -661,6 +661,20 @@ export default {
           data.attribute1 = info.attribute1;
         }
 
+        let hasCourseFee = false
+
+        for (const item of data.musicGroupPaymentCalenderCourseSettingsList) {
+          if (item.courseCurrentPrice > 0) {
+            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')
+          return
+        }
+
         if (!this.rowDetail?.batchNo) {