选班重学

pages/learn/index.scss

@@ -206,25 +206,26 @@
 				height: 32rpx;
 				margin-right: 10rpx;
 			}
-			.exam_word {
-				font-size: 24rpx;
-				font-weight: 500;
-				width: 144rpx;
-				height: 56rpx;
-				line-height: 56rpx;
-				text-align: center;
-				background: #FFFFFF;
-				border-radius: 66rpx;
-				margin-left: 32rpx;
-			}
-			.ones {
-				color: #484848;
-				border: 2rpx solid #B9B9B9;
-			}
-			.intos {
-				color: #498AFE;
-				border: 2rpx solid #498AFE;
-			}
+			
+		}
+		.exam_word {
+			font-size: 24rpx;
+			font-weight: 500;
+			width: 144rpx;
+			height: 56rpx;
+			line-height: 56rpx;
+			text-align: center;
+			background: #FFFFFF;
+			border-radius: 66rpx;
+			margin-left: 32rpx;
+		}
+		.ones {
+			color: #484848;
+			border: 2rpx solid #B9B9B9;
+		}
+		.intos {
+			color: #498AFE;
+			border: 2rpx solid #498AFE;
 		}
 	}
 	.lefts {

pages/learn/index.vue

@@ -224,14 +224,12 @@
 							</view>
 							<view class="rights">
 								<template
-									v-if="item.gradeStatus == 1 && item.status == 1 && (item.serviceEndTime > sysTime) && (item.serviceStartTime < sysTime) &&  (item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0">
-									<view class="enter_into" @click.stop="selectClass(item,index)">
-										选班重学
-									</view>
+									v-if="item.gradeStatus == 1 && item.status == 1 && (item.serviceEndTime > sysTime) && (item.serviceStartTime < sysTime) 
+									&& (item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) 
+									&& item.studyCount > 0">
 								</template>
 								<view v-else class="learn_progress">
 									<view class="progress_up">
-										<!-- <image src="/static/icon/wk_icon3.png" class="wk_icon"></image> -->
 										<!-- 学习进度 (已做试卷+已做节)/(试卷数+节数) -->
 										<view>
 											学习进度：{{ item.stuAllNum+item.recordNum }}/{{ item.secAllNum+item.examNum }}
@@ -241,11 +239,6 @@
 												:percent="((item.stuAllNum+item.recordNum) / (item.secAllNum+item.examNum)) * 100"></u-line-progress>
 										</view>
 									</view>
-									<!-- <view class="progress_down">
-										
-										<view class="enter_into" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">进入学习</view>
-									</view> -->
-
 								</view>
 							</view>
 						</view>
@@ -253,10 +246,15 @@
 						<!-- 按钮 -->
 						<view class="study_btns">
 							<template
-								v-if="item.gradeStatus == 1 && item.status == 1 && (item.serviceEndTime > sysTime) && (item.serviceStartTime < sysTime) &&  (item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0">
+								v-if="item.gradeStatus == 1 && item.status == 1 && (item.serviceEndTime > sysTime) && (item.serviceStartTime < sysTime) && 
+								(item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && 
+								item.studyCount > 0">
+								<view class="exam_word ones" @click.stop="selectClass(item,index)">
+									选班重学
+								</view>
 							</template>
+							<!-- examApplyGoodsList.length -是判断是否关联指定学员 -->
 							<view v-else class="exam_btns">
-								<!-- examApplyGoodsList.length -是判断是否关联指定学员 -->
 								<view class="box_appoint" v-if="item.applyStatus === 1 && !( 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) || 
@@ -270,15 +268,12 @@
 									 @click="appBeforeAddress(item.goodsId,item)">
 									<view class="exam_word ones">进入刷题</view>
 								</view>
-								
 							</view>
 							<view class="box_appoint" @click="studyIn(item.goodsId,item.gradeId,item,index)">
 								<view class="exam_word  intos">进入学习</view>
 							</view> 
 						</view>
 
-						
-						
 					</view>
 				</view>
 
@@ -332,8 +327,6 @@
 									
 									<view class="learn_progress">
 										<view class="progress_up">
-											<!-- <image src="/static/icon/wk_icon3.png" class="wk_icon"></image>
-											学习进度：{{item.doNum}}/{{item.totalNum}} -->
 											<view>
 												学习进度：{{item.doNum}}/{{item.totalNum}}
 											</view>
@@ -833,7 +826,7 @@ export default {
 			return new Promise(resolve => {
 				this.$http({
 					url: '/user/confirm/info/detail',
-					method: 'GET',
+					method: 'get',
 					data: { orderGoodsId:this.activeItem.orderGoodsId },
 					noLoading:true,
 				})

pages2/class/questionBank.vue

@@ -986,9 +986,9 @@ export default {
       if (this.ossAvatarUrl) {
         data.similarity = this.compareFaceData // 相似度
       }
-      console.log(data, "拍照提交");
+      // console.log(data, "拍照提交");
       this.$api.studyExamPhotoRecord(data).then((res) => {
-        console.log(res, "拍照提交结果");
+        // console.log(res, "拍照提交结果");
         if (res.data.code != 200) {
           uni.showToast({
             icon: "none",
@@ -1153,7 +1153,6 @@ export default {
     async submitPhoto() {
       let compareFaceData = await this.faceRecognition();
       this.compareFaceData = compareFaceData
-      console.log(compareFaceData, "compareFaceData");
       if (compareFaceData == 0) {
         uni.showToast({
           title: "人脸匹配不通过，请重新拍照上传",

pages3/live/detail.vue

@@ -2051,7 +2051,6 @@ export default {
 
       let compareFaceData = await this.faceRecognition();
       this.compareFaceData = compareFaceData
-			console.log(compareFaceData,'compareFaceData')
       if (compareFaceData >= 80) {
         const waitYS = await this.imageInfos();
         this.postCoursePhotoRecord()