Merge branch '04/16vipactiveRange' into dev

src/views/buildVip/index.vue

@@ -1094,7 +1094,6 @@ export default {
       }
       // 拿到相应的值插入数组
       let endTime = this.MinutesTest(startTime, this.leftForm.classTime);
-
       let str;
       switch (courseType) {
         case "ONLINE": {

src/views/categroyManager/vipActiveList.vue

@@ -398,7 +398,7 @@
             <div>
               <div
                 class="head"
-                @click="activeType = 'BASE_ACTIVITY'"
+                @click="()=>{this.$refs['form'].resetFields();activeType = 'BASE_ACTIVITY'}"
                 :class="activeType == 'BASE_ACTIVITY' ? 'active' : ''"
               >
                 基础活动
@@ -425,12 +425,13 @@
                 :model="courseNumForm"
                 :inline="true"
                 ref="form"
-                :rules="courseNumrules"
+                :rules="activeType == 'DISCOUNT'?courseNumrules:[]"
+                v-show="activeType == 'DISCOUNT'"
               >
                 <el-form-item prop="minCourseNum">
                   <el-input
                     @change="handleMinChange"
-                    v-if="activeType == 'DISCOUNT'"
+
                     v-model.number="courseNumForm.minCourseNum"
                     type="number"
                     style="margin-left: 10px; width: 120px !important"
@@ -441,7 +442,7 @@
                 <el-form-item prop="maxCourseNum">
                   <el-input
                     @change="handleMaxChange"
-                    v-if="activeType == 'DISCOUNT'"
+
                     v-model.number="courseNumForm.maxCourseNum"
                     type="number"
                     style="margin-left: 10px; width: 120px !important"
@@ -454,7 +455,7 @@
             <div>
               <div
                 class="head"
-                @click="activeType = 'GIVE_CLASS'"
+                @click="()=>{this.$refs['form'].resetFields();activeType = 'GIVE_CLASS'}"
                 :class="activeType == 'GIVE_CLASS' ? 'active' : ''"
               >
                 赠送课时
@@ -1096,7 +1097,7 @@ export default {
     validateMin(rule, value, callback) {
       const one = Number(value);
       const max = Number(this.courseNumForm.maxCourseNum);
-      if (!max || one < max) {
+      if (!max || one <= max) {
         return callback();
       }
       return callback(new Error("输入值不得大于最大课时数"));
@@ -1104,7 +1105,7 @@ export default {
     validateMax(rule, value, callback) {
       const one = Number(value);
       const min = Number(this.courseNumForm.minCourseNum);
-      if (!min || one > min) {
+      if (!min || one >= min) {
         return callback();
       }
       return callback(new Error("输入值不得小于最小课时数"));

src/views/categroyManager/vipNewActive.vue

@@ -215,7 +215,7 @@
             <div
               class="head"
               :class="activeType == 'BASE_ACTIVITY' ? 'active' : ''"
-              @click="activeType = 'BASE_ACTIVITY'"
+               @click="()=>{this.$refs['form'].resetFields();activeType = 'BASE_ACTIVITY'}"
             >
               基础活动
             </div>
@@ -241,13 +241,13 @@
               :model="courseNumForm"
               :inline="true"
               ref="form"
-              :rules="courseNumrules"
-               v-if="activeType == 'DISCOUNT'"
+               v-show="activeType == 'DISCOUNT'"
+              :rules="activeType == 'DISCOUNT'?courseNumrules:[]"
             >
               <el-form-item prop="minCourseNum">
                 <el-input
                   @change="handleMinChange"
-                  v-if="activeType == 'DISCOUNT'"
+
                   v-model.number="courseNumForm.minCourseNum"
                   type="number"
                   style="margin-left: 10px; width: 120px !important"
@@ -258,7 +258,6 @@
               <el-form-item prop="maxCourseNum">
                 <el-input
                   @change="handleMaxChange"
-                  v-if="activeType == 'DISCOUNT'"
                   v-model.number="courseNumForm.maxCourseNum"
                   type="number"
                   style="margin-left: 10px; width: 120px !important"
@@ -272,7 +271,7 @@
             <div
               class="head"
               :class="activeType == 'GIVE_CLASS' ? 'active' : ''"
-              @click="activeType = 'GIVE_CLASS'"
+             @click="()=>{this.$refs['form'].resetFields();activeType = 'GIVE_CLASS'}"
             >
               赠送课时
             </div>
@@ -467,7 +466,7 @@ export default {
     validateMin(rule, value, callback) {
       const one = Number(value);
       const max = Number(this.courseNumForm.maxCourseNum);
-      if (!max || one < max) {
+      if (!max || one <= max) {
         return callback();
       }
       return callback(new Error("输入值不得大于最大课时数"));
@@ -475,7 +474,7 @@ export default {
     validateMax(rule, value, callback) {
       const one = Number(value);
       const min = Number(this.courseNumForm.minCourseNum);
-      if (!min || one > min) {
+      if (!min || one >= min) {
         return callback();
       }
       return callback(new Error("输入值不得小于最小课时数"));

src/views/teamBuild/modals/accessories.vue

@@ -89,7 +89,7 @@
           name: item.name,
           price:item.price,
           id: item.id,
-          subs: item.goodsList ? item.goodsList.map(sub => sub.name) : []
+          subs: item.childGoodsList ? item.childGoodsList.map(sub => sub.name) : []
         }))
         if (options.length) {
           this.type = 'group'