Merge branch 'Nov16thResetMusic' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Nov16thResetMusic

src/views/resetTeaming/modals/extra-class.vue

@@ -87,7 +87,7 @@
               :controls="false"
               :precision="0"
               @change="$listeners.priceChange(scope.row, scope.$index)"
-              :min="1"
+              :min="0"
               :disabled="isDisabled"
               placeholder="课程时长"
             />
@@ -210,7 +210,7 @@ export default {
     validatorCourseTotalMinuties(index) {
       return (rule, value, callback) => {
         const { courseType } = this.list.form[index]
-        if (courseType && value && this.classTimeList[courseType] &&  value < this.classTimeList[courseType]) {
+        if (courseType && value > 1 && this.classTimeList[courseType] &&  value < this.classTimeList[courseType]) {
           callback(new Error(`单节课不得少于${this.classTimeList[courseType]}分钟`))
           return
         }

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

@@ -41,7 +41,7 @@
                 @moneyChange="syncAllMoney"
                 :courseUnitPriceSettingsByType="organizationCourseUnitPriceSettingsByType"
                 :isUserType="isUserType"
-                :isDisabled="form.leixing === '1' || paymentType == '0'" />
+                :isDisabled="form.leixing === '1' || form.leixing === '2' || paymentType == '0'" />
     <template>
       <el-alert title="缴费设置"
                 :closable="false"
@@ -83,7 +83,7 @@
               :hidePaymentPattern="true"
               :isCommon="isCommon"
               :isUserType="isUserType"
-              :isDisabled="form.leixing === '1' || paymentType == '0'"
+              :isDisabled="form.leixing === '1' || form.leixing === '2' || paymentType == '0'"
             />
           </el-collapse-item>
         </el-collapse>
@@ -101,7 +101,7 @@
         :form.sync="cycle"
         :isCommon="isCommon"
         :isUserType="isUserType"
-        :isDisabled="form.leixing === '1' || paymentType == '0'"
+        :isDisabled="form.leixing === '1' || form.leixing === '2' || paymentType == '0'"
         v-else
       />
     </template>