提交测试

1

src/views/accompanyManager/accompanys.vue

@@ -217,7 +217,7 @@
                   @pagination="getList" /> 乔乔说后台没有分页所以一口气都展示-->
     </div>
     <el-dialog
-      :title="updateCourseStatus==2?'有效期调整':'有效期调整(高权限)'"
+      :title="updateCourseStatus == 2 ? '有效期调整' : '有效期调整(高权限)'"
       width="400px"
       :before-close="expireClose"
       :visible.sync="expireVisible"
@@ -849,9 +849,9 @@ export default {
       this.getList();
     },
     onUpdateCourse(type) {
-      this.updateCourseStatus = type
+      this.updateCourseStatus = type;
 
-      this.expireVisible = true
+      this.expireVisible = true;
     },
     onCallName(item) {
       // 点名表
@@ -915,6 +915,7 @@ export default {
               ? new Date(this.courseData[0].coursesStartDate)
               : new Date();
             let buyMonths = this.courseData[0].buyMonths;
+            this.accompanTime = this.courseData[0].singleClassMinutes || 25;
             let lastDayNum = nextMonthLastDay(
               originalStartDate.getFullYear(),
               originalStartDate.getMonth() + buyMonths + 1
@@ -946,10 +947,12 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          if (self.tableList[self.tableList.length -1].classDate) {
+          if (self.tableList[self.tableList.length - 1].classDate) {
             return (
-              new Date(self.tableList[self.tableList.length -1].classDate).getTime() >=
-              time.getTime()+24*60*60*1000
+              new Date(
+                self.tableList[self.tableList.length - 1].classDate
+              ).getTime() >=
+              time.getTime() + 24 * 60 * 60 * 1000
             );
           } else {
             return time.getTime() >= Date.now();
@@ -958,15 +961,16 @@ export default {
         },
       };
     },
-     resetDate() {
+    resetDate() {
       let self = this;
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          if (self.tableList[self.tableList.length -1].classDate) {
+          if (self.tableList[self.tableList.length - 1].classDate) {
             return (
-              new Date(self.tableList[self.tableList.length -1].classDate).getTime() >=
-              time.getTime()
+              new Date(
+                self.tableList[self.tableList.length - 1].classDate
+              ).getTime() >= time.getTime()
             );
           } else {
             return time.getTime() >= Date.now();
@@ -996,7 +1000,7 @@ export default {
     submitExpireDate() {
       this.$refs.expireForm.validate((some) => {
         if (some) {
-          if(this.updateCourseStatus == 1) {
+          if (this.updateCourseStatus == 1) {
             updateCoursesExpireDate({
               practiceGroupId: this.practiceId,
               coursesExpireDate: this.expireForm.coursesExpireDate,
@@ -1011,7 +1015,7 @@ export default {
                   }),
                 });
                 this.timers =
-                  this.expireForm.coursesStartDate+
+                  this.expireForm.coursesStartDate +
                   "至" +
                   this.expireForm.coursesExpireDate;
                 this.expireVisible = false;
@@ -1021,7 +1025,7 @@ export default {
                 this.$message.error(res.msg);
               }
             });
-          } else if(this.updateCourseStatus == 2) {
+          } else if (this.updateCourseStatus == 2) {
             updateCoursesExpireDateOnlyNormal({
               practiceGroupId: this.practiceId,
               coursesExpireDate: this.expireForm.coursesExpireDate,
@@ -1036,7 +1040,7 @@ export default {
                   }),
                 });
                 this.timers =
-                  this.expireForm.coursesStartDate+
+                  this.expireForm.coursesStartDate +
                   "至" +
                   this.expireForm.coursesExpireDate;
                 this.expireVisible = false;
@@ -1047,7 +1051,6 @@ export default {
               }
             });
           }
-
         } else {
           return;
         }
@@ -1227,14 +1230,17 @@ export default {
           // let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
           // coursesExpireDate
           let dayjs = this.$helpers.dayjs;
-          let nowDate =   dayjs(new Date()).valueOf()-24*60*60*1000
-          let coursesStartDate = dayjs(this.expireForm.coursesStartDate).valueOf()
-          let coursesExpireDate =  dayjs(this.expireForm.coursesExpireDate).valueOf()
-         let startTime =
-          coursesStartDate - nowDate >0?coursesStartDate:nowDate
+          let nowDate = dayjs(new Date()).valueOf() - 24 * 60 * 60 * 1000;
+          let coursesStartDate = dayjs(
+            this.expireForm.coursesStartDate
+          ).valueOf();
+          let coursesExpireDate = dayjs(
+            this.expireForm.coursesExpireDate
+          ).valueOf();
+          let startTime =
+            coursesStartDate - nowDate > 0 ? coursesStartDate : nowDate;
           return (
-            time.getTime() <(startTime)||
-            time.getTime()>coursesExpireDate
+            time.getTime() < startTime || time.getTime() > coursesExpireDate
           );
           // }
           // return;
@@ -1439,7 +1445,17 @@ export default {
   watch: {
     adjustmentVisible(val) {
       if (!val) {
-        this.$refs.adjustmentForm.resetFields();
+        if( this.$refs.adjustmentForm){
+            this.$refs.adjustmentForm.resetFields();
+        }
+        this.weekList = [
+          {
+            dayOfWeek: "",
+            startTime: "",
+            endTime: "",
+            moid: new Date().getTime(),
+          },
+        ];
       }
     },
   },

src/views/buildVip/index.vue

@@ -500,7 +500,7 @@
                   <span>缴费总额</span>
                   <el-tooltip placement="top" popper-class="mTooltip">
                     <div slot="content">
-                      （线上课单价*课时数+线下课单价*课时数）*折扣后四舍五入
+                      （线上课单价*课时数+线下课单价*课时数）*折扣后向上取整
                     </div>
                     <i
                       class="el-icon-question micon el-tooltip"