|
@@ -25,7 +25,7 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 不在学习服务期 -->
|
|
|
- <template v-if="sysTime < item.serviceStartTime || sysTime > item.serviceEndTime">
|
|
|
+ <template v-if="item.serviceStartTime && (sysTime < item.serviceStartTime || sysTime > item.serviceEndTime)">
|
|
|
<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1">
|
|
|
<view class="class-warm__text">
|
|
|
<view class="date">
|
|
@@ -94,7 +94,8 @@
|
|
|
<text v-else-if="item.stuAllNum+item.recordNum >= item.secAllNum+item.examNum">已学完</text>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- 已过学习服务期,不可以学习了哦!
|
|
|
+ <template v-if="item.serviceStartTime">已过学习服务期,不可以学习了哦!</template>
|
|
|
+
|
|
|
</template>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -200,7 +201,7 @@
|
|
|
|
|
|
<view>
|
|
|
<u-button
|
|
|
- :class="{disabled:sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart)}"
|
|
|
+ :class="{disabled:(item.serviceStartTime && (sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime)) || (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>
|