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

pages/study/index.vue

@@ -86,7 +86,7 @@
 		if (options.flag == 'selectGrades') {
 			getZhangFirst()
 		} else {
-
+			getZhangInfo()
 		}
 		// 调用定位章节 （后台记录）
 
@@ -125,6 +125,25 @@
 			gradeTerm.value = translateData(res.data);
 			recordZhangJie()
 		})
+	}
+	function getZhangInfo() {
+		let req = {
+			nianji: routeParams.value.nianji,
+			xueqi: routeParams.value.xueqi,
+			zhangId: routeParams.value.zhangId,
+		}
+		userZhangInfo(req).then(res => {
+			infoData.jieList = res.data.jieList
+			infoData.haveFlag = res.data.haveFlag
+			infoData.nianji = res.data.nianji
+			infoData.number = res.data.number
+			infoData.numberStr = res.data.numberStr
+			infoData.xueqi = res.data.xueqi
+			infoData.zhangId = res.data.zhangId
+			infoData.zhangName = res.data.zhangName
+			gradeTerm.value = translateData(res.data);
+			recordZhangJie()
+		})
 	}
 
 	function translateData(data) {
@@ -146,9 +165,12 @@
 	}
 
 	function listClick(data) {
-		console.log(data);
-		return
 
+		data.videoId = 'b997f16cb9cb474cb93526cff77d8801'
+		data.progressMarkers = []
+		data.zhangId = infoData.zhangId
+		data.nianji = infoData.nianji
+		data.xueqi = infoData.xueqi
 		const pageData = {
 			//	videoId:data.videoId,
 			videoId: 'b997f16cb9cb474cb93526cff77d8801',
@@ -191,7 +213,8 @@
 			}],
 		}
 		uni.navigateTo({
-			url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
+			//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
+			url: '/pages/study/lookShipin?studyData=' + JSON.stringify(data)
 		})
 	}
 

pages/study/lookShipin.vue

@@ -28,7 +28,7 @@
 	export default {
 		data() {
 			return {
-				options: {}, //上个页面获取的视频参数（视频id）
+				pageData: null, //上个页面获取的视频参数（视频id）
 				playAuth: "", //播放凭证
 				progressMarkers: [],
 				videoId: "", //阿里云视频id
@@ -38,6 +38,9 @@
 		},
 		onLoad(options) {
 			let data = JSON.parse(options.studyData)
+			console.log(data);
+			this.pageData = { ...data }
+			console.log(this.pageData);
 			this.videoId = data.videoId
 			this.progressMarkers = data.progressMarkers
 			this.getLive(); //获取播放凭证
@@ -58,7 +61,8 @@
 			goUpPage(){
 				uni.navigateTo({
 				//	url: `/pages/study/index?xueqi=${data.activeXueqi}&nianji=${data.activeNianji}&flag=selectGrades`
-					url: `/pages/study/index`
+					url: `/pages/study/index?xueqi=${this.pageData.xueqi}&nianji=${this.pageData.nianji}&zhangId=${this.pageData.zhangId}`
+				
 				})
 			}