chenxiong 3 anos atrás
pai
commit
3430922ad5

+ 9 - 7
components/course/courseChapter.vue

@@ -44,8 +44,8 @@ export default {
 	name: 'courseChapter',
 	props: {
 		learningOrder:{ //是否设置学习顺序 1 设置 0不设置
-			type:String,
-			default:'0'
+			type:Number,
+			default:0
 		},
 		menuItem: {
 			type: Object,
@@ -84,7 +84,7 @@ export default {
 			down:true,
 			list:[],
 			examList:{},
-			canLearn:false, //是否全部视频看完可以练习、测试
+			canLearn:false, //是否全部视频看完可以练习、测试
 			clickItem:'',
 		};
 	},
@@ -97,11 +97,14 @@ export default {
 	onPageShow() {
 		
 		if(this.clickItem) {
-			let moduleId = this.menuItem.moduleId?this.menuItem.moduleId:0
-			this.getBuySectionList(this.menuItem.id,this.menuItem.courseId,moduleId)
+			this.refreshList();
 		}
 	},
 	methods: {
+		refreshList() {
+			let moduleId = this.menuItem.moduleId?this.menuItem.moduleId:0
+			this.getBuySectionList(this.menuItem.id,this.menuItem.courseId,moduleId)
+		},
 		findNextSection(index){
 			for(let i=index+1;i<this.list.length;i++){
 				return this.list[i];
@@ -114,7 +117,7 @@ export default {
 		async toDo(id,goodsId =0,moduleId = 0, chapterId = 0,item,index) {
 			this.clickItem = item;
 			
-			console.log(this.clickItem,'clickItem')
+			console.log(this.learningOrder)
 			if(this.learningOrder == 1) {
 				if(this.canLearn) {
 					
@@ -283,7 +286,6 @@ export default {
 						}	
 					}
 					let newArr = res.data.data.filter(item => {
-						console.log(item)
 						return item.type != 2;
 					})
 					this.canLearn = newArr.every(item => {

+ 2 - 2
components/course/courseModule.vue

@@ -20,8 +20,8 @@ export default {
 	name: 'courseModule',
 	props: {
 		learningOrder:{ //是否设置学习顺序 1 设置 0不设置
-			type:String,
-			defaule:'0'
+			type:Number,
+			defaule:0
 		},
 		menuItem: {
 			type: Object,

+ 1 - 1
pages2/class/questionBank.vue

@@ -155,7 +155,7 @@
 								</view>
 							</view>
 						</view>
-						<view v-if="bank.ques">
+						<view v-if="bank.ques && (bank.ques.text || bank.ques.imageList.length)">
 							<view class="pad_8 answerInfos">
 								<view class="answerTitle">答案解析:</view>
 								<view class="answerContent"><rich-text :nodes="bank.analysisContent"></rich-text></view>

+ 11 - 4
pages3/polyv/detail.vue

@@ -55,9 +55,9 @@
 			<view v-show="current == 0">
 				<view class="menuBox" v-for="(item, index) in menuList" :key="index">
 					<!--模块 -->
-					<view v-if="item.type == 1"><courseModule @toDo="toDo($event)" :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
+					<view v-if="item.type == 1"><courseModule :courseId="courseId" :learningOrder="businessData.goodsLearningOrder" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->
-					<view v-if="item.type == 2"><courseChapter @toDo="toDo($event)" :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter></view>
+					<view v-if="item.type == 2"><courseChapter :courseId="courseId" :learningOrder="businessData.goodsLearningOrder" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter></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>
@@ -278,6 +278,7 @@ export default {
 			photoConfig:false, //是否配置好拍照次数
 			photoIndex:0, //当前位于拍照的区间下标 从0开始
 			photoHistoryList:[], //已拍照历史的下标点
+			businessData:{},
 		};
 	},
 	computed: { ...mapGetters(['userInfo', 'playSectionId','playChannelId','playVID']) },
@@ -443,8 +444,13 @@ export default {
 		});
 	},
 	methods: {
-		toDo(index) {
-			console.log(index)
+		/**
+		 * 获取业务层次详情
+		 */
+		courseBusiness(){
+			this.$api.courseBusiness(this.goodsData.businessId).then(res => {
+				this.businessData = res.data.data;
+			})
 		},
 		/**
 		 * 计算tabs宽度
@@ -1155,6 +1161,7 @@ export default {
 				self.goodsData = res.data.data;
 				self.gradeId = self.goodsData.gradeId;
 				console.log(self.gradeId, "班级ID");
+				this.courseBusiness()
 				this.courseHandouts();
 				self.getMenuList();
 				self.getReMenuList(); //获取重修目录