Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/catalogue/catalogue.vue

@@ -66,7 +66,6 @@
 	 */
 	async function showPopup() {
 		const [err, data] = await getCatalogue();
-		console.log('ddd', data);
 		if (err) {
 			toast("章节目录数据获取失败");
 			return;
@@ -101,6 +100,7 @@
 	 */
 	function handleSelectZhang(data,index) {
 		if(index!=0){
+			toast("付费章节");
 			return;
 		}
 		$emit('change-zhang', Object.assign({}, data));

pages/study/index.vue

@@ -168,115 +168,115 @@
 	}
 
 	function goKaoshi() {
-		let zhangId = selectZhang.value.zhangId;
+		let zhangId = selectZhang.value ? selectZhang.value.zhangId : infoData.zhangId;
 		let nianji = routeParams.value.nianji;
 		let xueqi = routeParams.value.xueqi;
 		uni.navigateTo({
 			url: `/pages/unitTest/index?jieId=1&zhangId=${zhangId}&nianji=${nianji}&xueqi=${xueqi}`
 		})
-	}
+	}
 	function goLookShipin(data) {
-		data.videoId = 'b997f16cb9cb474cb93526cff77d8801'
-		data.progressMarkers = [{
-		    offset: 30,
-		    isCustomized: true,
-		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/9A3F562E595E4764AD1DD546FA52C6E5-6-2.png',
-		    title: 'test title',
-		    time: '04:01-07:50',
-		    describe: 'test string',
-		   }, {
-		    offset: 150,
-		    isCustomized: true,
-		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/1E7F402241CD4C0F94AD2BBB5CCC3EC7-6-2.png',
-		    title: 'test title',
-		    time: '04:05-07:50',
-		    describe: 'test string',
-		   }, {
-		    offset: 250,
-		    isCustomized: true,
-		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-		    title: 'test title',
-		    time: '04:07-07:50',
-		    describe: 'test string',
-		   }, {
-		    offset: 550,
-		    isCustomized: true,
-		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-		    title: 'test title',
-		    time: '04:09-07:50',
-		    describe: 'test string',
-		   }, {
-		    offset: 320,
-		    isCustomized: true,
-		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-		    title: 'test title',
-		    time: '04:11-07:50',
-		    describe: 'test string',
-		   }, {
-		    offset: 650,
-		    isCustomized: true,
-		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-		    title: 'test title',
-		    time: '04:15-07:50',
-		    describe: 'test string',
-		   }]
-		data.zhangId = infoData.zhangId
-		data.nianji = infoData.nianji
-		data.xueqi = infoData.xueqi
-		const pageData = {
-			//	videoId:data.videoId,
-			videoId: 'b997f16cb9cb474cb93526cff77d8801',
-			progressMarkers: [{
-				offset: 30,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/9A3F562E595E4764AD1DD546FA52C6E5-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 150,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/1E7F402241CD4C0F94AD2BBB5CCC3EC7-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 250,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 550,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 320,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 650,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}],
-		}
-		uni.navigateTo({
-			//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
-			url: '/pages/study/lookShipin?studyData=' + JSON.stringify(data)
+		data.videoId = 'b997f16cb9cb474cb93526cff77d8801'
+		data.progressMarkers = [{
+		    offset: 30,
+		    isCustomized: true,
+		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/9A3F562E595E4764AD1DD546FA52C6E5-6-2.png',
+		    title: 'test title',
+		    time: '04:01-07:50',
+		    describe: 'test string',
+		   }, {
+		    offset: 150,
+		    isCustomized: true,
+		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/1E7F402241CD4C0F94AD2BBB5CCC3EC7-6-2.png',
+		    title: 'test title',
+		    time: '04:05-07:50',
+		    describe: 'test string',
+		   }, {
+		    offset: 250,
+		    isCustomized: true,
+		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+		    title: 'test title',
+		    time: '04:07-07:50',
+		    describe: 'test string',
+		   }, {
+		    offset: 550,
+		    isCustomized: true,
+		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+		    title: 'test title',
+		    time: '04:09-07:50',
+		    describe: 'test string',
+		   }, {
+		    offset: 320,
+		    isCustomized: true,
+		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+		    title: 'test title',
+		    time: '04:11-07:50',
+		    describe: 'test string',
+		   }, {
+		    offset: 650,
+		    isCustomized: true,
+		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+		    title: 'test title',
+		    time: '04:15-07:50',
+		    describe: 'test string',
+		   }]
+		data.zhangId = infoData.zhangId
+		data.nianji = infoData.nianji
+		data.xueqi = infoData.xueqi
+		const pageData = {
+			//	videoId:data.videoId,
+			videoId: 'b997f16cb9cb474cb93526cff77d8801',
+			progressMarkers: [{
+				offset: 30,
+				isCustomized: true,
+				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/9A3F562E595E4764AD1DD546FA52C6E5-6-2.png',
+				title: 'test title',
+				describe: 'test string',
+			}, {
+				offset: 150,
+				isCustomized: true,
+				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/1E7F402241CD4C0F94AD2BBB5CCC3EC7-6-2.png',
+				title: 'test title',
+				describe: 'test string',
+			}, {
+				offset: 250,
+				isCustomized: true,
+				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+				title: 'test title',
+				describe: 'test string',
+			}, {
+				offset: 550,
+				isCustomized: true,
+				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+				title: 'test title',
+				describe: 'test string',
+			}, {
+				offset: 320,
+				isCustomized: true,
+				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+				title: 'test title',
+				describe: 'test string',
+			}, {
+				offset: 650,
+				isCustomized: true,
+				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
+				title: 'test title',
+				describe: 'test string',
+			}],
+		}
+		uni.navigateTo({
+			//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
+			url: '/pages/study/lookShipin?studyData=' + JSON.stringify(data)
 		})
 	}
-	
+	
 
-	function listClick(data,index) {
-		if(index ==infoData.jieList.length-1){
-			// 最后一项
-			goKaoshi()
-		}else{
-			goLookShipin(data)
+	function listClick(data,index) {
+		if(index ==infoData.jieList.length-1){
+			// 最后一项
+			goKaoshi()
+		}else{
+			goLookShipin(data)
 		}
 	}