Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

common/styles/global/pages.scss

@@ -2,7 +2,12 @@
 // 登录页  padding-bottom: env(safe-area-inset-bottom); box-sizing: unset;
 .ezy-login-page {
 	width:100%;height:100vh; background-color: #80dfff;position: relative;
-	.ezy-login-wrap{width:100%;height: 1623.08rpx;background-image: url("@/static/images/login/login-bj.jpg");@include ezy-no-repeat-cover(top);}
+	.ezy-login-wrap{width:100%;height: 1623.08rpx;background-image: url("@/static/images/login/login-bj.png");@include ezy-no-repeat-cover(top);}
+	.login-e-img{
+		width: 692rpx;height: 625rpx;@include ezy-no-repeat-cover;
+		background-image: url("@/static/images/login/login-e-img.gif");
+		position: absolute;top: -180rpx;left: -180rpx;
+	}
 	.login-body-box{
 		display: flex;flex-direction: column;display: flex;box-sizing: border-box;
 		position: absolute;top:690rpx;left: 50%;transform: translateX(-50%);

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/login/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="ezy-login-page">
 		<view class="ezy-login-wrap">
+			<icon class="login-e-img"></icon>
 			<!-- 手机号 -->
 			<view class="login-body-box">
 				<view class="index-title-img"></view>

pages/login/login.vue

@@ -2,6 +2,7 @@
 	<view class="ezy-login-page">
 		<view @click="goIndex" class="ezy-nav-bar-icon"></view>
 		<view class="ezy-login-wrap">
+			<icon class="login-e-img"></icon>
 			<view class="login-body-box">
 				<view class="login-title-img"></view>
 				<view class="yzm-show">验证码已发送至：{{loginData.phoneNumber}}</view>

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/daoTipDialog.vue

@@ -0,0 +1,27 @@
+<template>
+	<uni-popup ref="daoTipPopup" type="bottom">
+		<view class="game-popup-box">
+			
+			<view style="background-color: #fff;">123123</view>
+			
+		</view>
+	</uni-popup>
+</template>
+
+<script setup>
+	import {ref} from "vue";
+	const daoTipPopup = ref(null);
+	function handleShow() {
+		daoTipPopup.value.open();
+	}
+	function handleClose() {
+		daoTipPopup.value.close();
+	}
+	
+	defineExpose({
+		handleShow
+	})
+</script>
+
+<style>
+</style>

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,

utils/cacheManager.js

@@ -140,4 +140,14 @@ export function useUnitTestTishi() {
 		updateTishi: () => cacheManager.set(SHOW_UNIT_TEST_TISHI, 'has'),
 		getTishi: () => cacheManager.get(SHOW_UNIT_TEST_TISHI)
 	}
+}
+
+// 岛页面---指引动画缓存
+export const SHOW_GIF_TISHI = 'SHOW_GIF_TISHI';
+// 岛页面背景图缓存
+export function daoBjTishi() {
+	return {
+		updateDaoBjTishi: () => cacheManager.set(SHOW_GIF_TISHI, 'has'),
+		getDaoBjTishi: () => cacheManager.get(SHOW_GIF_TISHI)
+	}
 }