Merge branch '08/24teamQuest' of http://git.dayaedu.com/yonge/dy-admin-manager into 08/24teamQuest

src/views/resetTeaming/components/payInfoDetail.vue

@@ -807,7 +807,11 @@ export default {
           path: "/business/resetTeaming",
           query
         });
-      } else if (query.type == "teamDraft" || query.type == "feeAudit" || query.type == "FEE_AUDIT_FAILED") {
+      } else if (
+        query.type == "teamDraft" ||
+        query.type == "feeAudit" ||
+        query.type == "FEE_AUDIT_FAILED"
+      ) {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",
@@ -1070,6 +1074,9 @@ export default {
         payUserType: this.$route.query.payUserType,
         musicGroup: this.musicGroup,
         paymentCalender: {
+          calender: {
+            isShowSalePrice: form.isShowSalePrice
+          },
           activity: [...activeList], // 小班课
           course: courseList, // 课程
           member: memberObj, // 云教练
@@ -1084,10 +1091,7 @@ export default {
         isShowMemberForPay: form.isShowMemberForPay,
         isShowMusicInsuranceForPay: form.isShowMusicInsuranceForPay,
         isShowVipCourseForPay: form.isShowVipCourseForPay,
-        isShowMusicCourseForPay: form.isShowMusicCourseForPay,
-        calender: {
-          isShowSalePrice: form.isShowSalePrice
-        }
+        isShowMusicCourseForPay: form.isShowMusicCourseForPay
       };
     },
     fommatDate() {
@@ -1119,7 +1123,7 @@ export default {
             isShowVipCourseForPay: this.form.isShowVipCourseForPay,
             isShowMusicCourseForPay: this.form.isShowMusicCourseForPay
           }),
-          isShowSalePrice:this.form.isShowSalePrice
+          isShowSalePrice: this.form.isShowSalePrice
         };
       } else {
         let calenderFeeJson = this.form.calenderFeeJson;

src/views/resetTeaming/modals/subject-preview.vue

@@ -272,7 +272,6 @@ export default {
               isShowVipCourseForPay: true,
               isShowMusicCourseForPay: true
             };
-      // console.log(tempResult, "1212", this.mypreViewData);
 
       this.courseViewType = tempResult.musicGroup.courseViewType || 0;
       this.isGiveAccessories =
@@ -352,7 +351,8 @@ export default {
         paymentCalender && paymentCalender.repair ? paymentCalender.repair : {};
       repair.name = "乐器保养";
       repair.isStatus = true; // 默认不选择乐器保养
-      this.instrumentRepair = repair.actualAmount + "" ? [repair] : [];
+
+      this.instrumentRepair = Number(repair.actualAmount) ? [repair] : [];
       // 小班课
       const activity =
         paymentCalender && paymentCalender.activity