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

components/custom-tabbar/custom-tabbar.vue

@@ -1,16 +1,20 @@
 <template>
 	<view class="ezy-custom-tabbar">
 		<view class="tabbar-item-box">
+
 			<view class="tabbar-item" v-for="(item, index) in tabList" :key="index" @click="switchTab(item.path,index)"
-				:style="{ backgroundImage: 'url(' + (currentTab === index ? item.activePath : item.iconPath) + ')' }">
+				:style="{ backgroundImage: 'url(' + (currentTab == index ? item.activePath : item.iconPath) + ')' }">
 			</view>
 		</view>
 	</view>
-	<tip-middle-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :content="MESSAGE_VISITER_TO_LOGIN"></tip-middle-dialog>
+	<tip-middle-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm"
+		:content="MESSAGE_VISITER_TO_LOGIN"></tip-middle-dialog>
 </template>
 
 <script>
-	import {MESSAGE_VISITER_TO_LOGIN} from "@/utils/constant.js"
+	import {
+		MESSAGE_VISITER_TO_LOGIN
+	} from "@/utils/constant.js"
 	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import {
 		useTabBarHistory
@@ -20,6 +24,9 @@
 		toast,
 		getUserIdentity
 	} from "@/utils/common";
+	import {
+		nextTick,
+	} from "vue";
 	export default {
 		components: {
 			tipMiddleDialog
@@ -56,25 +63,33 @@
 			zhangId: {
 				type: String,
 			},
+			currentTabNumber: {
+				type: String,
+			},
 
 		},
 		methods: {
 			// 游客弹窗---确定
-			ykConfirm(){
+			ykConfirm() {
 				uni.redirectTo({
 					url: '/pages/login/index'
 				});
 			},
-	
+
 			switchTab(path, index) {
+
 				this.currentTab = index;
+				uni.redirectTo({
+					url: path
+				});
 				if (getUserIdentity() == 'Visitor') {
 					if (path === '/pages/game/index') {
 						this.$refs.youkeDialogRef.handleShow();
-						return ;
+						return;
 					}
 					uni.redirectTo({
-						url: path + '?nianji=' + this.nianji + '&cardId=' + this.cardId + '&zhangId=' + this
+						url: path + '?nianji=' + this.nianji + '&cardId=' + this.cardId + '&zhangId=' +
+							this
 							.zhangId
 					});
 				} else {
@@ -94,7 +109,8 @@
 
 		},
 		created() {
-			console.log(this.nianji);
+
+			this.currentTab  =this.currentTabNumber
 		}
 
 	}
@@ -117,4 +133,4 @@
 	.tab-icon {
 		/* 图标样式 */
 	}
-</style>
+</style>

pages/my/index.vue

@@ -39,7 +39,7 @@
 				<text>退出登录</text>
 			</view>
 		</view>
-		<CustomTabBar :cardId="cardId" :nianji="nianji" :zhangId="zhangId"></CustomTabBar>
+		<CustomTabBar :cardId="cardId" :currentTabNumber="2" :nianji="nianji" :zhangId="zhangId"></CustomTabBar>
 		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
 		<tip-middle-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :content="MESSAGE_VISITER_TO_LOGIN"></tip-middle-dialog>
 		<tel-dialog @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
@@ -62,7 +62,7 @@
 	const zhangId = ref(null);
 	const nianji = ref(null);
 	const cardId = ref(null);
-	const tipContent = '你确定要执行这个操作吗？'; 
+	const tipContent = '你确定要执行这个操作吗？';
 	let hyqyData = reactive({
 			indicatorDots: true,
 			autoplay: true,
@@ -80,7 +80,7 @@
 	let routerOpt  = ref(false);
 	const exitDialogRef = ref(null);
 	const youkeDialogRef = ref(null);
-	
+
 	const exitLogin = () => {
 		exitDialogRef.value.handleShow();
 	}
@@ -101,16 +101,16 @@
 				url: '/pages/login/index'
 			});
 		}
-		
+
 	}
-	
+
 	// 游客弹窗---确定
 	function ykConfirm(){
 		uni.redirectTo({
 			url: '/pages/login/index'
 		});
 	}
-	
+
 	// 手机号码
 	function telClick(){
 		if(loginFlag.value){
@@ -118,20 +118,20 @@
 		}else{
 			youkeDialogRef.value.handleShow();
 		}
-		
+
 	}
-	
+
 	// 手机号码绑定
 	function bindBtn(){
 		telDialogFlag.value = false;
 		myGetAuth()
 	}
-	
+
 	// 关闭手机号码弹窗
 	function telClose(){
 		telDialogFlag.value = false;
 	}
-	
+
 	// 关于我们
 	function aboutClick(){
 		if(loginFlag.value){
@@ -144,9 +144,9 @@
 			});
 		}
 	}
-	
+
 	// 订单
-	function orderClick(){
+	function orderClick(){
 		if(loginFlag.value){
 			uni.redirectTo({
 				url: '/pages/pay/order'
@@ -155,7 +155,7 @@
 			youkeDialogRef.value.handleShow();
 		}
 	}
-	
+
 	// 获取用户数据
 	function getMyInfo(){
 		myInfo({}).then(res => {
@@ -164,7 +164,7 @@
 			myInfoData.credit = res.data.credit;
 		})
 	}
-	
+
 	// 获取用户头像
 	function getUserImg(data){
 		 switch (data) {
@@ -188,7 +188,7 @@
 	}
 	// 会员权益按钮
 	function hyqyBtn(index){
-		let cardId = index+1;
+		let cardId = index+1;
 		/* index为学科 1数学 2英语 */
 		if(loginFlag.value){
 			// 非游客
@@ -200,7 +200,7 @@
 			youkeDialogRef.value.handleShow();
 		}
 	}
-	
+
 	// 判断是否是游客
 	function myGetAuth(){
 		let LocalStorage = cacheManager.get('auth');
@@ -211,7 +211,7 @@
 			youkeFun();
 		}
 	}
-	
+
 	// 游客
 	function youkeFun(){
 		zhangId.value = routerOpt.zhangId
@@ -222,13 +222,13 @@
 		myInfoData.userName = '游客';
 		myInfoData.userImg = 'static/images/my/head-unlogin-img.png'
 	}
-	
+
 	// 非游客
 	function noYoukeFun(){
 		loginFlag.value = true;
 		getMyInfo();
 	}
-	
+
 	// 获取会员权益card class
 	function getHyqyClass(index){
 		let VipIndex =index +1;
@@ -244,9 +244,9 @@
 			// 游客
 			return 'hyqy-disabled-box' + VipIndex;
 		}
-		
+
 	}
-	
+
 	//获取会员权益按钮是否显示
 	function getHyqyBtn(index){
 		let VipIndex =index +1;
@@ -262,7 +262,7 @@
 			return 'hyqy-disabled-box' + VipIndex;
 		}
 	}
-	
+
 	onLoad((options) => {
 		if(!cacheManager.get('auth')){
 			// 游客
@@ -274,13 +274,13 @@
 		}
 	})
 
-  function checkWrong() {
+  function checkWrong() {
 	if(loginFlag.value){
 		const AuthCode = getUserIdentity();
 		if (AuthCode == 'Visitor') {
 			youkeDialogRef.value.handleShow();
 			return;
-		}  
+		}
 		uni.redirectTo({
 		  url: '/pages/wrong/index'
 		})

pages/study/product/shuxue.vue

@@ -112,9 +112,9 @@
 	function currentGrowth(data) {
 		if (growthType.value == 0) {
 			return 'animal-img dan-img'
-		} else if (growthType.value == 2) {
+		} else if (growthType.value == 1) {
 			return 'animal-img xiao-e-img'
-		} else if (growthType.value == 3) {
+		} else if (growthType.value == 2) {
 			return 'animal-img zhong-e-img'
 		} else {
 			return 'animal-img da-e-img'

pages/study/product/yingyu.vue

@@ -108,9 +108,9 @@
 	function currentGrowth(data) {
 		if (growthType.value == 0) {
 			return 'animal-img dan-img'
-		} else if (growthType.value == 2) {
+		} else if (growthType.value == 1) {
 			return 'animal-img xiao-e-img'
-		} else if (growthType.value == 3) {
+		} else if (growthType.value == 2) {
 			return 'animal-img zhong-e-img'
 		} else {
 			return 'animal-img da-e-img'