11

pages/study/index.vue

@@ -67,7 +67,8 @@
 	const zhangId = ref(null); //游客使用
 	const nianji = ref(null); //游客使用
 	const cardId = ref(null); //游客使用
-	const catalogueRef = ref(null);
+	const catalogueRef = ref(null);
+	const youkeZhangInfoData = ref(null);
 	const currentProduct = ref(null);
 	const selectZhang = ref(null);
 	const zhangList = ref(null);
@@ -171,8 +172,11 @@
 			cardId: data.cardId,
 			zhangId: data.zhangId,
 		}
-		getCommonZhangInfo(req).then(res => {
-			zhangList.value = res.data
+		getCommonZhangInfo(req).then(res => {
+			translateData(res.data)
+			youkeZhangInfoData.value =  res.data
+			zhangList.value = res.data.zhangList
+			current.value = 0
 			// infoData.haveFlag = res.data.haveFlag
 			// infoData.nianji = res.data.nianji
 			// infoData.number = res.data.number
@@ -242,15 +246,18 @@
 	}
 
 	function goLookShipin(data) {
-		if (!cacheManager.get('auth')) {
-			infoData.cardId = cardId.value
-			infoData.nianji = nianji.value
-			infoData.zhangId = zhangId.value
+		if (!cacheManager.get('auth')) {
+			console.log('zhangList.value[0].jieList[0]',zhangList.value[0].jieList);
+			let youkeData = {
+				cardId:cardId.value,
+				nianji:nianji.value,
+				zhangId:zhangId.value,
+				jieList:zhangList.value[0].jieList,
+				jieName:zhangList.value[0].jieList[0].jieName
+			}
 			uni.redirectTo({
-				url: '/pages/study/lookShipin?youkePageData=' + JSON.stringify(infoData)
-
+				url: '/pages/study/lookShipin?youkePageData=' + JSON.stringify(youkeData)
 			})
-			return;
 		} else {
 			uni.redirectTo({
 				url: '/pages/study/lookShipin?jieId=' + data.jieId

pages/study/lookShipin.vue

@@ -96,7 +96,7 @@
 				this.zhangId = youkeData.zhangId
 				this.cardId = youkeData.cardId
 				this.shipinTitle = youkeData.jieName
-				this.progressMarkers = youkeData.jieList[0].jiedianList
+				this.progressMarkers = youkeData.jieList[0].jiedianList||[]
 				this.getLiveYk(); //获取播放凭证
 			} else {
 				this.init(options)