Merge branch '03/03GRADE' into test

src/views/buildVip/index.vue

@@ -1676,11 +1676,9 @@ export default {
       let singleClassMinutes = this.leftForm.classTime;
       if (this.hotType == "GIVE_CLASS") {
         if (this.centerForm.radio == "ONLINE") {
-          onlineClassesNum =
-            parseInt(onlineClassesNum) + parseInt(this.giveNum);
+          onlineClassesNum = parseInt(onlineClassesNum);
         } else if (this.centerForm.radio == "OFFLINE") {
-          offlineClassesNum =
-            parseInt(offlineClassesNum) + parseInt(this.giveNum);
+          offlineClassesNum = parseInt(offlineClassesNum);
         }
       }
       let onlineTeacherSalary = this.rightForm.onlineCourse || null;
@@ -1730,9 +1728,7 @@ export default {
             this.rightForm.offlineCourse = res.data.offlineTeacherSalary;
             this.rightForm.allPrice = res.data.totalPrice;
             this.activeStudentList.forEach((stu) => {
-              if (res.data.hasOwnProperty(stu.studentId)) {
-                stu.paymentPrice = res.data[stu.studentId];
-              }
+              stu.paymentPrice = res.data.totalPrice;
             });
           }
         });

src/views/categroyManager/modals/payInfo.vue

@@ -418,7 +418,7 @@
       </el-row>
       <el-row>
         <el-form-item
-          prop="givePeriod"
+          prop="giveMemberTime"
           label="赠送会员时长"
           v-if="payForm.giveCourseType == 'MEMBER'&&payForm.fullMinusCourseTimes"
           :rules="[
@@ -426,7 +426,7 @@
           ]"
         >
           <el-input
-            v-model.number="payForm.givePeriod"
+            v-model.number="payForm.giveMemberTime"
             type="number"
             style="width: 400px"
             placeholder="请输入赠送会员时长"

src/views/categroyManager/vipNewActive.vue

@@ -116,7 +116,7 @@ const payBaseForm = {
   giveSingleCourseTime: null,
   giveCourseNum: null,
   giveMemberRankId: null,
-  givePeriod: null,
+  giveMemberTime: null,
 };
 const baseSalaryForm = {
   vipOnlineSalarySettlement: {