lex-xin 3 anni fa
parent
commit
07f1d02b8c

+ 1 - 1
src/views/activeProgram/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="activeProgram">
         <van-cell-group :border="false" v-if="dataShow">
-            <van-cell v-for="item in dataList" :key="item.activityId"
+            <van-cell v-for="(item, index) in dataList" :key="index"
                 :title="item.activityName"
                 title-class="titleStyle"
                 :value="item.studentNum"

+ 3 - 3
src/views/activeProgram/program.vue

@@ -384,7 +384,7 @@ export default {
                     this.statusList.hasOffLine = false
                 }
 
-                if(this.isLimitNum) { // 是否限制了排课
+                if(this.isLimitNum || !this.typeStatus) { // 是否限制了排课
                     // 排课次数,活动排课没有范围一说,最大次数和最小次数必须一致
                     form.totalClassTime = this.typeStatus ? vipGroup.minCourseNum : vipGroup.giveCourseNum
                 }
@@ -601,9 +601,9 @@ export default {
             // 选中的数据
             const tempItems = items || []
             this.studentList = tempItems
-            if(tempItems.length <= 0) { // 判断是否有选择学员
+            // if(tempItems.length <= 0) { // 判断是否有选择学员
                 this.checkboxSelectIds = []
-            }
+            // }
             tempItems.forEach(item => {
                 this.checkboxSelectIds.push(item.userId)
             })

+ 7 - 8
src/views/teacher/VIP00Apply.vue

@@ -1326,7 +1326,13 @@ export default {
       }
       // 优惠活动(如果没有则原价)
       const discount = Number(vas.discount || 100) / 100
-
+      // 重置老师默认网管课金额
+      if(this.courseTypePractice) {
+        //老师课酬
+        form.onlineTeacherSalary = Math.round(this.singleClassMinutesSalary)
+        // 课程单价
+        form.onlineClassesUnitPrice = Math.round(this.singleClassMinutesPrice * discount)
+      }
       // ...
       if (vas.salarySettlementJson) {
         let obj = JSON.parse(vas.salarySettlementJson);
@@ -1367,13 +1373,6 @@ export default {
           }
         }
       } else {
-        // 重置老师默认网管课金额
-        if(this.courseTypePractice) {
-          //老师课酬
-          form.onlineTeacherSalary = Math.round(this.singleClassMinutesSalary)
-          // 课程单价
-          form.onlineClassesUnitPrice = Math.round(this.singleClassMinutesPrice * discount)
-        }
         if(this.courseTypeVip) {
           form.onlineTeacherSalary = Math.round(tc.offlineClassesSalary)
           form.offlineTeacherSalary = Math.round(tc.offlineClassesSalary)