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

components/custom-tabbar/custom-tabbar.vue

@@ -98,8 +98,10 @@
 						});
 						return;
 					}
-					uni.redirectTo({
-						url: path
+					uni.navigateTo({
+						url: path,
+						"animationType": "fade-in",
+						"animationDuration":0
 					});
 				}
 

pages/selectGradesTerms/index.vue

@@ -90,7 +90,8 @@
 					nianji: data.activeNianji,
 					zhangId: data.activeNianji == auth.nianji && data.activeXueke == auth.cardId ? auth.zhangId: 0,
 					cardId: data.activeXueke,
-				})
+				})
+				cacheManager.remove('daoPageCache')
 				// 数序
 				uni.redirectTo({
 					url: `/pages/study/index`

pages/study/index.vue

@@ -122,8 +122,19 @@
 				nextTick(() => {
 					eggDialogRef.value.eggShow();
 				})
+			}
+			// cacheManager.set('daoPageCache',{isCache:true})
+			if(!cacheManager.get('daoPageCache').isCache){
+					getZhangInfo()
+				
+			}else{
+					console.log('shiyonghuancun');
+					translateData(cacheManager.get('auth'))
+					zhangList.value = cacheManager.get('zhangInfo').zhangList
+					current.value = cacheManager.get('auth').currentZhang
+					infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
+					recordZhangJie()	
 			}
-			getZhangInfo()
 		} else {
 			zhangId.value = options.zhangId
 			nianji.value = options.nianji
@@ -152,7 +163,9 @@
 				cacheManager.updateObject('auth', {
 					currentZhang: 0
 				})
-			}
+			}
+			cacheManager.set('daoPageCache',{isCache:true})
+			
 			nextTick(() => {
 				translateData(res.data)
 				zhangList.value = res.data.zhangList
@@ -176,29 +189,9 @@
 			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
-			// infoData.numberStr = res.data.numberStr
-			// infoData.cardId = res.data.cardId
-			// infoData.zhangId = res.data.zhangId
-			// infoData.zhangName = res.data.zhangName
-			//getNewData()
 		})
 	}
 
-	function getNewData() {
-		selectZhang.value.zhangId = cacheManager.get('zhangInfo').zhangId;
-		selectZhang.value.cardId = cacheManager.get('zhangInfo').cardId;
-		selectZhang.value.nianji = cacheManager.get('zhangInfo').nianji;
-		cacheManager.updateObject('auth', {
-			zhangId: selectZhang.value.zhangId,
-			cardId: selectZhang.value.cardId,
-			nianji: selectZhang.value.nianji,
-		})
-
-	}
-
 	function recordZhangJie() {
 		let req = {
 			nianji: selectZhang.value.nianji,