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

src/views/resetTeaming/components/payInfoDetail.vue

@@ -928,6 +928,7 @@ export default {
               .catch(() => {});
           } else {
             const preViewData = this.formatPreviewData();
+            console.log(preViewData);
             this.preViewData = preViewData;
             await this.onPreview();
           }
@@ -1078,7 +1079,10 @@ export default {
         isShowMemberForPay: form.isShowMemberForPay,
         isShowMusicInsuranceForPay: form.isShowMusicInsuranceForPay,
         isShowVipCourseForPay: form.isShowVipCourseForPay,
-        isShowMusicCourseForPay: form.isShowMusicCourseForPay
+        isShowMusicCourseForPay: form.isShowMusicCourseForPay,
+        calender: {
+          isShowSalePrice: form.isShowSalePrice
+        }
       };
     },
     fommatDate() {

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

@@ -263,7 +263,6 @@ export default {
       });
     },
     __dataFormat(tempResult) {
-      // console.log(tempResult, "1212");
       this.mypreViewData =
         this.preViewData && this.preViewData.paymentCalender
           ? JSON.parse(JSON.stringify(this.preViewData))
@@ -273,8 +272,8 @@ export default {
               isShowVipCourseForPay: true,
               isShowMusicCourseForPay: true
             };
-      this.isShowSalePrice =
-        tempResult.paymentCalender.calender.isShowSalePrice || false;
+      // console.log(tempResult, "1212", this.mypreViewData);
+
       this.courseViewType = tempResult.musicGroup.courseViewType || 0;
       this.isGiveAccessories =
         (tempResult.musicGroup && tempResult.musicGroup.isGiveAccessories) ||
@@ -311,16 +310,16 @@ export default {
         this.mypreViewData && this.mypreViewData.paymentCalender
           ? this.mypreViewData.paymentCalender
           : tempResult.paymentCalender || null;
-      console.log(paymentCalender, "paymentCalender");
-      if (
-        paymentCalender &&
-        paymentCalender.calender &&
-        paymentCalender.calender.paymentItemShowState
-      ) {
-        let obj = JSON.parse(paymentCalender.calender.paymentItemShowState);
 
-        for (let key in obj) {
-          this.mypreViewData[key] = obj[key];
+      if (paymentCalender && paymentCalender.calender) {
+        this.isShowSalePrice =
+          paymentCalender.calender.isShowSalePrice || false;
+        if (paymentCalender.calender.paymentItemShowState) {
+          let obj = JSON.parse(paymentCalender.calender.paymentItemShowState);
+
+          for (let key in obj) {
+            this.mypreViewData[key] = obj[key];
+          }
         }
       }