合并主分支前

pages/course/courseDetail.vue

@@ -70,8 +70,10 @@
 			<!-- 自考入口 没有加入班级的时候暴漏入口-->
 			<view class="selfStudyBox"
 				v-if="course.canzk == '1' && librayList[curIndex] && (!classInfo.id || classInfo.state == '2' || selfStudyCertificate.length >= 0)">
+				
 				<view style="padding: 20rpx;"
-					v-if="(selfStudyCertificate.length == 0 || selfStudyPaperList.length > 0 && !testingPaper.id) && (!classInfo.id || classInfo.state == '2')">
+					v-if="selfStudyCertificate.length > 0 || selfStudyCertificate.length == 0 &&  (!classInfo.id || classInfo.state == '2')">
+					
 					<view class="">
 						<view class="" style="line-height: 40rpx; font-size: 28rpx;"
 							v-if="selfStudyCertificate.length == 0">
@@ -107,10 +109,12 @@
 						</view>
 					</view>
 					<view class=" " style="margin-top: 20rpx; text-align: center;">
+						
 						<!-- <view class=""> -->
 						<!-- {{canJoinTestTime}} -->
 						<!-- {{selfStudyPaperList.length  % 2}} -->
 						<template v-if="selfStudyCertificate.length <= 0 && (!classInfo.id || classInfo.state == '2')">
+							
 							<template v-if="!testingPaper.id">
 								<button @click="onPageJump('/pages/selfStudy/selfStudy',courseId)"
 									style="padding: 0 20rpx" type="primary"
@@ -168,8 +172,7 @@
 								>></text>
 						</view>
 					</view>
-				</view>
-				<!-- {{classInfo.id}} -->
+				</view>				
 				<view class="classEntrance" v-if="classInfo.id">
 					<view class="flex_box" style="justify-content: space-between;">
 						<view class="flex_box classTitleBox">
@@ -949,6 +952,7 @@
 					.then(async (res) => {
 						if (res.code == 0 && res.result.length > 0) {
 							this.linkClassList = res.result
+						    this.classInfo = {}
 						} else {
 							this.linkClassList = []
 							// 查询是否有所在的班级