he2802 hace 3 años
padre
commit
06ae2aa03c

+ 26 - 4
components/course/courseChapter.vue

@@ -61,14 +61,36 @@ export default {
 		openChapter(item){
 			this.down = !this.down
 			if(!this.down&&this.list.length==0){
-				if(this.isRebuild){
-					this.getReSectionList(item.id,item.courseId,item.moduleId)
+				console.log(item.id,69)
+				if(this.isBuy){
+					if(this.isRebuild){
+						this.getReSectionList(item.id,item.courseId,item.moduleId)
+					}else{
+						this.getBuySectionList(item.id,item.courseId,item.moduleId)
+					}
 				}else{
 					this.getSectionList(item.id)
 				}
 				
 			}
 		},
+		getSectionList(chapterId) {
+			let self = this
+			this.$api.sectionList(chapterId).then(res => {
+				if(res.data.code==200){
+					for(let i=0;i<res.data.data.length;i++){
+						let item = res.data.data[i]
+						item.id = item.sectionId
+						//判断是否试听
+						item.tryListen = false
+						if(self.goodsAuditionConfigIdList.indexOf(item.id)!==-1){
+							item.tryListen = true
+						}	
+					}
+					self.list = res.data.data
+				}
+			});
+		},
 		getReSectionList(chapterId,courseId,moduleId) {
 			let self = this
 			this.$api.reSectionList({chapterId:chapterId,gradeId:this.gradeId,courseId:courseId,rebuild:1,moduleId:moduleId}).then(res => {
@@ -86,9 +108,9 @@ export default {
 				}
 			});
 		},
-		getSectionList(chapterId) {
+		getBuySectionList(chapterId,courseId,moduleId) {
 			let self = this
-			this.$api.sectionList(chapterId).then(res => {
+			this.$api.reSectionList({chapterId:chapterId,gradeId:this.gradeId,courseId:courseId,moduleId:moduleId}).then(res => {
 				if(res.data.code==200){
 					for(let i=0;i<res.data.data.length;i++){
 						let item = res.data.data[i]

+ 22 - 5
components/course/courseModule.vue

@@ -60,14 +60,31 @@ export default {
 		openModule(item){
 			this.down = !this.down
 			if(!this.down&&this.list.length==0){
-				if(this.isRebuild){
-					this.getReChapterList(item.id,item.courseId)
+				if(this.isBuy){
+					if(this.isRebuild){
+						this.getReChapterList(item.id,item.courseId)
+					}else{
+						this.getBuyChapterList(item.id,item.courseId) //已购买目录
+					}
 				}else{
-					this.getChapterList(item.id)
+					this.getChapterList(item.id) //未购买目录
 				}
 				
 			}
 		},
+			getChapterList(moduleId) {
+					let self = this
+					this.$api.chapterList(moduleId).then(res => {
+						if(res.data.code==200){
+							for(let i=0;i<res.data.data.length;i++){
+								let item = res.data.data[i]
+								item.id = item.chapterId
+								
+							}
+							self.list = res.data.data
+						}
+					});
+				},
 		getReChapterList(moduleId,courseId) {
 			let self = this
 			this.$api.reChapterList({moduleId:moduleId,gradeId:this.gradeId,courseId:courseId,rebuild:1}).then(res => {
@@ -81,9 +98,9 @@ export default {
 				}
 			});
 		},
-		getChapterList(moduleId) {
+		getBuyChapterList(moduleId,courseId) {
 			let self = this
-			this.$api.chapterList(moduleId).then(res => {
+			this.$api.reChapterList({moduleId:moduleId,gradeId:this.gradeId,courseId:courseId}).then(res => {
 				if(res.data.code==200){
 					for(let i=0;i<res.data.data.length;i++){
 						let item = res.data.data[i]

+ 1 - 1
components/course/courseSection.vue

@@ -24,7 +24,7 @@
 				</view>
 				<view v-if="menuItem.sectionType==null">{{menuItem.name}}</view>
 			</view>
-			<view v-if="isRebuild" class="tagRe">待重修</view>
+			<view v-if="isRebuild||menuItem.rebuild>0" class="tagRe">待重修</view>
 		</view>
 		<view v-if="menuItem.tryListen&&!isBuy" class="tryBox">
 			试看

+ 4 - 4
pages2/class/detail.vue

@@ -56,11 +56,11 @@
 			<view v-show="current == 1">
 				<view class="menuBox" v-for="(item, index) in menuList">
 					<!--模块 -->
-					<view v-if="item.type == 1"><courseModule  :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
+					<view v-if="item.type == 1"><courseModule :gradeId="gradeId"  :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->
-					<view v-if="item.type == 2"><courseChapter  :isBuy="true" :menuItem="item" :levelId="'0-'+item.menuId"></courseChapter></view>
+					<view v-if="item.type == 2"><courseChapter :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-'+item.menuId"></courseChapter></view>
 					<!--节 -->
-					<view v-if="item.type == 3"><courseSection  :isBuy="true" :menuItem="item" :levelId="'0-0-'+item.menuId"></courseSection></view>
+					<view v-if="item.type == 3"><courseSection :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-0-'+item.menuId"></courseSection></view>
 				</view>
 			</view>
 			<!--笔记 -->
@@ -619,7 +619,7 @@ export default {
 		},
 		getMenuList() {
 			let self = this;
-			this.$api.menuList({ courseId: this.courseId }).then(res => {
+			this.$api.reMenuList({ courseId: this.courseId,gradeId:this.gradeId }).then(res => {
 				if (res.data.code == 200) {
 					for (let i = 0; i < res.data.rows.length; i++) {
 						let item = res.data.rows[i];