11

pages/study/index.vue

@@ -251,23 +251,19 @@
 	}
 
 	function onChangeTab(e) {
-		console.log('e', e);
 		console.log(e.detail.current);
 		if (cacheManager.get('auth')) {
 			// 新的英语人教版
 			if (currentProduct.value == 2 && typeId.value == 1) {
-				infoData.zhangId = cacheManager.get('zhangInfo').zhangList[0].zhangId
-				cacheManager.updateObject('auth', {
-					currentZhang: e.detail.current,
-					zhangId: infoData.zhangId
+				cacheManager.updateObject('zhangInfo', {
+					curZid: cacheManager.get('zhangInfo').zhangList[0].zList[e.detail.current].zid
 				})
 			} else {
-				// 旧的数学 英语 新的数学
-				infoData.zhangId = cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
-				cacheManager.updateObject('auth', {
-					currentZhang: e.detail.current,
-					zhangId: infoData.zhangId
-				})
+				// // 旧的数学 英语 新的数学
+				cacheManager.updateObject('zhangInfo', {
+					curZhangId: cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
+				})
+				
 			}
 		}
 	}
@@ -312,23 +308,21 @@
 			translateData(cacheManager.get('zhangInfo'))
 			zhangList.value = cacheManager.get('zhangInfo').zhangList[0].zList
 			zhangName.value = cacheManager.get('zhangInfo').zhangList[0].zhangName
-			current.value = cacheManager.get('auth').curZid
+			const curZid = cacheManager.get('zhangInfo').curZid;
+			const index = zhangList.value.findIndex(item => item.zid == curZid)
+			current.value = index
 			zid.value = cacheManager.get('zhangInfo').zhangList[0].zList[cacheManager.get('auth').curZid].zhangZid
 			infoData.zhangId = cacheManager.get('zhangInfo').zhangList[0].zhangId
 			recordZhangJie()
 		} else {
 			// 之前 旧的岛 数学英语 和新的数学
-
-			const curZhangId = res.data.curZhangId;
-			const resZhangList = res.data.zhangList;
+			const curZhangId = cacheManager.get('zhangInfo').curZhangId;
+			const resZhangList = cacheManager.get('zhangInfo').zhangList;
 			const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
 			console.log('index', index);
-			cacheManager.updateObject('auth', {
-				currentZhang: index
-			})
 			translateData(cacheManager.get('zhangInfo'))
 			zhangList.value = cacheManager.get('zhangInfo').zhangList
-			current.value = cacheManager.get('auth').currentZhang
+			current.value = index
 			infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
 			recordZhangJie()
 		}
@@ -366,16 +360,13 @@
 			const curZid = res.data.curZid;
 			const resZList = res.data.zhangList[0].zList;
 			const index = resZList.findIndex(item => item.zid == curZid)
-			console.log('index', index);
-			cacheManager.updateObject('auth', {
-				currentZhang: index
-			})
+
 			nextTick(() => {
 				translateData(res.data)
 				zhangList.value = res.data.zhangList[0].zList
 				zhangName.value = res.data.zhangList[0].zhangName
-				current.value = cacheManager.get('auth').currentZhang
-				zid.value = res.data.zhangList[0].zList[cacheManager.get('auth').currentZhang].zhangZid
+				current.value = index
+				zid.value = res.data.zhangList[0].zList[index].zhangZid
 				infoData.zhangId = res.data.zhangList[0].zhangId
 				recordZhangJie()
 			})
@@ -412,13 +403,10 @@
 			const resZhangList = res.data.zhangList;
 			const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
 			console.log('index', index);
-			cacheManager.updateObject('auth', {
-				currentZhang: index
-			})
 			nextTick(() => {
 				translateData(res.data)
 				zhangList.value = res.data.zhangList
-				current.value = cacheManager.get('auth').currentZhang
+				current.value = index
 				infoData.zhangId = res.data.zhangList[current.value].zhangId
 				recordZhangJie()
 			})
@@ -474,10 +462,10 @@
 
 	function recordZhangJie() {
 		let req = {
-				levelId: localAuth.value.levelId,
-				userId: localAuth.value.userId,
-				subjectId: currentProduct.value,
-			}
+			levelId: localAuth.value.levelId,
+			userId: localAuth.value.userId,
+			subjectId: currentProduct.value,
+		}
 		userLocate(req).then(res => {
 
 		})
@@ -714,11 +702,6 @@
 	}
 
 	function clickGradeTerm() {
-		// if(cacheManager.get('auth')){
-		// 	cacheManager.updateObject('auth', {
-		// 		currentZhang: 0
-		// 	})
-		// }
 		uni.navigateTo({
 			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}&from=daoPage&productId=${levelId.value}&xuekeId=${subjectId.value}`
 		})

pages/study/lookShipin.vue

@@ -177,7 +177,14 @@
 					toast('数据错误,缓存丢失/ jieId丢失')
 					return false
 				}
-				this.cacheCurrentZhangIndex = cacheManager.get('auth').currentZhang
+			
+				const curZhangId = cacheManager.get('zhangInfo').curZhangId;
+				const resZhangList = cacheManager.get('zhangInfo').zhangList;
+				const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
+				console.log('index', index);
+				this.cacheCurrentZhangIndex = index
+				
+				
 				this.cacheZhangInfo = cacheManager.get('zhangInfo')
 
 				// let zhang = this.cacheZhangInfo.zhangList.find(zhang => zhang.zhangId == this.zhangId);
@@ -200,10 +207,11 @@
 			},
 			goNextZhang() {
 				let that = this
-				cacheManager.updateObject('auth', {
-					currentZhang: this.cacheCurrentZhangIndex + 1
-				})
+			
 				this.cacheZhangInfo = cacheManager.get('zhangInfo')
+				cacheManager.updateObject('zhangInfo', {
+				     curZhangId: this.cacheZhangInfo.curZhangId +1
+				    })
 				let zhang = this.cacheZhangInfo.zhangList[this.cacheCurrentZhangIndex + 1]
 				uni.redirectTo({
 					url: '/pages/study/lookShipin?jieId=' + zhang.jieList[0].jieId

pages/study/lookShipinNew.vue

@@ -132,7 +132,12 @@
 					toast('数据错误,缓存丢失/ jieId丢失')
 					return false
 				}
-				this.cacheCurrentZhangIndex = cacheManager.get('auth').currentZhang
+				
+				const curZhangId = cacheManager.get('zhangInfo').curZhangId;
+				const resZhangList = cacheManager.get('zhangInfo').zhangList;
+				const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
+				console.log('index', index);
+				this.cacheCurrentZhangIndex = index
 				this.cacheZhangInfo = cacheManager.get('zhangInfo')
 
 				// let zhang = this.cacheZhangInfo.zhangList.find(zhang => zhang.zhangId == this.zhangId);
@@ -153,17 +158,8 @@
 				this.progressMarkers = this.pageData.jiedianList || []
 				this.getLive(); //获取播放凭证
 			},
-			goNextZhang() {
-				let that = this
-				cacheManager.updateObject('auth', {
-					currentZhang: this.cacheCurrentZhangIndex + 1
-				})
-				this.cacheZhangInfo = cacheManager.get('zhangInfo')
-				let zhang = this.cacheZhangInfo.zhangList[this.cacheCurrentZhangIndex + 1]
-				uni.redirectTo({
-					url: '/pages/study/lookShipin?jieId=' + zhang.jieList[0].jieId
-				})
-			},
+			
+	
 			playEnd(data) {
 				console.log('data', data);
 				console.log('111111');
@@ -236,7 +232,6 @@
 						})
 					} else if (this.pageData.lastFlag == 1 && this.pageData.type == 1) {
 						// 当前是本章最后一节，并且是 视频 切换下一章
-						//this.goNextZhang()
 						this.goUpPage()
 					} else {
 						uni.redirectTo({

pages/study/product/yingyuNew.vue

@@ -180,7 +180,7 @@
 	}
 
 	function onTouchStart(event) {
-		console.log(event.touches.length);
+	//	console.log(event.touches.length);
 		isSliding.value = false
 		if (event.touches.length === 1) {
 			isSliding.value = true;
@@ -193,14 +193,14 @@
 	}
 
 	function onSwipeLeft(event) {
-		console.log('11111');
+	//	console.log('11111');
 		if (cacheManager.get('auth')) {
 			$emit('onLeft');
 		}
 	}
 
 	function onSwipeRight(event) {
-		console.log('22222');
+		//console.log('22222');
 		if (cacheManager.get('auth')) {
 			$emit('onRight');
 		}