he2802 il y a 3 ans
Parent
commit
24805fee34

+ 6 - 2
components/course/courseChapter.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view v-if="!down">
 			<view v-for="(itemM,indexM) in list" >
-				<courseSection :goodsId="goodsId" :isBuy="isBuy" :isRebuild="isRebuild" :gradeId="gradeId" :menuItem="itemM" :levelId="levelId+'-'+itemM.sectionId"></courseSection>
+				<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>
@@ -41,6 +41,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		courseId: {
+			type: Number,
+			default: 0
+		},
 		isRebuild: {
 			type: Boolean,
 			default: false
@@ -75,7 +79,7 @@ export default {
 		async toDo(id,goodsId =0,moduleId = 0, chapterId = 0) {
 			
 			uni.navigateTo({
-				url:'/pages2/class/questionBank?gradeId='+this.gradeId+'&isFromVideo=1&id='+id+'&goodsid='+goodsId+'&moduleId='+moduleId+'&chapterId='+chapterId+''
+				url:'/pages2/class/questionBank?courseId='+this.courseId+'&gradeId='+this.gradeId+'&isFromVideo=1&id='+id+'&goodsid='+goodsId+'&moduleId='+moduleId+'&chapterId='+chapterId+''
 			})
 		},
 		openChapter(item){

+ 5 - 1
components/course/courseModule.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view v-if="!down">
 			<view v-for="(itemM,indexM) in list" >
-				<courseChapter :goodsId="goodsId" :isBuy="isBuy" :gradeId="gradeId" :isRebuild="isRebuild"  :menuItem="itemM" :levelId="levelId+'-'+itemM.chapterId"></courseChapter>
+				<courseChapter :courseId="courseId" :goodsId="goodsId" :isBuy="isBuy" :gradeId="gradeId" :isRebuild="isRebuild"  :menuItem="itemM" :levelId="levelId+'-'+itemM.chapterId"></courseChapter>
 				<u-line v-if="indexM<list.length-1"></u-line>
 			</view>
 		</view>
@@ -27,6 +27,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		courseId: {
+			type: Number,
+			default: 0
+		},
 		isBuy: { //是否是已购买商品
 			type: Boolean,
 			default: false

+ 4 - 0
components/course/courseSection.vue

@@ -38,6 +38,10 @@ import eventHub from '@/common/eventHub.js'
 export default {
 	name: 'courseSection',
 	props: {
+		courseId: {
+			type: Number,
+			default: 0
+		},
 		goodsId: {
 			type: Number,
 			default: 0

+ 6 - 6
pages2/class/detail.vue

@@ -45,11 +45,11 @@
 			<view v-show="current == 0">
 				<view class="menuBox" v-for="(item, index) in menuList">
 					<!--模块 -->
-					<view v-if="item.type == 1"><courseModule :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
+					<view v-if="item.type == 1"><courseModule :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->
-					<view v-if="item.type == 2"><courseChapter :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter></view>
+					<view v-if="item.type == 2"><courseChapter :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter></view>
 					<!--节 -->
-					<view v-if="item.type == 3"><courseSection :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection></view>
+					<view v-if="item.type == 3"><courseSection :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection></view>
 				</view>
 			</view>
 			<!--笔记 -->
@@ -116,14 +116,14 @@
 			<view v-show="current == 3" >
 				<view class="menuBox" v-for="(item, index) in reMenuList">
 					<!--模块 -->
-					<view v-if="item.type == 1"><courseModule :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
+					<view v-if="item.type == 1"><courseModule :courseId="courseId" :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->
 					<view v-if="item.type == 2">
-						<courseChapter :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter>
+						<courseChapter :courseId="courseId" :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter>			
 					</view>
 					<!--节 -->
 					<view v-if="item.type == 3">
-						<courseSection :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection>
+						<courseSection :courseId="courseId" :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection>
 					</view>
 				</view>
 			</view>

+ 5 - 0
pages2/class/questionBank.vue

@@ -464,6 +464,7 @@ export default {
 			moduleId: 0,
 			isFromVideo:'',
 			gradeId:'',
+			courseId:0,
 			cgType: 0 //对应设计稿弹窗编码
 		};
 	},
@@ -471,6 +472,7 @@ export default {
 		this.id = option.id;
 		this.goodsId = option.goodsid;
 		this.chapterId = option.chapterId;
+		this.courseId = option.courseId;
 		this.moduleId = option.moduleId;
 		this.isFromVideo = option.isFromVideo||'';
 		this.gradeId = option.gradeId || '';
@@ -699,6 +701,7 @@ export default {
 					examId: this.id,
 					goodsId: this.goodsId,
 					recordId:this.recordId,
+					courseId:this.courseId,
 					reportStatus:reportStatus,
 					rightQuestionNum: number,
 					status: 1,
@@ -783,6 +786,7 @@ export default {
 						moduleId:this.moduleId,
 						gradeId:this.gradeId,
 						examId: this.id,
+						courseId:this.courseId,
 						goodsId: this.goodsId,
 						recordId:this.recordId,
 						performance:score,
@@ -1160,6 +1164,7 @@ export default {
 					goodsId: this.goodsId,
 					reportStatus:reportStatus,
 					recordId: this.recordId,
+					courseId:this.courseId,
 					// rightQuestionNum: number,
 					status: 1,
 					// doQuestionIds:doQuestionIds.join(','),

+ 5 - 4
pages2/class/question_report.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<view :class="reportStatus == 0 ? 'redBtn' : reportStatus == 1 ? 'greenBtn' : 'disNone'">
+		<!-- <view :class="reportStatus == 0 ? 'redBtn' : reportStatus == 1 ? 'greenBtn' : 'disNone'" v-if="reportStatus !== null">
 			{{ reportStatus == 0 ? '测试未通过' : reportStatus == 1 ? '测试通过' : '' }}
-		</view>
+		</view> -->
 		<view class="top">
 
 			<view class="box">
@@ -63,7 +63,8 @@ export default {
 			score:'',
 			totalScore:'',
 			doTime:'',
-			examTime:''
+			examTime:'',
+			reportStatus:null,
 		};
 	},
 	onUnload() {},
@@ -141,7 +142,7 @@ export default {
 		this.doTime = option.doTime;
 		this.reportStatus = option.reportStatus;
 		this.rightQuestionNum = +option.rightQuestionNum;
-		this.doWrongQuestionNum = +option.rightQuestionNum;
+		this.doWrongQuestionNum = +option.doWrongQuestionNum;
 		this.score = +option.score;
 		this.totalScore = +option.totalScore;
 		// this.hideBtns = Boolean(option.hideBtns);

+ 3 - 3
pages2/subject/wrongBank.vue

@@ -628,9 +628,9 @@ export default {
 				let question = this.questionList.find(item => item.questionId == this.questionList[bindex].questionId);
 				if(question) {
 					this.$api.wrongRecordDelete({
-						"examId": this.questionId[bindex].examId,
-						"goodsId": this.questionId[bindex].examId,
-						"questionId": this.questionList[bindex].questionId,
+						"examId": question.examId,
+						"goodsId": question.goodsId,
+						"questionId": question.questionId,
 					}).then(res => {
 						
 					})