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

common/styles/global/components.scss

@@ -249,4 +249,17 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	@include ezy-no-repeat-cover;background-image: url("@/static/images/my/jf-qb.png");}
 	.jf-text{min-width: 60rpx;text-align: center;color: #fff;}
 }
-		
+	
+// tab页面
+.ezy-tab-border{
+	flex: 1;width: 92%;height: auto;background-color: rgba(255, 255, 255, 0.6);border-radius: 10px;
+	margin: 12rpx auto 32rpx;position: relative;box-sizing: border-box;display: flex;flex-direction: column;
+}
+.ezy-tab-box{
+		height: 82rpx!important;
+		background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 20rpx 20rpx 0;
+		box-sizing: border-box;padding: 10rpx 12rpx;border-radius: 8rpx;
+		.segmented-control__text{color: #333!important;}
+		.segmented-control__item--button,.segmented-control__item--button--last{height: 62rpx;border: 0;border-width: 0!important;border-radius: 8rpx;}
+		.segmented-control__item--button--active .segmented-control__text{color: #fff!important;}
+	}

common/styles/global/pages.scss

@@ -245,18 +245,24 @@
 		position: absolute;left: 20rpx;top:var(--status-bar-height);z-index: 2;
 	}
 	// animal
-		.animal-img{width:48rpx;height: 68rpx;@include ezy-no-repeat-cover;position: absolute;animation: shakeAndGrow 3s infinite;}
-		@keyframes shakeAndGrow {
-			0% {transform: translateX(0) scale(1);}
-			25% {transform: rotate(-20deg);}
-			50% {transform: rotate(20deg);}
-			75% {transform: rotate(0deg) scale(1.2);}
-			100% {transform: rotate(0deg) scale(1);}
-		}
-	.dan-img{background-image: url("@/static/images/study/animal-img1.png");}
-	.xiao-e-img{background-image: url("@/static/images/study/animal-img2.png");}
-	.zhong-e-img{background-image: url("@/static/images/study/animal-img3.png");}
-	.da-e-img{background-image: url("@/static/images/study/animal-img4.png");}
+	.animal-img{width:48rpx;height: 68rpx;@include ezy-no-repeat-cover;position: absolute;}
+	@keyframes shakeDan {
+		0% {transform: translateX(0) scale(1);}
+		25% {transform: rotate(-20deg);}
+		50% {transform: rotate(20deg);}
+		75% {transform: rotate(0deg) scale(1.2);}
+		100% {transform: rotate(0deg) scale(1);}
+	}
+	@keyframes shakeE {
+		0% {transform: translateX(0);}
+		25% {transform: rotate(-8deg);}
+		75% {transform: rotate(8deg);}
+		100% {transform: rotate(0deg);}
+	}
+	.dan-img{background-image: url("@/static/images/study/animal-img1.png");animation: shakeDan 3s infinite;}
+	.xiao-e-img{background-image: url("@/static/images/study/animal-img2.png");animation: shakeE 3s infinite;}
+	.zhong-e-img{background-image: url("@/static/images/study/animal-img3.png");animation: shakeE 3s infinite;}
+	.da-e-img{background-image: url("@/static/images/study/animal-img4.png");animation: shakeE 3s infinite;}
 }
 // 数学
 .ezy-shuxue-study-page{
@@ -267,8 +273,8 @@
 		@include ezy-no-repeat-cover;position: relative;margin: 0 auto;
 	}
 	.chapter-box{
-		width: 150rpx;text-align: center;font-weight: 800;color: #5c1a11;
-		font-size: 32rpx;position: absolute;top:122rpx;left:330rpx;
+		width: 160rpx;text-align: center;font-weight: 800;color: #5c1a11;
+		font-size: 30rpx;position: absolute;top:122rpx;left:322rpx;
 	}
 	.chapter-title-box{
 		width: 325rpx;height: 80rpx;text-align: center;font-weight: 800;color: #fbb030;
@@ -806,18 +812,7 @@
 	@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/common/ezy-page-bj.png");
 	.uni-list{background-color: transparent!important;}
 	.uni-list--border-top,.uni-list--border-bottom{display: none;}
-	.cuoti-border-box{
-		flex: 1;width: 92%;height: auto;background-color: rgba(255, 255, 255, 0.6);border-radius: 10px;
-		margin: 12rpx auto 32rpx;position: relative;box-sizing: border-box;display: flex;flex-direction: column;
-	}
-	.cuo-tab-box{
-		height: 82rpx!important;
-		background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 20rpx 20rpx 0;
-		box-sizing: border-box;padding: 10rpx 12rpx;border-radius: 8rpx;
-		.segmented-control__text{color: #333!important;}
-		.segmented-control__item--button{height: 62rpx;border: 0;border-radius: 8rpx;}
-		.segmented-control__item--button--active .segmented-control__text{color: #fff!important;}
-	}
+	
 	.cuoti-content-box{flex: 1;background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 10rpx 20rpx;}
 	.cuoti-scroll-view{overflow-y: auto;height: calc(100vh - 380rpx - var(--status-bar-height));}
 	
@@ -1046,26 +1041,42 @@
 	.game-jf-box{position: absolute;right: 24rpx;top: var(--status-bar-height);}
 	// goose
 	.game-goose-box{
-		position: absolute;bottom: 300rpx;right: 80rpx;
+		position: absolute;bottom: 300rpx;right: 80rpx;color: #0d5f84;
+		.game-progress-text{
+			position: absolute;left: 50%;transform: translateX(-50%);font-size: 18rpx;bottom: 303rpx;
+		}
 		.game-progress-box{
 			width: 138rpx;height: 25rpx;position: absolute;left: 48rpx;
 			.u-line-progress__background{
 				width: 138rpx;height: 25rpx!important;
 				@include ezy-no-repeat-cover;background-image: url("@/static/images/game/jf-bj.png");
 			}
+			.u-line-progress__line{height: 25rpx!important;}
 		}
 		.goose-img-box{width: 231rpx;height: 442rpx;@include ezy-no-repeat-cover;}
 	}
-	.game-goose-box0 .game-progress-box{bottom: 300rpx;}
-	.game-goose-box1 .game-progress-box{bottom: 330rpx;}
-	.game-goose-box2 .game-progress-box{bottom: 400rpx;}
-	.game-goose-box3 .game-progress-box{bottom: 460rpx;}
+	.game-goose-box0{
+		.game-progress-box{bottom: 300rpx;}
+		.game-progress-text{bottom: 303rpx;}
+	} 
+	.game-goose-box1{
+		.game-progress-box{bottom: 330rpx;}
+		.game-progress-text{bottom: 333rpx;}
+	} 
+	.game-goose-box2{
+		.game-progress-box{bottom: 400rpx;}
+		.game-progress-text{bottom: 403rpx;}
+	} 
+	.game-goose-box3{
+		.game-progress-box{bottom: 460rpx;}
+		.game-progress-text{bottom: 463rpx;}
+	} 
 	
 	// food
 	.food-img-box{width: 80rpx;height: 75rpx;position: absolute;}
-	.food-img25{bottom: 368rpx;left: 274rpx;}
-	.food-img50{bottom: 360rpx;left: 270rpx;}
-	.food-img100{bottom: 360rpx;left: 272rpx;}
+	.food-img100{bottom: 368rpx;left: 274rpx;}
+	.food-img300{bottom: 360rpx;left: 270rpx;}
+	.food-img600{bottom: 360rpx;left: 272rpx;}
 	
 	//btn
 	.food-btn-box{
@@ -1098,15 +1109,31 @@
 			width: 204rpx;height: 250rpx;@include ezy-no-repeat-cover;
 			display: flex;flex-direction: column;align-items: center;justify-content: center;
 			background-image: url("@/static/images/game/food-bj.png");
-			img{width: 144rpx;height:135rpx;}
+			.food-image{width: 144rpx;height:135rpx;}
 			.food-item-jf{
 				width: 123rpx;height: 46rpx;
 				display: flex;align-items: center;line-height: 1.2;font-size: 26rpx;
 				@include ezy-no-repeat-cover;background-image: url("@/static/images/game/food-jf-bj.png");margin-top: 20rpx;
 				.jf-icon{width: 35rpx;height: 35rpx;margin:0 4rpx 0 10rpx;flex-shrink: 0;
 				@include ezy-no-repeat-cover;background-image: url("@/static/images/my/jf-qb.png");}
-				.jf-text{min-width: 60rpx;text-align: center;color: #fff;}
+				.jf-text{min-width: 60rpx;text-align: center;color: #fff;margin-top: 2rpx;}
 			}
 		}
 	}
+}
+
+.yxsm-popup-box{
+		width: 684rpx;height: 1308rpx;box-sizing: border-box;padding: 120rpx 56rpx 60rpx;overflow-y: auto;
+		background-image: url("@/static/images/login/agree-content-bj.png");@include ezy-no-repeat-cover;
+		position: relative;text-align: justify;display: flex;flex-direction: column;position: relative;
+		.yxsm-close-btn{width: 62rpx;height: 62rpx;@include ezy-no-repeat-cover;position: absolute;
+		top: 64rpx;right: 44rpx;background-image: url("@/static/images/common/close-icon.png");}
+		.yxsm-item-box{overflow-y: auto;line-height: 1.8;font-size: 28rpx;}
+		.yxsm-popup-title{font-size: 36rpx;color: #333;text-align: center;margin-bottom: 32rpx;}
+		.item-title{color: #359ae2;}
+		.item-content{color: #555;}
+		@media (max-height: 480px){
+			padding: 120rpx 56rpx 120rpx;
+			.yxsm-close-btn{top: 100rpx;}
+		}
 }

components/catalogue/catalogue.vue

@@ -46,6 +46,12 @@
 	import {MESSAGE_VISITER_TO_LOGIN,MESSAGE_BEFORE_PAY} from "@/utils/constant.js"
     import tipSmallDialog from '@/components/dialog/tipSmallDialog.vue'
 	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
+	import {
+	  onShow
+	} from '@dcloudio/uni-app';
+	const growthType = ref(null);
+	const AuthCode = ref(null);
+	onShow(() => AuthCode.value = getUserIdentity()); // 用户身份
 
 	const $emit = defineEmits(['change-zhang'])
 
@@ -56,7 +62,6 @@
 	const list = ref([]); // 章节
 	const activeCollapse = ref('');
 	const Message = MESSAGE_BEFORE_PAY;
-	const AuthCode = getUserIdentity(); // 用户身份
 	const youkeDialogRef = ref(null);
 
 	function ykConfirm() {
@@ -103,13 +108,13 @@
 	 * @param({zhangId:string}) data
 	 */
 	function handleSelectZhang(data,index) {
-		if(index !=0 && AuthCode == 'Visitor'){
+		if(index !=0 && AuthCode.value == 'Visitor'){
 			// 游客
 			youkeDialogRef.value.handleShow();
 			return;
 		}
 
-		if(index !=0 && AuthCode == 'Not-Vip'){
+		if(index !=0 && AuthCode.value == 'Not-Vip'){
 			// 非VIP
 			popupRef.value.close();
 			confirmDialogRef.value.handleShow();

pages.json

@@ -16,7 +16,10 @@
 			"path": "pages/selectGradesTerms/index",
 			"style": {
 				"navigationBarTitleText": "选择学科和年纪",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"animationType": "none"
+				}
 			}
 		},
 		{
@@ -35,9 +38,14 @@
 		},
 		{
 			"path": "pages/game/index",
+				
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"animationType": "none"
+				}
 			}
+		
 		},
 		{
 			"path": "pages/my/index",
@@ -121,8 +129,8 @@
 		"navigationBarTitleText": "麦塔软件",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
-		"animationType": "none",
-		"animationDuration": "0",
+		// "animationType": "none",
+		// "animationDuration": "0",
 		//禁止滑动返回
 		"app-plus": {
 					"popGesture": "none"

pages/game/components/constantConfig.js

@@ -1,18 +1,18 @@
 // 食物种类列表
 export const foodSpeciesList = [{
 		id: 100,
-		imgUrl: '/static/images/game/food-img3.png',
-		credit: 100
+		imgUrl: '/static/images/game/food-img1.png',
+		credit: 30
 	},
 	{
 		id: 300,
 		imgUrl: '/static/images/game/food-img2.png',
-		credit: 300
+		credit: 100
 	},
 	{
 		id: 600,
 		imgUrl: '/static/images/game/food-img3.png',
-		credit: 600
+		credit: 300
 	}
 ]
 

pages/game/components/foodSelect.vue

@@ -47,7 +47,6 @@
 		popupRef.value.open();
 	}
 	function handleClose() {
-		console.log(123)
 		popupRef.value.close();
 	}
 	function handleSelectFood(shiwu) {

pages/game/components/goose.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<up-line-progress :percentage="progress" activeColor="#54e1fe" class="game-progress-box"></up-line-progress>
+		<up-line-progress v-if="growthType!==3" :percentage="progress" :showText="false" activeColor="#54e1fe" class="game-progress-box"></up-line-progress>
+    <text class="game-progress-text">成长值：{{progress}}%</text>
 		<image :src="imgUrl" class="goose-img-box"></image>
 	</view>
 </template>
@@ -21,8 +22,7 @@
 	})
 	
 	const imgUrl = computed(() => {
-		const active = gooseGrowthTypeList.find(item => item.grouthType == props.growthType)
-    console.log(active,props.growthType,props.progress)
+		const active = gooseGrowthTypeList.find(item => item.id == props.growthType)
 		return active ? active.imgUrl: ''
 	})
 </script>

pages/game/index.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="ezy-game-page">
 		<!-- 返回按钮 -->
-		<view class="ezy-nav-bar-icon"></view>
+		<view class="ezy-nav-bar-icon" @click="handleBack"></view>
 		<!-- 积分 -->
 		<view class="ezy-jf-box game-jf-box">
 			<icon class="jf-icon"></icon>
@@ -46,31 +46,34 @@
 			content: '学生首次注册并登录 APP 时，系统自动发放一颗宠物鹅蛋，开启养鹅之旅。每个账号有且仅有一次领取鹅蛋的机会，确保公平性，这颗蛋便是学生与宠物鹅相伴成长的起点。',
 	},{
 			title: '成长阶段',
-			content: `1. 破壳期（初始状态）：刚获得的鹅蛋代表宠物鹅的初始形态，成长值为 0，静静等待成长契机。
-					2. 幼年期：当学生通过学习积累的经验值达到 1000 时，鹅蛋孵化，宠物鹅进入幼年期，模样娇小可爱，开启成长新篇。
-					3. 青年期：随着学习推进，经验值累计至 3000，幼鹅成长为青年鹅，体型增大，羽毛渐丰，活力更足。
+			content: `1. 破壳期（初始状态）：刚获得的鹅蛋代表宠物鹅的初始形态，成长值为 0，静静等待成长契机。
+					2. 幼年期：当学生通过学习积累的经验值达到 1000 时，鹅蛋孵化，宠物鹅进入幼年期，模样娇小可爱，开启成长新篇。
+					3. 青年期：随着学习推进，经验值累计至 3000，幼鹅成长为青年鹅，体型增大，羽毛渐丰，活力更足。
 					4. 成年期：若学生持之以恒学习，使经验值攀升至 7000，青年鹅将进化为成年鹅，外形成熟矫健，成为学生学习路上的暖心陪伴。`,
 	},{
 			title: '积分规则',
-			content: `1. 学习课程积分：APP 提供丰富视频课程，学生首次完整学完一门课程，就能获得 30 积分。系统会记录学习情况，重复学习同一课程不再积分，激励学生探索新内容。
-					2. 答题积分：各章节配有单元测试，学生首次答题，每答对一题获 10 积分，答错无积分。重复测试以首次答题结果为准，促使学生认真对待初次测试。
-					3. 蛋糕兑换积分：
-						- 学生可用积分兑换成长值蛋糕，100 积分换 30 成长值蛋糕、300 积分换 100 成长值蛋糕、600 积分换 300 成长值蛋糕，为宠物鹅成长助力。
-						- 每天限定兑换2次成长值蛋糕。`,
+			content: `1. 学习课程积分：APP 提供丰富视频课程，学生首次完整学完一门课程，就能获得 30 积分。系统会记录学习情况，重复学习同一课程不再积分，激励学生探索新内容。
+					2. 答题积分：各章节配有单元测试，学生首次答题，每答对一题获 10 积分，答错无积分。重复测试以首次答题结果为准，促使学生认真对待初次测试。
+					3. 蛋糕兑换积分：
+						- 学生可用积分兑换成长值蛋糕，100 积分换 30 成长值蛋糕、300 积分换 100 成长值蛋糕、600 积分换 300 成长值蛋糕，为宠物鹅成长助力。`,
 	}]);
 	const foodSelectRef = ref(null);
 	const dlRef = ref(null);
-	
+
 	function handleClose() {
 		dlRef.value.handleClose();
 	}
+
+  function handleBack() {
+    uni.navigateBack();
+  }
 	
 	function showTishi() {
 		dlRef.value.handleShow();
 	}
 	
 	function onWeiShi(data) {
-		handleWeishi(data.id, () => {
+		handleWeishi(data, () => {
 			foodSelectRef.value.handleClose();
 		})
 	}

pages/game/useGame.js

@@ -15,6 +15,7 @@ import cacheManager from "@/utils/cacheManager.js"
 
 export function useGame() {
 	const UserCode = getUserIdentity();
+	const auth = cacheManager.get('auth');
 	const data = reactive({
 			credit: 0, // 当前积分
 			growth: 0, // 成长值
@@ -22,9 +23,13 @@ export function useGame() {
 			progress:0, // 当前进度
 			shiwuId:null // 上一次食物
 	})
+	if (auth) {
+		data.growthType = auth.growthType;
+	}
 	async function getGameInfo() {
 		const [err, info] = await catchError(getYouxiInfo());
 		if (err) {
+
 			toast("请求异常，请稍后尝试");
 			return;
 		}
@@ -39,14 +44,14 @@ export function useGame() {
 		data.shiwuId = shiwuId;
 	}
 	
-	async function handleWeishi(cShiwuId, doFinish) {
-		const [err, info] = await catchError(getYouxiWeishi({shiwuId:cShiwuId}));
+	async function handleWeishi({id:cShiwuId,credit:cCredit}, doFinish) {
+		const [err, info] = await catchError(getYouxiWeishi({shiwuId:cShiwuId,credit:cCredit }));
 		if (err) {
 			toast("请求异常，请稍后尝试");
 			return;
 		}
 		const {
-			credit,growth,growthType,progress,shiwuId,changeFlag
+			credit,growth,growthType,progress,shiwuId
 		} = info;
 		
 		data.credit = credit;
@@ -54,10 +59,8 @@ export function useGame() {
 		data.progress = progress;
 		data.shiwuId = shiwuId;
 		
-		if (changeFlag) {
-			// 更新成长状态
-			updateCachegrowthType();
-		}
+		// 更新成长状态
+		updateCachegrowthType(growthType);
 		
 		doFinish && doFinish();
 	}

pages/study/product/shuxue.vue

@@ -52,6 +52,11 @@
 		toast,
 		getUserIdentity
 	} from "@/utils/common";
+  import {
+    onShow
+  } from '@dcloudio/uni-app';
+  const growthType = ref(null);
+  onShow(() => growthType.value =  cacheManager.get('auth').growthType)
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue', 'listClick'])
 	const props = defineProps({
 		options: {
@@ -59,7 +64,6 @@
 		},
 	})
 	const isVip = getUserIdentity();
-	const growthType = cacheManager.get('auth').growthType;
 	const gradeMapping = {
 		1: '一年级',
 		2: '二年级',

pages/study/product/yingyu.vue

@@ -59,6 +59,12 @@
 		toast,
 		getUserIdentity
 	} from "@/utils/common";
+  import {
+    onShow
+  } from '@dcloudio/uni-app';
+  const growthType = ref(null);
+  onShow(() => growthType.value =  cacheManager.get('auth').growthType)
+
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue', 'listClick'])
 	const props = defineProps({
 		options: {
@@ -66,7 +72,6 @@
 		},
 	})
 	const isVip = getUserIdentity();
-	const growthType = cacheManager.get('auth').growthType;
 	const gradeMapping = {
 		1: '一年级',
 		2: '二年级',

pages/wrong/index.vue

@@ -4,9 +4,9 @@
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">我的错题</text>
 		</view>
-		<view class="cuoti-border-box">
+		<view class="ezy-tab-border">
 			<uni-segmented-control :current="data.current" :values="data.items" active-color="#3A7FE9"
-				@clickItem="onChangeTab" class="cuo-tab-box" />
+				@clickItem="onChangeTab" class="ezy-tab-box" />
 			<view class="cuoti-content-box">
 				<view v-if="data.current === 0">
 					<scroll-view scroll-y="true" refresher-enabled="true"