Merge branch '02/24resetMain' into test

src/views/categroyManager/vipActiveList.vue

@@ -1087,7 +1087,7 @@ export default {
                 attribute2: this.attribute2,
                 minCourseNum: this.courseNumForm.minCourseNum,
                 maxCourseNum: this.courseNumForm.maxCourseNum,
-                studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes,
+                studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes?this.courseNumForm.studentMaxUsedTimes:-1,
                 onlineClassJoinGradientRewards:
                   this.onlineClassJoinGradientRewards * 1,
                 offlineClassJoinGradientRewards:

src/views/categroyManager/vipNewActive.vue

@@ -653,7 +653,7 @@ export default {
                   attribute2: this.attribute2,
                   minCourseNum: this.courseNumForm.minCourseNum,
                   maxCourseNum: this.courseNumForm.maxCourseNum,
-                  studentMaxUsedTimes:this.courseNumForm.studentMaxUsedTimes,
+                 studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes?this.courseNumForm.studentMaxUsedTimes:-1,
                   offlineClassJoinGradientRewards:
                     this.offlineClassJoinGradientRewards * 1,
                   onlineClassJoinGradientRewards:

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -209,7 +209,7 @@
              @mousewheel.native.prevent
             autocomplete="off"
             :controls="false"
-            :min="0"
+           :min="activeRow&&activeRow.expectSalary?(0-activeRow.expectSalary):0"
             style="width: 180px;"
             v-model.number="form.subsidy"
           ></el-input-number>

src/views/teamDetail/componentCourse/teacherList.vue

@@ -347,7 +347,7 @@
           <el-input-number
           class="number-input"
             :controls="false"
-            :min="0"
+            :min="activeTeacher&&activeTeacher.expectSalary?(0-activeTeacher.expectSalary):0"
             style="width: 180px;"
             v-model.number="teacherMask.subsidy"
           ></el-input-number>