修改

dist/css/Approval.61a71453.css

@@ -1 +0,0 @@
-.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.icon[data-v-67669af7]{width:2rem;height:2rem;margin:.5rem auto .05rem}.icon_nodata[data-v-67669af7]{background:url(../img/icon_nodata.81c87d57.png) no-repeat 50%;background-size:contain}.msg[data-v-67669af7]{color:#aaa;font-size:.16rem;text-align:center;line-height:.22rem}.approval[data-v-51185b86]{min-height:100vh}[data-v-51185b86] .van-tab--active{color:#ef5a50}[data-v-51185b86] .van-tabs__line{background-color:#14928a}.app-item[data-v-51185b86]{margin:0 .16rem .1rem;background:#fff;border-radius:.1rem;font-size:.14rem}.app-item[data-v-51185b86]:first-child{margin-top:.1rem}.app-item .hd[data-v-51185b86]{padding:.1rem .15rem .1rem .19rem;border-bottom:1px solid #f5f5f5;color:#777;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.app-item .bd[data-v-51185b86]{padding:.12rem .15rem .2rem .19rem;line-height:.2rem}

dist/css/CcMe.c2d53cae.css

@@ -1 +0,0 @@
-.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}[data-v-63ddf5bb] .van-tab--active{color:#ef5a50}[data-v-63ddf5bb] .van-tabs__line{background-color:#14928a}.app-item[data-v-63ddf5bb]{margin:0 .16rem .1rem;background:#fff;border-radius:.1rem;font-size:.14rem}.app-item[data-v-63ddf5bb]:first-child{margin-top:.1rem}.app-item .hd[data-v-63ddf5bb]{padding:.1rem .15rem .1rem .19rem;border-bottom:1px solid #f5f5f5;color:#777;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.app-item .bd[data-v-63ddf5bb]{padding:.12rem .15rem .2rem .19rem;line-height:.2rem}

dist/css/IStarted.7921d609.css

@@ -1 +0,0 @@
-.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.squrt{width:.14rem;height:.12rem;margin-left:.1rem}.van-search{padding:.13rem .16rem}/deep/ .van-search__action{color:#777}.icon[data-v-67669af7]{width:2rem;height:2rem;margin:.5rem auto .05rem}.icon_nodata[data-v-67669af7]{background:url(../img/icon_nodata.81c87d57.png) no-repeat 50%;background-size:contain}.msg[data-v-67669af7]{color:#aaa;font-size:.16rem;text-align:center;line-height:.22rem}.istarted[data-v-600fd6ec]{min-height:100vh}.app-item[data-v-600fd6ec]{margin:0 .16rem .1rem;background:#fff;border-radius:.1rem;font-size:.14rem;display:block}.app-item[data-v-600fd6ec]:first-child{margin-top:.1rem}.app-item .hd[data-v-600fd6ec]{padding:.1rem .15rem .1rem .19rem;border-bottom:1px solid #f5f5f5;color:#777;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.app-item .bd[data-v-600fd6ec]{padding:.12rem .15rem .2rem .19rem;line-height:.2rem}

dist/css/PeriodAdjust.324ca31e.css

@@ -1 +0,0 @@
-.periodadjust[data-v-588e3b60]{height:100vh;position:relative;background-color:#f3f4f8}.periodadjust .container[data-v-588e3b60]{min-height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden;position:relative}.periodadjust .button-group[data-v-588e3b60]{width:100%}.periodadjust .button-group .van-button[data-v-588e3b60]{font-size:.16rem;width:50%}.periodadjust .button-group .van-button--primary[data-v-588e3b60]{background:#14928a;border-color:#14928a}[data-v-588e3b60] .van-icon-underway-o{font-size:.18rem}[data-v-588e3b60] .van-cell__title{font-size:.16rem;color:#444}[data-v-588e3b60] .van-cell-group{margin-top:.05rem}.title-content[data-v-588e3b60]{-webkit-box-flex:1;-ms-flex:1 auto;flex:1 auto;font-weight:700}.title-content .van-cell__label[data-v-588e3b60]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-588e3b60]{margin-right:.05rem}[data-v-588e3b60] .van-cell__label,[data-v-588e3b60] .van-cell__value{color:#444;font-size:.14rem}[data-v-588e3b60] .van-cell__label span,[data-v-588e3b60] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-588e3b60]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-588e3b60]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-588e3b60] .van-radio__icon--disabled .van-icon{border-color:transparent;background:#fff}[data-v-588e3b60] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-588e3b60] .icon{margin-top:.3rem}

dist/css/PeriodChange.5e684512.css

@@ -1 +0,0 @@
-.periodchange[data-v-560da12e]{min-height:100vh;position:relative}.periodchange .container[data-v-560da12e]{height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden}.periodchange .button-group[data-v-560da12e]{width:100%;position:absolute;bottom:0;left:0}.periodchange .button-group .van-button--primary[data-v-560da12e]{background:#14928a}[data-v-560da12e] .van-cell__title{font-size:.16rem;color:#444}[data-v-560da12e] .van-cell-group{margin-top:.05rem}.title-content[data-v-560da12e]{font-weight:700}.title-content .van-cell__label[data-v-560da12e]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-560da12e]{margin-right:.05rem}[data-v-560da12e] .van-cell__label,[data-v-560da12e] .van-cell__value{color:#777}[data-v-560da12e] .van-cell__label span,[data-v-560da12e] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-560da12e]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-560da12e]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-560da12e] .van-radio__icon .van-icon{border-color:#aaa}[data-v-560da12e] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-560da12e] .icon{margin-top:.2rem}

dist/css/app.b61557eb.css

@@ -1 +0,0 @@
-.m-shadow{-webkit-box-shadow:0 0 .17rem 0 hsla(0,0%,79.2%,.42);box-shadow:0 0 .17rem 0 hsla(0,0%,79.2%,.42)}.m-shadow-small{-webkit-box-shadow:0 .04rem .06rem 0 rgba(0,0,0,.1);box-shadow:0 .04rem .06rem 0 rgba(0,0,0,.1)}.m-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}[v-cloak]{display:none}[class*=m-hairline]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #ebedf0;-webkit-transform:scale(.5);transform:scale(.5)}.orangeStatus{color:#f97215!important}.redStatus{color:#f85043!important}.blueStatus{color:#14928a!important}.defaultStatus{color:#777!important}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background:#f3f4f8;overflow-x:hidden;overflow-y:auto;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.slide-left-enter-active,.slide-left-leave-active,.slide-right-enter-active,.slide-right-leave-active{-webkit-will-change:transform;will-change:transform;-webkit-transition:all .5s;transition:all .5s;position:fixed;top:0;left:0;right:0}.slide-right-enter{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.slide-left-enter,.slide-right-leave-active{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.slide-left-leave-active{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.fade-enter-active,.fade-leave-active{-webkit-transition:opacity .5s;transition:opacity .5s}.fade-enter,.fade-leave-active{opacity:0}

dist/css/order.27a80b05.css

@@ -1 +0,0 @@
-.order[data-v-f2c63e1e]{background:#fff;min-height:100vh}header[data-v-f2c63e1e]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center}h2[data-v-f2c63e1e]{font-size:.16rem;color:#fff;padding:.1rem 0;text-align:center;background:#14928a}.table .title[data-v-f2c63e1e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;border-bottom:1px solid #eaeaea}.table span[data-v-f2c63e1e]{-webkit-box-flex:1;-ms-flex:1;flex:1;padding:.08rem 0;font-size:.14rem}.table span[data-v-f2c63e1e]:first-child{width:.3rem;-webkit-box-flex:inherit;-ms-flex:inherit;flex:inherit}.table .content>div[data-v-f2c63e1e]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center}.table .content>div[data-v-f2c63e1e]:nth-child(2n+2){background:#eaeaea}[data-v-f2c63e1e] .van-dropdown-menu{height:.4rem;position:absolute;right:.15rem;top:0}

src/common/vueFilters.js

@@ -46,6 +46,15 @@ Vue.filter('clockingIn', value => {
     return templateStatus[value]
 })
 
+// 课程类型
+Vue.filter('teachModeStatus', value => {
+    let templateStatus = {
+        ONLINE: "线上课",
+        OFFLINE: "线下课"
+    }
+    return templateStatus[value]
+})
+
 Vue.filter('formatDate', value => {
     let d = new Date(value.replace(/-/ig, '/'))
     let hour = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()

src/components/MCalendar.vue

@@ -389,9 +389,7 @@ export default {
         }
     },
     watch: {
-        dataList(newValue, oldValue) {
-            console.log(true)
-        }
+        
     },
     mounted() {
         // 选择不同的日历类型

src/views/teacher/PeriodAdjust.vue

@@ -15,7 +15,7 @@
                             <van-radio ref="radioes" :disabled="radioDisabled" :name="item.id"></van-radio>
                         </template>
                         <template slot="title">{{ item.name }}</template>
-                        <template slot="label">主讲老师：{{ item.teacherName }}</template>
+                        <template slot="label">{{ item.teachMode |  teachModeStatus}} &nbsp; 主讲老师：{{ item.teacherName }}</template>
                     </van-cell>
                 </van-cell-group>
             </van-radio-group>
@@ -36,14 +36,13 @@
     </div>
 </template>
 <script>
-// import MHeader from '@/components/MHeader'
+// import MHeader from '@/components/MHeader' courseSwap
 import MCalendar from '@/components/MCalendar'
 import MEmpty from '@/components/MEmpty'
 import { browser }  from '@/common/common'
 import { getCourseSchedulesWithDate, 
     getCourseScheduleDateByMonth,
-    classStartDateAdjust,
-    courseSwap } from '@/api/teacher'
+    classStartDateAdjust } from '@/api/teacher'
 export default {
     name: 'periodadjust',
     components: { MCalendar, MEmpty },
@@ -282,10 +281,10 @@ export default {
     border-color: transparent;
     background: #fff;
 }
-/deep/.van-radio__icon .van-icon {
+// /deep/.van-radio__icon .van-icon {
     // border-color: transparent;
     // background: #fff;
-}
+// }
 /deep/.van-radio__icon--checked .van-icon {
     background: @orangeColor;
     border-color: @orangeColor;

src/views/teacher/PeriodChange.vue

@@ -15,16 +15,18 @@
                             <van-radio ref="radioes" :disabled="radioDisabled" :name="item.id"></van-radio>
                         </template>
                         <template slot="title">{{ item.name }}</template>
-                        <template slot="label">主讲老师：{{ item.teacherName }}</template>
+                        <template slot="label">{{ item.teachMode |  teachModeStatus}} &nbsp; 主讲老师：{{ item.teacherName }}</template>
                     </van-cell>
                 </van-cell-group>
             </van-radio-group>
             <m-empty v-else key="data" />
-
-            <div class="button-group" v-if="dataShow">
+        </div>
+        <van-sticky v-if="dataShow">
+            <div class="button-group">
                 <van-button type="primary" @click="onChangeClass" size="large">确认交换</van-button>
             </div>
-        </div>
+        </van-sticky>
+        
     </div>
 </template>
 <script>
@@ -139,21 +141,50 @@ export default {
 <style lang='less' scoped>
 @import url("../../assets/commonLess/variable.less");
 .periodchange {
-    min-height: 100vh;
+    // height: 100vh;
+    // position: relative;
+    // .container {
+    //     // height: 100%;
+    //     height: calc(100vh - 50px);
+    //     overflow-y: auto;
+    //     overflow-x: hidden;
+    // }
+
+    // .button-group {
+    //     width: 100%;
+    //     // position: absolute;
+    //     // bottom: 0;
+    //     // left: 0;
+    //     // z-index: 99;
+    //     .van-button--primary {
+    //         background: @mColor;
+    //         border: @mColor;
+    //     }
+    // }
+
+    // min-height: 100vh;
+    height: 100vh;
     position: relative;
+    background-color: #F3F4F8;
     .container {
-        height: calc(100vh - 50px);
+        min-height: calc(100vh - 50px);
         overflow-y: auto;
         overflow-x: hidden;
+        position: relative;
     }
-
     .button-group {
         width: 100%;
-        position: absolute;
-        bottom: 0;
-        left: 0;
+        // position: absolute;
+        // bottom: 0;
+        // left: 0;
+        // z-index: 99;
+        .van-button {
+            font-size: .16rem;
+            width: 100%;
+        }
         .van-button--primary {
             background: @mColor;
+            border-color: @mColor;
         }
     }
 }

src/views/teacher/VIPApply.vue

@@ -567,8 +567,8 @@ export default {
             // }
 
             // 拿到线上课数与线下课数 以及
-            let online = parseInt(form.onlineClassesNums)
-            let offline = parseInt(form.offlineClassesNums)
+            let online = parseInt(form.onlineClassesNums ? form.onlineClassesNums : 0)
+            let offline = parseInt(form.offlineClassesNums ? form.offlineClassesNums : 0)
             let giveNum = parseInt(this.other.giveNum)
             
             let giveClassType = form.giveTeachMode
@@ -585,10 +585,15 @@ export default {
             let totalCount = Number(online) + Number(offline)
             let tempCourseStart = form.courseStart.replace(/-/ig, '/')
             let dateOperation  = new Date(tempCourseStart)
+            let forMark = 0
             while(totalCount && totalCount > 0) {
                 for(let i = 0; i < scheduleList.length; i++) {
                     if (online == 0 && offline == 0) break
                     let num = scheduleList[i].weekIndex - dateOperation.getDay()
+                    // 如果是同一天一个周期会出现排课都排到一天
+                    if(forMark > 0 && num == 0 && i == 0) {
+                        num = num + 7
+                    }
                     if(num < 0) { // 如果为负数则为下周
                         num = num + 7
                     } 
@@ -623,6 +628,8 @@ export default {
                 if(scheduleList.length == 1) {
                     dateOperation.setDate(dateOperation.getDate() + 7)
                 }
+                // 标记循环次数
+                forMark++
             }
         },
         onGiveMode() { // 赠送课改变时

src/views/teacher/order.vue

@@ -36,7 +36,6 @@
 
 <script>
 import { queryStudentApply, querySubByMusicGroupId } from '@/api/teacher'
-import qs from 'qs'
 export default {
     name: 'order',
     data() {