Merge branch 'master' of https://gitee.com/he2802/saas_applet

components/course/courseChapter.vue

@@ -7,14 +7,22 @@
 		</view>
 		<view v-if="!down">
 			<view v-for="(itemM,indexM) in list" >
-				<courseSection :courseId="courseId"  :goodsId="goodsId" :isBuy="isBuy" :isRebuild="isRebuild" :gradeId="gradeId" :menuItem="itemM" :levelId="levelId+'-'+itemM.sectionId"></courseSection>
-				<u-line v-if="indexM<list.length-1"></u-line>
-			</view>
-			<u-line v-if="examList.length>0"></u-line>
-			<view class="exam" v-for="(exam,index) in examList" :key="index" @click="toDo(exam.examId,goodsId,exam.moduleId,exam.chapterId)">
-				<view class="eTag">{{exam.doType==1?'练习':'考试'}}</view>
-				<view style="margin-left: 15rpx;">{{exam.examName}}</view>
+				<view v-if="itemM.type!=2">
+					<courseSection :courseId="courseId"  :goodsId="goodsId" :isBuy="isBuy" :isRebuild="isRebuild" :gradeId="gradeId" :menuItem="itemM" :levelId="levelId+'-'+itemM.sectionId"></courseSection>
+					<u-line v-if="indexM<list.length-1"></u-line>
+				</view>
+				<view v-if="itemM.type==2">
+					<u-line ></u-line>
+					<view class="examBox"  @click="toDo(itemM.typeId,goodsId,itemM.moduleId,itemM.chapterId)">
+						<view class="exam">
+							<view class="eTag">{{itemM.doType==1?'练习':'考试'}}</view>
+							<view style="margin-left: 15rpx;">{{itemM.name}}</view>
+						</view>
+						<view v-if="itemM.learning==1" class="tagGreen">已看完</view>
+					</view>
+				</view>
 			</view>
+			
 		</view>
 	</view>
 </template>
@@ -92,7 +100,7 @@ export default {
 						this.getReSectionList(item.id,item.courseId,moduleId)
 					}else{
 						this.getBuySectionList(item.id,item.courseId,moduleId)
-						this.getMenuExamList(item.id,item.courseId,moduleId)
+		//				this.getMenuExamList(item.id,item.courseId,moduleId)
 					}
 				}else{
 					this.getSectionList(item.id)
@@ -164,6 +172,15 @@ export default {
 </script>
 
 <style scoped>
+	.tagGreen{
+		width: 80rpx;
+		height: 28rpx;
+		background: #34C759;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		text-align: center;
+	}
 	.eTag{
 		width: 56rpx;
 		height: 28rpx;
@@ -174,6 +191,11 @@ export default {
 		text-align: center;
 		line-height: 28rpx;
 	}
+	.examBox{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.exam{
 		display: flex;
 		align-items: center;