Merge branch 'online' into LAO_MO

dist/static/css/chunk-35e10135.7bfe6881.css

@@ -1 +0,0 @@
-.floor[data-v-6679f490]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-6679f490]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-6679f490],.floor .remove[data-v-6679f490]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-6679f490]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-6679f490]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-6679f490]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-6679f490]{margin-bottom:20px}.studentMask .left h4[data-v-6679f490]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-6679f490]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-6679f490]{padding-left:10px;line-height:25px}.studentMask .right[data-v-6679f490]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-6679f490]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-6679f490] .el-date-editor.el-input,.resetClassForm[data-v-6679f490] .el-date-editor.el-input__inner{width:180px!important}[data-v-6679f490] .el-date-editor.el-input,[data-v-6679f490] .el-date-editor.el-input__inner{width:100px!important}.higheSelect[data-v-6679f490] .el-input__inner{height:40px!important}

dist/static/css/chunk-76f27a16.e1902b91.css

@@ -0,0 +1 @@
+.floor[data-v-3326e778]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-3326e778]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-3326e778],.floor .remove[data-v-3326e778]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-3326e778]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-3326e778]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-3326e778]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-3326e778]{margin-bottom:20px}.studentMask .left h4[data-v-3326e778]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-3326e778]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-3326e778]{padding-left:10px;line-height:25px}.studentMask .right[data-v-3326e778]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-3326e778]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-3326e778] .el-date-editor.el-input,.resetClassForm[data-v-3326e778] .el-date-editor.el-input__inner{width:180px!important}[data-v-3326e778] .el-date-editor.el-input,[data-v-3326e778] .el-date-editor.el-input__inner{width:100px!important}.higheSelect[data-v-3326e778] .el-input__inner{height:40px!important}

dist/static/css/chunk-698984da.ee0d91eb.css → dist/static/css/chunk-decce012.e802ced7.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-7ab52a6d]{font-size:14px}.btnList[data-v-7ab52a6d]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-7ab52a6d]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-374a5fb0]{font-size:14px}.btnList[data-v-374a5fb0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-374a5fb0]{margin-right:15px}

src/utils/utils.js

@@ -0,0 +1,11 @@
+import dayjs from 'dayjs'
+
+export const formatData = (times, keys, format = 'YYYY-MM-DD') => {
+  const data = {}
+  if (times && times.length) {
+    for (let i = 0; i < keys.length; i++) {
+      data[keys[i]] = dayjs(times[i]).format(format)
+    }
+  }
+  return data
+}

src/utils/vueFilter.js

@@ -592,3 +592,14 @@ Vue.filter('feeProject', value => {
 Vue.filter('saleType', value => {
   return saleType[value]
 })
+
+// 缴费状态
+
+Vue.filter('teamPayStatus', value => {
+  const tpl = {
+    0: '按月',
+    1: '按季',
+    2: '一次性',
+  }
+  return tpl[value]
+})

src/views/resetTeaming/components/resetPayList.vue

@@ -38,6 +38,33 @@
                          prop="expectNum"
                          label="预计缴费人数"></el-table-column>
         <el-table-column align="center"
+                         prop="paymentPattern"
+                         label="缴费方式">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.paymentPattern | teamPayStatus}}
+              </div>
+            </template>
+          </el-table-column>
+        <el-table-column align="center"
+                         prop="paymentValidStartDate"
+                         label="缴费有效期开始日期">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.paymentValidStartDate | formatTimer}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
+                         prop="paymentValidEndDate"
+                         label="缴费有效期结束日期">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.paymentValidEndDate | formatTimer}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
                          prop="actualNum"
                          label="实际缴费人数"></el-table-column>
         <el-table-column align="center"
@@ -109,9 +136,47 @@
                       prop="deadlinePaymentDate">
           <el-date-picker v-model.trim="payForm.deadlinePaymentDate"
                           type="date"
-                          :picker-options="bigin"
+                          :picker-options="beginDate(payForm.startPaymentDate)"
                           value-format="yyyy-MM-dd"
-                          placeholder="开始日期"></el-date-picker>
+                          placeholder="结束日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+                      label="缴费方式"
+                      prop="paymentPattern"
+                      :rules="[{ required: true, message: '请选择缴费方式'},]">
+                      <el-select placeholder="缴费方式"
+                                  style="width: 220px"
+                                  clearable
+                                  filterable
+                                  @change="paymentPatternChange"
+                                  v-model.trim="payForm.paymentPattern">
+                                  <el-option :value="0"
+                                              label="按月"></el-option>
+                                  <el-option :value="1"
+                                              label="按季"></el-option>
+                                  <el-option :value="2"
+                                              label="一次性"></el-option>
+                      </el-select>
+        </el-form-item>
+        <el-form-item label="缴费有效期开始"
+                      :rules="[{ required: true, message: '请设置缴费有效期开始日期',trigger: 'blur'}]"
+                      prop="paymentValidStartDate">
+          <el-date-picker v-model.trim="payForm.paymentValidStartDate"
+                          type="date"
+                          @change="changePaymentStartTime"
+                          :picker-options="pickerOptions"
+                          value-format="yyyy-MM-dd"
+                          placeholder="有效期开始日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="缴费有效期结束"
+                      :rules="[{ required: payForm.paymentPattern !== 2, message: '请设置缴费有效期结束日期',trigger: 'blur'}]"
+                      prop="paymentValidEndDate">
+          <el-date-picker v-model.trim="payForm.paymentValidEndDate"
+                          type="date"
+                          :disabled="payForm.paymentPattern === 2"
+                          :picker-options="beginDate(payForm.paymentValidStartDate)"
+                          value-format="yyyy-MM-dd"
+                          placeholder="有效期结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="收费类型"
                       v-if='isNew'
@@ -208,6 +273,9 @@ export default {
       payForm: {
         startPaymentDate: null,
         deadlinePaymentDate: null,
+        paymentPattern: null,
+        paymentValidStartDate: null,
+        paymentValidEndDate: null,
         type: null,
         memo: null
       },
@@ -223,7 +291,6 @@ export default {
       qrcodes: true,
       qrcode: null,
       codeUrl: null,
-      bigin: this.beginDate(),
       chioseStudentVisible: false,
       chioseStudentList: [],
       clearStduent: true
@@ -253,6 +320,11 @@ export default {
         }
       })
     },
+    paymentPatternChange(val) {
+      if(val === 2) {
+        this.payForm.paymentValidEndDate = null
+      }
+    },
     onCreateQRCode () { // 生成报名二维码
       this.qrcodeStatus = true
       let id = this.$route.query.id
@@ -284,6 +356,14 @@ export default {
       this.isNew = false
       this.activeRow = row
       this.payVisible = true;
+      this.payForm = {
+        ...this.payForm,
+        startPaymentDate: row.startPaymentDate,
+        deadlinePaymentDate: row.deadlinePaymentDate,
+        paymentPattern: row.paymentPattern,
+        paymentValidStartDate: row.paymentValidStartDate,
+        paymentValidEndDate: row.paymentValidEndDate,
+      }
     },
     detelePay (row) {
       let id = row.id;
@@ -320,7 +400,7 @@ export default {
         type: null,
         memo: null
       },
-           * 
+           *
            */
           this.chioseStudentVisible = true
           return
@@ -341,6 +421,9 @@ export default {
       obj.musicGroupId = this.$route.query.id
       obj.startPaymentDate = this.payForm.startPaymentDate + ' 00:00:00'
       obj.deadlinePaymentDate = this.payForm.deadlinePaymentDate + ' 23:59:59'
+      obj.paymentValidStartDate = this.payForm.paymentValidStartDate
+      obj.paymentValidEndDate = this.payForm.paymentValidEndDate
+      obj.paymentPattern = this.payForm.paymentPattern
       obj.type = this.payForm.type
       obj.memo = this.payForm.memo
       addMusicGroupPaymentCalender(obj).then(res => {
@@ -367,6 +450,9 @@ export default {
     changeStartTime (val) {
       this.payForm.deadlinePaymentDate = this.dateAddDays(val, 3)
     },
+    changePaymentStartTime (val) {
+      this.payForm.paymentValidEndDate = null
+    },
     dateAddDays (dataStr, dayCount) {
       let strdate = dataStr; //日期字符串
       let isdate = new Date(strdate.replace(/-/g, "/"));  //把日期字符串转换成日期格式
@@ -374,13 +460,12 @@ export default {
       let pdate = isdate.getFullYear() + "-" + (isdate.getMonth() + 1) + "-" + (isdate.getDate());   //把日期格式转换成字符串
       return pdate;
     },
-    beginDate () {
-      let self = this
+    beginDate (end) {
       return {
         firstDayOfWeek: 1,
         disabledDate (time) {
-          if (self.payForm.startPaymentDate) {
-            return new Date(self.payForm.startPaymentDate).getTime() - 86400000 >= time.getTime()
+          if (end) {
+            return new Date(end).getTime() - 86400000 >= time.getTime()
           } else {
             return time.getTime() + 86400000 < Date.now()
             //开始时间不选时，结束时间最大值小于等于当天
@@ -399,6 +484,9 @@ export default {
       if (!val) {
         this.payForm = {
           startPaymentDate: null,
+          paymentPattern: null,
+          paymentValidStartDate: null,
+          paymentValidEndDate: null,
           type: null,
           memo: null,
           deadlinePaymentDate: null
@@ -444,4 +532,4 @@ export default {
     padding: 15px 15px 0 15px;
   }
 }
-</style>
+</style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -126,6 +126,46 @@
                           }"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
+        <el-form-item
+                      label="缴费方式"
+                      prop="paymentPattern"
+                      @change="changePaymentPattern"
+                      :rules="[{ required: true, message: '请选择缴费方式'},]">
+                      <el-select placeholder="缴费方式"
+                                  :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'"
+                                  clearable
+                                  filterable
+                                  v-model.trim="topFrom.paymentPattern">
+                                  <el-option :value="0"
+                                              label="按月"></el-option>
+                                  <el-option :value="1"
+                                              label="按季"></el-option>
+                                  <el-option :value="2"
+                                              label="一次性"></el-option>
+                      </el-select>
+        </el-form-item>
+        <el-form-item label="缴费有效期开始"
+                      prop="paymentValidStartDate"
+                      :rules="[{ required: true, message: '请选择缴费有效期开始'},]">
+                      <el-date-picker
+                        :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'"
+                        v-model="topFrom.paymentValidStartDate"
+                        placeholder="开始日期"
+                        :picker-options="{
+                          firstDayOfWeek:1
+                        }">
+                      </el-date-picker>
+        </el-form-item>
+        <el-form-item label="缴费有效期结束"
+                      prop="paymentValidEndDate"
+                      :rules="[{ required: true, message: '请选择缴费有效期结束'},]">
+                      <el-date-picker
+                        :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit' || topFrom.paymentPattern === 2"
+                        v-model="topFrom.paymentValidEndDate"
+                        :picker-options="beginDate(topFrom.paymentValidStartDate)"
+                        placeholder="结束日期">
+                      </el-date-picker>
+        </el-form-item>
         <el-form-item label="招生年级"
                       prop="startClass"
                       :rules="[{ required: true, message: '请选择招生年纪'},]">
@@ -404,7 +444,6 @@
       </div>
     </div>
   </div>
-  </div>
 </template>
 <script>
 import {
@@ -420,7 +459,7 @@ import {
   getEmployeeOrgan
 } from "@/api/buildTeam";
 import { findTechnician } from "@/api/repairManager";
-
+import dayjs from 'dayjs'
 import {
   queryEmployByOrganId,
   queryByOrganId,
@@ -430,6 +469,7 @@ import { scrollTo } from "@/utils/scroll-to";
 import axios from "axios";
 import store from "@/store";
 import numeral from 'numeral'
+import { formatData } from '@/utils/utils'
 import qs from "qs";
 export default {
   name: "teamBaseInfo",
@@ -452,6 +492,10 @@ export default {
         isClass: false, //是否为课堂课
         startTime: "",
         feeType: null,
+        paymentPattern: '', // 缴费方式
+        paymentValid: [], // 缴费有效期
+        paymentValidStartDate: null, // 缴费有效期开始
+        paymentValidEndDate: null, // 缴费有效期结束
         ownershipType: "OWN", // 合作机构类型
         repairUserId: null, // 维修技师
 
@@ -589,6 +633,24 @@ export default {
     changeFeeType (val) {
       console.log(val == "ONLINE")
     },
+    changePaymentPattern(val) {
+      if (val === 2) {
+        this.topFrom.paymentValidEndDate = null
+      }
+    },
+    beginDate (end) {
+      return {
+        firstDayOfWeek: 1,
+        disabledDate (time) {
+          if (end) {
+            return new Date(end).getTime() - 86400000 >= time.getTime()
+          } else {
+            return time.getTime() + 86400000 < Date.now()
+            //开始时间不选时，结束时间最大值小于等于当天
+          }
+        }
+      }
+    },
     init () {
       this.checkList = {
         soundInfo: {
@@ -674,6 +736,9 @@ export default {
             this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(
               ","
             );
+            this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern
+            this.topFrom.paymentValidStartDate = res.data.musicGroup.paymentValidStartDate
+            this.topFrom.paymentValidEndDate = res.data.musicGroup.paymentValidEndDate
             this.topFrom.section = res.data.musicGroup.organId;
             this.topFrom.school = res.data.musicGroup.cooperationOrganId;
             this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
@@ -776,9 +841,11 @@ export default {
           boss: "", // 运营主管
           time: "", // 报名截止时间
           startClass: [], // 招生年级起始
+          paymentValid: [], // 缴费有效期时间起始
           address: "", // 教学地点
           salary: "", // 收费模式
           head: "",
+          paymentPattern: "", // 缴费方式
           isClass: false, //是否为课堂课
           startTime: "",
           ownershipType: "OWN", // 合作机构类型
@@ -1019,6 +1086,9 @@ export default {
             educationalTeacherId: this.topFrom.teacher,
             enrollClasses: this.topFrom.startClass.join(","),
             name: this.topFrom.name,
+            paymentPattern: this.topFrom.paymentPattern,
+            paymentValidStartDate: this.topFrom.paymentValidStartDate,
+            paymentValidEndDate: this.topFrom.paymentValidEndDate,
             organId: this.topFrom.section,
             // paymentMonths:obj.months  有待确认
             schoolId: this.topFrom.address,
@@ -1099,6 +1169,18 @@ export default {
 }
 </script>
 <style lang="scss" >
+/deep/.el-date-editor {
+  width: 180px !important;
+}
+/deep/.el-checkbox {
+  margin-left: 15px !important;
+}
+/deep/.el-input {
+  position: relative;
+  font-size: 14px;
+  display: inline-block;
+  width: 180px;
+}
 .base-container {
   overflow: auto;
   // display: flex;
@@ -1244,17 +1326,3 @@ export default {
   }
 }
 </style>
-<style lang="scss" scoped>
-/deep/.el-date-editor {
-  width: 180px !important;
-}
-/deep/.el-checkbox {
-  margin-left: 15px !important;
-}
-/deep/.el-input {
-  position: relative;
-  font-size: 14px;
-  display: inline-block;
-  width: 180px;
-}
-</style>

src/views/teamBuild/components/teamSoundMoney.vue

@@ -765,6 +765,7 @@
 </template>
 <script>
 import store from "@/store";
+import { formatData } from '@/utils/utils'
 import {
   getSubject,
   getDefaultSubject,
@@ -1298,7 +1299,7 @@ export default {
       // 整理数据提交
       if (this.teamStatus == "newTeam") {
         let obj = {};
-        // 解析数据 
+        // 解析数据
         let courseJson = {};
         for (let i in this.checkfor) {
           if (this.checkfor[i].ischeck) {
@@ -1325,6 +1326,9 @@ export default {
           enrollClasses,
           name: this.topfor.name,
           organId: this.topfor.section,
+          paymentPattern: this.topfor.paymentPattern,
+          paymentValidStartDate: this.topfor.paymentValidStartDate,
+          paymentValidEndDate: this.topfor.paymentValidEndDate,
           // paymentMonths:obj.months  有待确认
           schoolId: this.topfor.address,
           courseForm: JSON.stringify(courseJson),
@@ -1880,6 +1884,12 @@ export default {
         amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
       }
       // 加上判断是否有课程信息
+      const sbaseInfo = newStudent.baseInfo
+      if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
+        const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
+        marketPrice += value;
+        amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
+      }
       if (mgs) {
         // console.log(csi)
         // amount += parseFloat(mgs);s
@@ -1988,7 +1998,7 @@ export default {
 
       if (!checkFlag) {
         marketPrice += Number(parseFloat(coursePrice))
-        //  
+        //
       }
       amount += parseFloat(coursePrice);
       // console.log(this.lookPreviewRow.markList)
@@ -2738,4 +2748,4 @@ export default {
     min-height: calc(100vh - 41px);
   }
 }
-</style>
+</style>

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -20,9 +20,9 @@
       <div class="newBand"
            @click="newClass"
            v-permission="'classGroup/create'">新建班级</div>
-      <!-- <div class="newBand"
+      <div class="newBand"
            @click="arrangeStart"
-           v-permission="'courseSchedule/batchAddCourseSchedule'">批量排课</div> -->
+           v-permission="'courseSchedule/batchAddCourseSchedule'">批量排课</div>
       <!-- <div class="newBand">删除排课</div> -->
       <!-- <p class="expectMsg">基础技能班参考数量: 线上:XX/线下:XX</p> -->
     </div>

src/views/teamBuild/teamSeting/index.vue

@@ -7,7 +7,7 @@
                         :content="name">
         </el-page-header>
       </h2>
-      <!-- <div class="stepbox">
+      <div class="stepbox">
         <span class='stepspan'
               @click="activeIndex=0">
           <div class="step1 sptep"
@@ -18,6 +18,17 @@
                alt=""
                class="arrow">
         </span>
+        <!-- <span class='stepspan  stepspan2'
+              @click="activeIndex=1">
+          <div class="step2 sptep"
+               :class="activeIndex >= 1?'activestep':''">
+            老师设置
+          </div>
+          <img :src="activeIndex >= 1?stepImgs.nol:stepImgs.active"
+               alt=""
+               class="
+               arrow">
+        </span> -->
         <span class='stepspan  stepspan2'
               @click="activeIndex=2">
           <div class="step2 sptep"
@@ -29,13 +40,34 @@
                class="
                arrow">
         </span>
-      </div>-->
+        <!-- <span class='stepspan  stepspan2'
+              @click="activeIndex=3">
+          <div class="step2 sptep"
+               :class="activeIndex >= 3?'activestep':''">
+            基础技能班
+          </div>
+          <img :src="activeIndex >= 3?stepImgs.nol:stepImgs.active"
+               alt=""
+               class="
+               arrow">
+        </span> -->
+        <span class='stepspan  stepspan2'
+              v-permission="'/teamSetting/salarySet'"
+              @click="activeIndex=4">
+          <div class="step2 sptep"
+               :class="activeIndex >= 4?'activestep':''">
+            课酬
+          </div>
+          <img :src="activeIndex >= 4?stepImgs.nol:stepImgs.active"
+               alt=""
+               class="
+               arrow">
+        </span>
+      </div>
     </div>
-    <classSeting :teamid='id'
-                 :isSetSalary='isSetSalary'
-                 @gotoNav='gotoNav' />
+
     <!-- 下面显示的内容 -->
-    <!-- <div class="stepcontent">
+    <div class="stepcontent">
       <div v-if='activeIndex==0'>
         <classSeting :teamid='id'
                      :isSetSalary='isSetSalary'
@@ -47,6 +79,7 @@
                        @gotoNav='gotoNav' />
       </div>
       <div v-if='activeIndex==2'>
+        <!-- <coursePlan :teamid='id' /> -->
         <div class="m-container">
           <lookCourse :isSetSalary='isSetSalary'
                       @gotoNav='gotoNav' />
@@ -62,7 +95,7 @@
         <salarySet :teamid='id'
                    :isSetSalary='isSetSalary' />
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 <script>

src/views/teamDetail/components/classList.vue

@@ -157,7 +157,7 @@ export default {
       postponeForm: {
         stopTime: '',
         resetTime: '',
-        holiday: true
+        holiday: false
       },
       postponeRules: {
         stopTime: [{ required: true, message: '请选择开始日期', trigger: 'blur' },],

src/views/teamDetail/components/resetClass.vue

@@ -430,7 +430,7 @@
                             @change="(val)=>{changeStartClassTime(item)}"
                             :picker-options="{
                                start: '04:30',
-                               step: '00:15',
+                               step: '00:05',
                                end: '23:55'
             }"></el-time-select>
             <span>结束时间</span>
@@ -438,7 +438,7 @@
                             v-model.trim="item.endClassTime"
                             :picker-options="{
                               start: '04:30',
-                              step: '00:15',
+                              step: '00:05',
                               end: '23:55',
                               minTime:item.startClassTime
             }"></el-time-select>