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

pages/newEnglish/components/beiPage.vue

@@ -2,7 +2,7 @@
 <!-- 单音节最长：swimming 多音节最长：transportation -->
 <template>
 		<!-- 显示区 -->
-		<selectTypesVue activeSelect="5"></selectTypesVue>
+<!--		<selectTypesVue activeSelect="5"></selectTypesVue>-->
 		<view class="ezy-border-body">
 			<view class="words-bei-box">
 				<!-- 输入区 -->

pages/newEnglish/components/mainCard.vue

@@ -1,4 +1,5 @@
 <template>
+  <selectTypesVue :activeSelect="currentIndex"></selectTypesVue>
 	<swiper class="word-view-swiper-box" :indicator-dots="false" :autoplay="false" :circular="false"
 		@change="handleSwiperChange" :disable-touch="isPlaying">
 		<swiper-item>
@@ -49,6 +50,7 @@
 	import readContent from './readContent.vue';
 	import xuePage from './xuePage.vue';
   import audioRightWrongVue from "../components/audioRightWrong.vue";
+  import selectTypesVue from './selectTypes.vue';
 	import {
 		ref,
 		onMounted,
@@ -70,6 +72,7 @@
 	const popupImage = ref('')
 	const statusAudio = uni.createInnerAudioContext()
 	const emits = defineEmits(['play-audio', 'goXiangjie', 'swiper-change'])
+  const currentIndex = ref(1)
 
 
 	const luyinSuccess = (imagePath, text, audioPath) => {
@@ -91,6 +94,7 @@
 
 	function handleSwiperChange(e) {
 		emits('swiper-change', e.detail.current)
+    currentIndex.value = e.detail.current+1;
 	}
 
 	function handlePlayAudio({

pages/newEnglish/components/pinPage.vue

@@ -2,7 +2,7 @@
 <!-- 单音节最长：swimming 多音节最长：transportation -->
 <template>
 	<!-- 显示区 -->
-	<selectTypesVue activeSelect="2"></selectTypesVue>
+<!--	<selectTypesVue activeSelect="2"></selectTypesVue>-->
 	<view class="ezy-border-body">
 		<view class="words-pin-box">
 			

pages/newEnglish/components/readContent.vue

@@ -1,7 +1,7 @@
 <!-- 单词区 && 音标区：最多16位，超过换行 -->
 <!-- 单音节最长：swimming 多音节最长：transportation -->
 <template>
-	<selectTypesVue activeSelect="3"></selectTypesVue>
+<!--	<selectTypesVue activeSelect="3"></selectTypesVue>-->
 	<view class="ezy-border-body">
 		<view class="words-du-box">
 

pages/newEnglish/components/selectPage.vue

@@ -2,7 +2,7 @@
 <!-- 单音节最长：swimming 多音节最长：transportation -->
 <template>
 	<!-- 显示区 -->
-	<selectTypesVue activeSelect="4"></selectTypesVue>
+<!--	<selectTypesVue activeSelect="4"></selectTypesVue>-->
 	<view class="ezy-border-body">
 		<view class="words-xuan-box">
 			

pages/newEnglish/components/xuePage.vue

@@ -1,7 +1,7 @@
 <!-- 单词区 && 音标区：最多14位，超过换行  词根助记区：宽度不限，可以滚动-->
 <!-- 单音节最长：swimming 多音节最长：transportation -->
 <template>
-		<selectTypesVue activeSelect="1"></selectTypesVue>
+<!--		<selectTypesVue activeSelect="1"></selectTypesVue>-->
 		<view class="ezy-border-body">
 			<view class="words-xue-box">
 				<view class="words-xue-body">

pages/newEnglish/index.vue

@@ -71,8 +71,8 @@
  })
 
  function handleSwiperChange(index) {
-	 
-	 
+	 return false
+	// 客户暂时不要 
   if (isAudioPlaying.value) return; // 如果正在播放，不允许切换
 
   // 无论切换到哪个页面，都播放单词的主发音（yinpin）