Signed-off-by: Changpeng Duan <838560574@qq.com>

app/src/api/getApiRes.js

@@ -129,4 +129,10 @@ export function VipUserSelfQuery(postdata) {
     return getApiBasic(url,postdata);
 }
 
+// 通过session查询用户自身信息
+export function ManagerSelfQuery(postdata) {
+    let url = headapi + 'v1/User/ManagerSelfQuery';
+    return getApiBasic(url,postdata);
+}
+
 

app/src/page/appoint.vue

@@ -1,43 +1,50 @@
 <template>
-    <div>
+    <div class="pages">
         <img src="../static/images/main/banner.png" height="121" width="414"/>
-        <mu-tabs :value.sync="active" color="#F2F2F2" indicator-color="#33CAF7" center>
-            <mu-tab v-for="item in 5">8月5日 <br> <em>星期二</em></mu-tab>
+        <mu-tabs :value.sync="active" color="#F2F2F2" indicator-color="#33CAF7" >
+            <mu-tab v-for="(day,i) in weeks">{{day.name}} <br> <em>{{day.data}}</em></mu-tab>
         </mu-tabs>
         <div class="context">
                 <span class="sum">
-                    今日预约名额剩余
+                    当日预约名额剩余
                     <em class="green" v-if="num > 0">{{num}}</em>
                     <em class="red" v-else>{{num}}</em>
                     人
                 </span>
             <ul class="list">
                 <li v-for="l in list"
-                    :class="[{'greenLi':l.Status == 0},{'redLi':l.Status == 1},{'yellowLi':l.Status == 2},{'whiteLi':l.Status == 3}]">
+                    :class="[{'greenLi':l.remain > 0},{'redLi':l.Status == 1},{'yellowLi':l.remain == 0},{'whiteLi':l.WxOrder == 0}]">
                     <div class="dotContainer">
-                        <i class="dot" v-if="l.Status==0"></i>
+                        <!--                        正常-->
+                        <i class="dot" v-if="l.remain>0"></i>
+
                         <i class="cubes" v-if="l.Status==1"></i>
-                        <i class="tri" v-if="l.Status==2"></i>
-                        <i class="x" v-if="l.Status==3"></i>
+<!--                        已满-->
+                        <i class="tri" v-if="l.remain==0"></i>
+                        <!--                        不可约-->
+                        <i class="x" v-if="l.WxOrder==0"></i>
                     </div>
                     <div class="title">
-                        <h5>{{l.name}}</h5>
-                        <span>{{l.timeLong}}</span>
+                        <h5>{{l.ClassName}}</h5>
+                        <span>{{l.BeginStr}} - {{l.EndStr}}</span>
                     </div>
                     <div class="current">
                         <h5>剩余
-                            <em class="green" v-if="l.kick > 0">{{l.kick}}</em>
-                            <em class="red" v-else>{{l.kick}}</em>
+                            <em class="green" v-if="l.remain > 0">{{l.remain}}</em>
+                            <em class="red" v-else>{{l.remain}}</em>
                             人</h5>
-                        <span>总名额 {{l.kick}} 人</span>
+                        <span>总名额 {{l.OrderToplimit}} 人</span>
                     </div>
-                    <mu-button class="appointBtn greenBtn" v-if="l.Status == 0" @click="appointNow(l)">预约
-                    </mu-button>
-                    <mu-button class="appointBtn redBtn" v-if="l.Status == 1" @click="isFulled">已满</mu-button>
-                    <mu-button class="appointBtn yellowBtn" v-if="l.Status == 2" @click="isAppointed(l)">已约
-                    </mu-button>
-                    <mu-button class="appointBtn disableBtn" v-if="l.Status == 3" @click="isDisable">不可约</mu-button>
+                    <mu-button class="appointBtn greenBtn" v-if="l.remain > 0 && l.OrderId == 0" @click="appointNow(l)">预约</mu-button>
+                    <mu-button class="appointBtn redBtn" v-if="l.remain == 0" @click="isFulled">已满</mu-button>
+                    <mu-button class="appointBtn yellowBtn" v-if="l.OrderId != 0" @click="isAppointed(l)">已约</mu-button>
+                    <mu-button class="appointBtn disableBtn" v-if="l.WxOrder == 0" @click="isDisable">不可约</mu-button>
                 </li>
+                <div class="tips" v-if="list == ''">
+                    <p style="text-align: center">
+                        暂无可预约的课程
+                    </p>
+                </div>
             </ul>
         </div>
         <bottomTab :curTab="thisTab"></bottomTab>
@@ -45,7 +52,7 @@
             <mu-dialog title="预约课程" width="600" max-width="80%" :esc-press-close="false"
                        :overlay-close="false" :open.sync="openAlert">
                 <p>
-                    是否预约 课程：{{dialog.name}} ，时间：{{dialog.timeLong}}
+                    是否预约 课程：{{dialog.ClassName}} ，时间：{{dialog.BeginStr}} - {{dialog.EndStr}}
                     <br>
                 </p>
                 <mu-button slot="actions" flat color="primary" @click="closeAlertDialog">取消</mu-button>
@@ -59,6 +66,9 @@
     import axios from 'axios';
     import bottomTab from '../components/bottomTab'
     import {
+        SchoolTimeTableListQuery,
+        OderAddByVipUser,
+        OderCancelByVipUser,
         testSelect,
         testTable,
     } from '../api/getApiRes.js'
@@ -75,6 +85,7 @@
                 sum: 0,
                 openAlert: false,
                 list: [],
+                weeks: [],
                 dialog: {
                     id: '',
                     name: '',
@@ -83,17 +94,77 @@
             }
         },
         mounted() {
-            this.getList();
+            this.getFurtherDays();
         },
         methods: {
+            // 获取未来7天的
+            getFurtherDays() {
+                let now = new Date();
+                let nowTime = now.getTime();
+                let oneDayTime = 24 * 60 * 60 * 1000;
+                let days = '';
+                let item = [];
+                let month = 0;
+                let day = 0;
+                for (let i = 0; i < 7; i++) {
+                    days = new Date(nowTime + (i) * oneDayTime);//显示周日
+                    month = days.getMonth() + 1;
+                    day = days.getDate();
+                    month = month < 10 ? '0' + month : month;
+                    day = day < 10 ? '0' + day : day;
+                    item = {
+                        name: this.numberToWeek(days.getDay()),
+                        data: days.getMonth() + 1 + '月' + days.getDate() + '日',
+                        orderDate: new Date().getFullYear() + '-' + month + '-' + day
+                    }
+                    this.weeks.push(item);
+                }
+                console.log( this.weeks);
+                // let todaymonth =  new Date.getMonth() + 1;
+                // let todayday =  new Date.getDate();
+                //  todaymonth = todaymonth < 10 ? '0' + todaymonth : todaymonth;
+                //  todayday = todayday < 10 ? '0' + todayday : todayday;
+                // let today = {
+                //     name:this.numberToWeek(new Date.getDay()),
+                //     data: new Date.getMonth() + 1 + '月' + new Date.getDate() + '日',
+                //     orderDate: new Date().getFullYear() + '-' + month + '-' + day
+                // }
+                // this.weeks.push(today);
+                this.getList();
+            },
+            numberToWeek(val) {
+                switch (parseInt(val)) {
+                    case 1:
+                        return '星期一'
+                        break;
+                    case 2:
+                        return '星期二'
+                        break;
+                    case 3:
+                        return '星期三'
+                        break;
+                    case 4:
+                        return '星期四'
+                        break;
+                    case 5:
+                        return '星期五'
+                        break;
+                    case 6:
+                        return '星期六'
+                        break;
+                    case 0:
+                        return '星期天'
+                        break;
+                }
+            },
             confirmAppoint() {
                 let that = this;
                 let param = {
                     token: localStorage.token,
-                    id: that.dialog.id
+                    stdId : that.dialog.StdId
                 };
                 let postdata = qs.stringify(param);
-                testSelect(postdata).then(res => {
+                OderAddByVipUser(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.Toast('已成功预约', 'success');
@@ -128,9 +199,10 @@
                     if (result) {
                         let param = {
                             token: localStorage.token,
+                            orderId : row.OrderId,
                         };
                         let postdata = qs.stringify(param);
-                        testTable(postdata).then(res => {
+                        OderCancelByVipUser(postdata).then(res => {
                             let json = res;
                             if (json.Code == 0) {
                                 that.Toast('当前课程已取消预约', 'success');
@@ -149,24 +221,40 @@
             },
             getList() {
                 let that = this;
+                let curDay = this.weeks[this.active].orderDate;
                 let param = {
                     token: localStorage.token,
-                    active: this.active
+                    orderDate: curDay,
                 };
                 let postdata = qs.stringify(param);
-                testTable(postdata).then(res => {
+                SchoolTimeTableListQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.list = json.Rs;
+                        that.num = 0;
                         if (that.list) {
-                            that.num = json.Rs.length;
+                            // 计算剩余
+                            that.list.map(function (item) {
+                                item.remain = parseInt(item.OrderToplimit) - parseInt(item.OrderCount);
+                                that.num =  that.num + item.remain
+                            })
                         }
+                        console.log(that.num);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.Toast(json.Memo + ',错误码：' + json.Code);
                     }
                 })
             },
         },
+        beforeRouteEnter(to, from, next) {
+            next(vm => {
+                //因为当钩子执行前，组件实例还没被创建
+                // vm 就是当前组件的实例相当于上面的 this，所以在 next 方法里你就可以把 vm 当 this 来用了。
+                if (to.name == 'appoint') {
+                    vm.getList();
+                }
+            });
+        },
         watch: {
             'active'() {
                 this.getList();
@@ -179,6 +267,11 @@
 </script>
 
 <style scoped>
+    .pages {
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
     /*mu-header*/
     .mu-primary-color {
         line-height: 60px;
@@ -198,14 +291,20 @@
     /deep/ .mu-appbar-title {
         text-align: center;
     }
-
+    /deep/ .mu-tabs {
+        display: flex;
+        overflow-x: scroll;
+        float: left;
+    }
     /deep/ .mu-tab {
+        float: left;
         height: 51px;
         margin-right: 6px;
     }
-    /deep/ .mu-tab:nth-child(5) {
-        margin-right: 0px;
-    }
+
+    /*/deep/ .mu-tab:nth-child(5) {*/
+    /*    margin-right: 0px;*/
+    /*}*/
 
     /deep/ .mu-tab-wrapper {
         height: 51px;
@@ -424,6 +523,7 @@
         overflow-y: hidden;
         white-space: nowrap;
     }
+
     /deep/ .mu-tabs-center::-webkit-scrollbar {
         display: none;
     }

app/src/page/mainpage.vue

@@ -2,10 +2,10 @@
     <div id="mainPage">
         <img src="../static/images/main/banner.png" height="121" width="414"/>
         <span class="shopNum">
-            俱乐部场馆共 {{shopNum}} 处
+            俱乐部场馆共 1 处
         </span>
         <ul class="list">
-            <li v-for="l in list" @click="goAppoint(l)" v-if="l.Status == 1">
+            <li v-for="l in list" @click="goAppoint(l)" v-if="l.Status == 1 && l.ShopID ==  currShopId">
                 <img src="../static/images/main/771.png" height="133" width="130"/>
                 <div class="rt">
                     <h5>{{l.ShopName}}</h5>
@@ -15,6 +15,11 @@
                     <em class="red" v-else>不可预约</em>
                 </div>
             </li>
+            <div class="tips" v-if="list == ''">
+                <p style="text-align: center">
+                    暂无可预约的门店
+                </p>
+            </div>
         </ul>
         <bottomTab :curTab="thisTab"></bottomTab>
     </div>
@@ -22,6 +27,7 @@
 
 <script>
     import {
+        ManagerSelfQuery,
         OrderShopQuery,
         testSelect,
         testTable,
@@ -42,15 +48,33 @@
                 Dannum: 0,
                 GetHotelCounts: 0,
                 GetDetectorNum: 0,
+                currShopId: 0,
                 list: [],
             }
         },
         mounted() {
-            this.getList();
+
+            this.getManagerSelfQuery();
         },
         destroyed() {
         },
         methods: {
+            getManagerSelfQuery(){
+                let that = this;
+                let param = {
+                token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                ManagerSelfQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        this.currShopId =  json.Rs.ShopId;
+                        this.getList();
+                    } else {
+                        that.$message.error(json.Memo);
+                    }
+                })
+            },
             getList() {
                 let that = this;
                 let param = {

app/src/page/record.vue

@@ -13,10 +13,14 @@
             <div class="whiteCube"></div>
             <ul class="list">
                 <li v-for="l in list">
-                    <div class="lt">
+                    <div class="lt" v-if="active != 2">
                         <h5>{{l.CurrentDate}}</h5>
                         <span>{{l.BeginStr}}-{{l.EndStr}}</span>
                     </div>
+                    <div class="lt" v-if="active == 2">
+                        <h5>{{l.CreatedAt|filterTime}}</h5>
+                        <span>剩余课时 {{l.AfterNormalhour}}</span>
+                    </div>
                     <div class="md">
                         <em>
                             {{l.ClassName}}
@@ -31,19 +35,40 @@
                     <div class="rt">
                         <div class="cancleBtn" v-if="l.Status == 0" @click="cancleAppoint(l)">取消</div>
                         <span v-if="l.Status == 1" class="isFinish">
-                            已完成
+                            已预约
                         </span>
                         <span class="red" v-if="l.Status == 2">
                             已取消
                         </span>
-                        <em v-if="l.Status == 3">
-                            - {{l.Status}}课时
+                        <span class="red" v-if="l.Status == 3">
+                            预约未到
+                        </span>
+                        <span class="green" v-if="l.Status == 4">
+                            已完成
+                        </span>
+                        <em  v-if="active == 2">
+                            - {{l.NormalHour}}课时
                         </em>
                     </div>
                 </li>
+                <div class="tips">
+                    <p v-if="active == 0 && list == ''">
+                        暂无已预约
+                    </p>
+                    <p v-if="active == 1 && list == ''">
+                        暂无预约记录
+                    </p>
+                    <p v-if="active == 2 && list == ''">
+                        暂无消费记录
+                    </p>
+                </div>
             </ul>
         </div>
         <bottomTab :curTab="thisTab"></bottomTab>
+<!--        <span v-if="scope.row.Status == 1">已预约</span>-->
+<!--        <span v-if="scope.row.Status == 2">已取消</span>-->
+<!--        <span v-if="scope.row.Status == 3">预约未到</span>-->
+<!--        <span v-if="scope.row.Status == 4">已完成</span>-->
     </div>
 </template>
 
@@ -104,16 +129,16 @@
                     }
                 });
             },
-            getOrderListQuery(statusList){
+            getOrderListQuery(statusList) {
                 let that = this;
                 let param = {
                     token: localStorage.token,
                     statusList: statusList,
-                    start:1,
-                    tableMax :10,
+                    start: 1,
+                    tableMax: 10,
                 };
                 let postdata = qs.stringify(param);
-                if(parseInt(this.active) == 0 || parseInt(this.active) == 1){
+                if (parseInt(this.active) == 0 || parseInt(this.active) == 1) {
                     OrderListQuery(postdata).then(res => {
                         let json = res;
                         if (json.Code == 0) {
@@ -124,15 +149,15 @@
                         } else {
                             that.$message.error(json.Memo);
                         }
-                    }) ;
+                    });
                 }
             },
-            getVipUserConsumeListQuery(){
+            getVipUserConsumeListQuery() {
                 let that = this;
                 let param = {
                     token: localStorage.token,
-                    start:1,
-                    tableMax :10,
+                    start: 1,
+                    tableMax: 10,
                 };
                 let postdata = qs.stringify(param);
                 VipUserConsumeListQuery(postdata).then(res => {
@@ -149,18 +174,19 @@
             },
             getList() {
                 let statusList = '';
+                this.list = [];
                 switch (parseInt(this.active)) {
                     // 已预约
                     case 0:
                         statusList = 1;
                         this.getOrderListQuery(statusList);
                         break;
-                        // 预约记录
+                    // 预约记录
                     case 1:
                         statusList = '1,2,3,4';
                         this.getOrderListQuery(statusList);
                         break;
-                        // 消费记录
+                    // 消费记录
                     case 2:
                         statusList = 1;
                         this.getVipUserConsumeListQuery(statusList);
@@ -173,11 +199,19 @@
                 //因为当钩子执行前，组件实例还没被创建
                 // vm 就是当前组件的实例相当于上面的 this，所以在 next 方法里你就可以把 vm 当 this 来用了。
                 if (to.name == 'record') {
-                    console.log(123);
                     vm.getList();
                 }
             });
         },
+        filters: {
+            filterTime: function (value) {
+                if(!value){
+                    return 0
+                }else{
+                    return globalfmtDate(value);
+                }
+            },
+        },
         watch: {
             '$route'(to) {
                 if (to.name == 'record') {
@@ -382,4 +416,24 @@
         color: #909090;
         margin-top: 6px;
     }
+
+    .tips {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .tips p {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        text-align: center;
+        font-size: 14px;
+        line-height: 35px;
+    }
+    .green {
+        color: #37cb00;
+    }
 </style>

pc/src/Global.js

@@ -53,7 +53,7 @@ globalfmtDate = function (datetime, length) {
 getHoursAndMin = function (datetime) {
     let date = new Date(datetime);
     h = date.getHours() < 10 ? '0' + date.getHours() + ':' : date.getHours() + ':';
-    m = date.getMinutes() < 10 ? '0' + date.getMinutes() + ':' : date.getMinutes();
+    m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
     return h + m;
 }
 
@@ -304,7 +304,7 @@ turnStdToOption = function (data) {
     return ids
 }
 
-numberToWeekdays = function(val) {
+numberToWeekdays = function (val) {
     switch (parseInt(val)) {
         case 1:
             return '星期一'

pc/src/views/AdminManage.vue

@@ -628,7 +628,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/AdminSetting.vue

@@ -330,7 +330,8 @@
         float: right;
         bottom: 35px;
     }
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/EditLessonManage.vue

@@ -239,7 +239,7 @@
                     pageIndex: 1,
                 },
                 testRow: {
-                    timeLong: [new Date(2016, 9, 10, 8, 40), new Date(2016, 9, 10, 9, 40)],
+                    timeLong: [new Date(2016, 9, 10, 8, 1), new Date(2016, 9, 10, 9, 2)],
                     BeginStr: '08:30',
                     EndStr: '09:30',
                     ClassId: '',
@@ -341,14 +341,20 @@
             },
             // 删除
             delRow(scope) {
-                this.checkCannotDel(scope)
+                if(!scope.row.StdId){
+                    let delIndex = parseInt(scope.$index)
+                    let curIndex = parseInt(this.activeName) - 1;
+                    this.tabs[curIndex].tableData.splice(delIndex, 1)
+                }else{
+                    this.checkCannotDel(scope)
+                }
             },
             // 检测课表中课程可否删除
-            checkCannotDel(row) {
+            checkCannotDel(scope) {
                 let that = this;
                 let param = {
                     token: localStorage.token,
-                    regionid: row.Id,
+                    stdId : scope.row.StdId ,
                 };
                 let postdata = qs.stringify(param);
                 STTDetailAllowDelCheck(postdata).then(res => {
@@ -579,7 +585,8 @@
 
     .context {
         overflow: hidden;
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/EditLessonTable.vue

@@ -525,7 +525,8 @@
     }
 
     .context {
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
 
         display: block;

pc/src/views/EditLessonTable2.vue

@@ -316,7 +316,8 @@
         font-style: normal;
     }
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/Lesson.vue

@@ -541,7 +541,7 @@
                     token: localStorage.token,
                     vipType: '',
                     start: 1,
-                    expDay: 0,
+                    expDay: '',
                     tableMax: 9999,
                 };
                 let postdata = qs.stringify(param);
@@ -729,7 +729,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/LessonTable.vue

@@ -525,7 +525,8 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
 
         display: block;

pc/src/views/Log.vue

@@ -444,7 +444,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/Member.vue

@@ -49,7 +49,7 @@
             <el-button @click="giftChange">赠送课时调整</el-button>
             <el-button @click="ExpTimeChange">有效期调整</el-button>
             <el-button @click="lessonStudenChange">增删课程</el-button>
-<!--            <el-button class="pull-right" icon="el-icon-position">导出</el-button>-->
+            <!--            <el-button class="pull-right" icon="el-icon-position">导出</el-button>-->
         </div>
         <div class="table">
             <el-table
@@ -983,9 +983,9 @@
             // 过滤时间
             filterFmtDate(value, row, column) {
                 let that = this;
-                if(column == "0001-01-01T08:05:43+08:05"){
+                if (column == "0001-01-01T08:05:43+08:05") {
                     return '无有效期';
-                }else{
+                } else {
                     return nonTfmtDate(column, 11);
                 }
             },
@@ -996,10 +996,10 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
-
+    .context {
+        border-radius: 12px;
+        height: 770px;
         overflow-y: scroll;
-        height: 760px;
         display: block;
         margin: 0 auto;
         background-color: #fff !important;
@@ -1098,8 +1098,9 @@
         color: #545454;
         font-size: 12px;
     }
+
     .btn {
-        float: left!important;
+        float: left !important;
         margin-right: 5px;
     }
 </style>

pc/src/views/ShopManage.vue

@@ -498,7 +498,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/appoint.vue

@@ -1299,7 +1299,8 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/coach.vue

@@ -547,7 +547,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/cost.vue

@@ -956,7 +956,8 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/finish.vue

@@ -276,7 +276,8 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/finishDetail.vue

@@ -627,7 +627,8 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 760px;
+        height: 770px;
+
         overflow-y: scroll;
 
         display: block;

pc/src/views/lessonManage.vue

@@ -39,12 +39,12 @@
                                {{scope.row.BeginDate}} - {{scope.row.EndDate}}
                         </span>
                             <!--                            已上线-->
-                            <span class="CurTime" v-if="scope.row.Diffweek == 0">
+                            <span class="CurTime" v-if="scope.row.Diffweek >= 0">
                              {{scope.row.BeginDate}} - {{scope.row.EndDate}}
                         </span>
                             <!--                            当前进行-->
                             <i class="curIcon" v-if="scope.row.Status == 1 && scope.row.Diffweek == 0"></i>
-                            <span class="runTime" v-if="scope.row.Status == 2 && scope.row.Diffweek == 0">
+                            <span class="runTime" v-if="scope.row.Status == 2 ">
                               {{scope.row.BeginDate}} - {{scope.row.EndDate}}
                         </span>
                         </div>
@@ -583,7 +583,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/record.vue

@@ -352,7 +352,8 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

pc/src/views/setting.vue

@@ -382,7 +382,8 @@
         bottom: 35px;
     }
 
-    .context {   height: 760px;         overflow-y: scroll;
+    .context {   height: 770px;
+         overflow-y: scroll;
 
         display: block;
         margin: 0 auto;