Merge branch '08/24teamQuest' into jenkins

src/constant/index.js

@@ -245,8 +245,8 @@ export const musicGroupType = {
   DRAFT: "编辑中",
   AUDIT: "审核中",
   PRE_APPLY: "预报名中",
-
   FEE_AUDIT: "费用审核中",
+  FEE_AUDIT_FAILED:'费用审核失败',
   APPLY: "报名中",
   PAY: "缴费中",
   PREPARE: "筹备中",

src/views/resetTeaming/components/payInfoDetail.vue

@@ -643,7 +643,6 @@ export default {
                 this.teamCourse = true;
                 this.isSetCourseSettingsId = true;
                 this.$set(this.form, "eclass", res.data?.course);
-                console.log("设置完成eclass");
                 this.initDetail = true;
                 this.$set(
                   this.form,
@@ -929,6 +928,7 @@ export default {
               .catch(() => {});
           } else {
             const preViewData = this.formatPreviewData();
+            console.log(preViewData);
             this.preViewData = preViewData;
             await this.onPreview();
           }
@@ -1079,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];
+          }
         }
       }
 

src/views/teamDetail/components/modals/classroom-preview.vue

@@ -26,7 +26,7 @@
         prop="surplusTime"
       ></el-table-column>
     </el-table>
-    <div style="color: red;font-weight: bold;margin: 20px 0;">确认排课后剩余时长将被系统删除，不可排课</div>
+    <!-- <div style="color: red;font-weight: bold;margin: 20px 0;">确认排课后剩余时长将被系统删除，不可排课</div> -->
     <el-table
       :header-cell-style="{background:'#EDEEF0',color:'#444'}"
       :data="details"

src/views/teamDetail/teamList.vue

@@ -300,7 +300,7 @@
           <el-table-column align="center" width="100px" label="收费标准">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.chargeStandard | moneyFormat(true) }}
+                {{ scope.row.defaultChargeStandard | moneyFormat(true) }}
               </div>
             </template>
           </el-table-column>