Merge branch 'master' into stage-4

components/course/courseSection.vue

@@ -80,7 +80,11 @@ export default {
 		gradeId: {
 			type: Number,
 			default: 0
-		}
+		},
+		nextMenuItem: {
+			type: Object,
+			default: {}
+		},
 	},
 	data() {
 		return {
@@ -150,7 +154,6 @@ export default {
 				this.$store.commit('setPlayChannelId', {playChannelId  :this.menuItem.liveUrl});
 				uni.$emit('getChannel', this.menuItem)
 				uni.$emit('levelId', this.levelId)
-				console.log(this.menuItem,"频道")
 				
 			}
 			

pages3/course/detail.vue

@@ -56,7 +56,7 @@
 							</view>
 						</view>
 						<view v-show="!item.down">
-							<view v-for="(itemM,indexM) in menuList"  :key="indexM">
+							<view v-for="(itemM,indexM) in item.menuList"  :key="indexM">
 								<courseModule v-if="itemM.type==1" :menuItem="itemM"></courseModule>
 								<courseChapter v-if="itemM.type==2" :isBuy="false" :menuItem="itemM"></courseChapter>
 								<courseSection v-if="itemM.type==3" :isBuy="false" :menuItem="itemM"></courseSection>
@@ -210,8 +210,8 @@ export default {
 		},
 		openCourse(item){
 			item.down = !item.down
-			if(!item.down&&this.menuList.length==0){
-				this.getMenuList(item.courseId)
+			if(!item.down&&item.menuList.length==0){
+				this.getMenuList(item)
 			}
 			
 		},
@@ -235,14 +235,15 @@ export default {
 					for(let i=0;i<res.data.rows.length;i++){
 						let item = res.data.rows[i]
 						item.down = true
+						item.menuList = []
 					}
 					self.courseList = res.data.rows
 				}
 			});
 		},
-		getMenuList(courseId) {
+		getMenuList(item) {
 			let self = this
-			this.$api.menuList({courseId:courseId}).then(res => {
+			this.$api.menuList({courseId:item.courseId}).then(res => {
 				if(res.data.code==200){
 					for(let i=0;i<res.data.rows.length;i++){
 						let item = res.data.rows[i]
@@ -258,7 +259,7 @@ export default {
 							}	
 						}
 					}
-					self.menuList = res.data.rows
+					item.menuList = res.data.rows
 				}
 			});
 		},