|
|
@@ -19,12 +19,12 @@
|
|
|
<view class="content_box">
|
|
|
<image src="/static/icon/wk_icon2.png" class="wk_icon"></image>
|
|
|
学习有效期：
|
|
|
- <text class="content">{{ $method.timestampToTime(item.validityStartTime) }} - {{ $method.timestampToTime(item.validityEndTime) }}</text>
|
|
|
+ <text class="content">{{ $method.timestampToTime(item.studyStartTime) }} - {{ $method.timestampToTime(item.studyEndTime) }}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
<!-- 不在学习有效期 -->
|
|
|
- <template v-if="sysTime < item.validityStartTime || sysTime > item.validityEndTime">
|
|
|
+ <template v-if="sysTime < item.studyStartTime || sysTime > item.studyEndTime">
|
|
|
<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1">
|
|
|
<view class="class-warm__text">
|
|
|
<view class="date">
|
|
|
@@ -76,7 +76,7 @@
|
|
|
<view class="class-warm">
|
|
|
<view class="class-warm__text">
|
|
|
<view class="date">
|
|
|
- <template v-if="sysTime >= item.validityStartTime && sysTime <= item.validityEndTime">
|
|
|
+ <template v-if="sysTime >= item.studyStartTime && sysTime <= item.studyEndTime">
|
|
|
学习状态：
|
|
|
<text v-if="item.stuAllNum == 0">未学习</text>
|
|
|
<text v-else-if="item.stuAllNum > 0 && item.stuAllNum < item.secAllNum">学习中</text>
|
|
|
@@ -157,7 +157,7 @@
|
|
|
<view class="box_progress">
|
|
|
<view style="width: 60%;"><u-line-progress :showText="false" height="22" active-color="#ff9900" :show-percent="false" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
|
|
|
|
|
|
- <view><u-button :class="{disabled:sysTime <= item.validityStartTime || sysTime >= item.validityEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart)}" type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">进入学习</u-button></view>
|
|
|
+ <view><u-button :class="{disabled:sysTime <= item.studyStartTime || sysTime >= item.studyEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart)}" type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">进入学习</u-button></view>
|
|
|
</view>
|
|
|
<view class="box_progress" v-if="item.applyStatus === 1">
|
|
|
<view style="width: 60%;">
|
|
|
@@ -342,7 +342,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
async studyIn(v,i,item,index) {
|
|
|
- if(this.sysTime <= item.validityStartTime || this.sysTime >= item.validityEndTime ) {
|
|
|
+ if(this.sysTime <= item.studyStartTime || this.sysTime >= item.studyEndTime ) {
|
|
|
uni.showToast({
|
|
|
icon:'none',
|
|
|
title:'不在学习有效期，不能进入学习'
|
chenxiong