我的课程-选班重学

pages2/wd/class.vue

@@ -24,10 +24,10 @@
 							</view>
 						</view>
 					<!-- </navigator> -->
-					<view class="class-warm">
+					<view class="class-warm" v-if="item.classEndTime && (item.classEndTime < sysTime) ">
 						<u-icon class="class-warm__icon" size="30" color="#FF3B30" name="error-circle-fill"></u-icon>
 						<view class="class-warm__text">
-							<view class="date">班级有效期：2021/11/30 - 2021/11/30</view>
+							<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime)}} - {{$method.timestampToTime(item.classEndTime)}}</view>
 							<view class="state">班级状态：已过期，有疑问请联系 <text @click="call">020-87085982</text></view>
 						</view>
 					</view>
@@ -36,30 +36,37 @@
 			
 			
 			<view class="bottomBox">
-				<view class="content_box">
-					<image src="/static/icon/wk_icon3.png" class="wk_icon"></image>
-					学习进度：{{ item.stuAllNum }}/{{ item.secAllNum }}
-				</view>
-				<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}" type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item)">进入学习</u-button></view>
-				</view>
-				<view class="box_progress" v-if="item.applyStatus === 1">
-					<view style="width: 60%;">
-						<text style="color: #333333;white-space: nowrap;text-overflow: ellipsis;">{{ item.applyName }}</text>
+				<template v-if="item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > sysTime) &&  (item.classEndTime < sysTime) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0">
+					<view class="restart" @click="selectClass(item)">
+						选班重学
 					</view>
-					<view><u-button :plain="true" type="primary" size="mini" @click.stop="appointment(item)">预约考试</u-button></view>
-				</view>
-				<view class="box_progress" v-if="item.beforeStatus === 1">
-					<view style="width: 60%;">
-						<text style="color: #2979ff;white-space: nowrap;text-overflow: ellipsis;">{{ item.beforeName }}</text>
+				</template>
+				
+				<template v-else>
+					<view class="content_box">
+						<image src="/static/icon/wk_icon3.png" class="wk_icon"></image>
+						学习进度：{{ item.stuAllNum }}/{{ item.secAllNum }}
 					</view>
-					<view><u-button type="primary" size="mini" @click="appBeforeAddress(item.goodsId)">进入刷题</u-button></view>
-				</view>
-				<view class="restart" @click="selectClass(item)">
-					选班重学
-				</view>
+					<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}" type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item)">进入学习</u-button></view>
+					</view>
+					<view class="box_progress" v-if="item.applyStatus === 1">
+						<view style="width: 60%;">
+							<text style="color: #333333;white-space: nowrap;text-overflow: ellipsis;">{{ item.applyName }}</text>
+						</view>
+						<view><u-button :plain="true" type="primary" size="mini" @click.stop="appointment(item)">预约考试</u-button></view>
+					</view>
+					<view class="box_progress" v-if="item.beforeStatus === 1">
+						<view style="width: 60%;">
+							<text style="color: #2979ff;white-space: nowrap;text-overflow: ellipsis;">{{ item.beforeName }}</text>
+						</view>
+						<view><u-button type="primary" size="mini" @click="appBeforeAddress(item.goodsId)">进入刷题</u-button></view>
+					</view>
+				</template>
+				
+				
 			</view>
 		</view>
 			
@@ -84,6 +91,7 @@
 											<u-radio
 												shape="circle"
 												:name="index"
+												:disabled="item.studentNum > 0 && item.studentNum == item.studentUpper"
 											>
 												<view :class="item.checked?'white-box blue-box':'white-box'" >
 													<view>
@@ -165,6 +173,16 @@ export default {
 							gradeId:0
 						}
 						self.gradeList.push(item)
+					} else {
+						let isGradeFull = self.gradeList.every(item => (item.studentNum > 0 && item.studentNum == item.studentUpper))
+						//所有班级都满了
+						if(isGradeFull) {
+							let item = {
+								className:'系统分班',
+								gradeId:0
+							}
+							self.gradeList.unshift(item)
+						}
 					}
 				}
 			});