解决冲突

pages/course/myCourseLearn.vue

@@ -39,7 +39,8 @@
 			<view class="endBox" v-if="librayList[curIndex].isBuy == 1 && userMsg.vip == '0'">
 				<view class="" >
 					<view class="flexbox" v-if="librayList[curIndex].startTime == null">
-						<text >当前目录还未开始学习</text><uni-tag type="warning" text="去学习"></uni-tag>
+						<text >当前目录还未开始学习</text>
+						<!-- <uni-tag type="warning" text="去学习"></uni-tag> -->
 					</view>
 					<view class="flexbox" v-else>
 						<text >课程观看有效期截止到：{{librayList[curIndex].endTime}} </text>
@@ -47,7 +48,7 @@
 					</view>					
 				</view>
 			</view>			
-				<view class="item" v-for="(item, index) in courseList" :key="index" @click="chooseChapter(item, index)">
+				<view class="item" v-for="(item, index) in courseList" :key="index" @click="gotoDetail(item, index)">
 					<text>{{item.title}}</text>
 					<uni-tag  v-if="librayList[curIndex].isBuy == 1 && item.isLearned == 0" style="margin-left: 10rpx;" :inverted="true" text="未学"
 						size="mini" type="primary" />
@@ -194,6 +195,9 @@
 			this.getData(e.id)			
 			// this.getSayList()
 		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 			if (this.scrollTop > 100) {
@@ -236,7 +240,21 @@
 					});
 				// }
 			},
-			// 评论
+			gotoDetail(v, video, index) {
+			  console.log("v at line 668:", v);
+			  // if (
+			  //   this.cateList[this.currentCateIndex].isBuy == 1 ||
+			  //   v.isAudition == 1 ||
+			  //   this.vip.type != "0"
+			  // ) {
+			  uni.navigateTo({
+			    // url: '../bookShop/commodityDetail?id=' + item.id
+			    url: `/pages/course/chapterDetail?navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&videoId=${video.id}`,
+			  });
+			  // } else {
+			  //   this.$commonJS.showToast("请先购买课程");
+			  // }
+			},
 			// 加载更多子评论
 			showMoreChildren(i,val){
 				console.log('更多评论');