增加状态

components/course/courseChapter.vue

@@ -20,7 +20,13 @@
 						</view>
 						<view v-if="isRebuild||itemM.rebuild>0" class="tagRe">待重修</view>
 						<view v-else>
-							<view v-if="itemM.learning==1" class="tagGreen">已做完</view>
+							<view v-if="itemM.learning==1" :class="{tagGreen:itemM.reportStatus == 1,tagRe:itemM.reportStatus == 0 || itemM.rebuild>0}">
+								<!-- 已做完 -->
+								<text v-if="itemM.rebuild > 0">待重测</text>
+								<text v-else-if="itemM.reportStatus == 1">合格</text>
+								<text v-else-if="itemM.reportStatus == 0">不合格</text>
+							
+							</view>
 						</view>
 						
 					</view>

components/course/courseSection.vue

@@ -9,18 +9,18 @@
 					<view v-if="menuItem.sectionType==1" :class="playSectionId==newId?'color1':''">{{menuItem.name}}</view>
 					<view v-if="menuItem.sectionType==2" :class="playSectionId==newId?'color2':''">{{menuItem.name}}</view>
 					<view v-if="menuItem.sectionType==3" :class="playSectionId==newId?'color3':''">{{menuItem.name}}</view>
-					<!-- <view style="font-size: 20rpx;color: #FF3B30;" v-if="menuItem.liveStartTime">
+					<view style="font-size: 20rpx;color: #FF3B30;" v-if="menuItem.sectionType==2 && menuItem.liveStartTime">
 						<view v-if="menuItem.liveStartTime>nowTime">
 							<text>{{$method.timestampToTime(menuItem.liveStartTime, isDay =false)}}</text>-
 							<text>{{$method.timestampToTime(menuItem.liveEndTime, isDay =false).substr(11,9)}}</text>
 						</view>
-						<view v-if="menuItem.liveStartTime<=nowTime&&menuItem.liveEndTime>nowTime">
+						<!-- <view v-if="menuItem.liveStartTime<=nowTime&&menuItem.liveEndTime>nowTime">
 							<text>直播中</text>
 						</view>
 						<view v-if="menuItem.liveEndTime<nowTime">
 							<text>回放</text>
-						</view>
-					</view> -->
+						</view> -->
+					</view>
 				</view>
 				<view v-if="menuItem.sectionType==null">{{menuItem.name}}</view>
 			</view>