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

pages/newEnglish/components/beiPage.vue

@@ -108,7 +108,7 @@
 	// 选择单词
 
 	function checkIsRight() {
-		if (data.answer == props.activeWord.value) {
+		if (data.answer == props.activeWord.name) {
 			data.result = true;
 			noticeBackDb()
 		} else {

pages/newEnglish/components/xuePage.vue

@@ -24,12 +24,12 @@
 			<!-- 详解触发 -->
 			<view @click="goXiangjie" class="details-btn">详解 ></view>
 			<!-- 音标拆分区 -->
-			<view v-if="data.isPindu" class="word-block-box yb-block-box">
+			<view v-show="data.isPindu" class="word-block-box yb-block-box">
 				<!-- pindu -->
 				<audioThreeVue v-for="(item,index) in activeWord.pindu" :key="index" :YItem="item"
 					@play-audio="handlePlay"></audioThreeVue>
 			</view>
-			<view v-else class="yj-block-box">
+			<view  v-show="!data.isPindu" class="yj-block-box">
 				<!-- yinjie -->
 				<audioFourVue v-for="(item,index) in activeWord.yinjie" :key="index" :YItem="item"
 					@play-audio="handlePlay"></audioFourVue>

pages/newEnglish/index.vue

@@ -81,7 +81,7 @@
 		levelId: null, // 等级
 		typeId: null, // 类型
 		tipFlag: null, // 提示
-		zhangId: null, // 章ID
+		youkeZhangId: null, // 章ID
 		isLearnStatus: null, // 学习记录状态
 	})
 
@@ -93,7 +93,7 @@
 		typeId,
 		tipFlag,
 		isLearnStatus,
-		zhangId
+		youkeZhangId
 	}) => {
 		data.jieId = jieId;
 		isLearnRecord.value = jieId;
@@ -103,7 +103,7 @@
 		data.levelId = levelId;
 		data.typeId = typeId;
 		data.tipFlag = tipFlag;
-		data.zhangId = zhangId;
+		data.youkeZhangId = youkeZhangId;
 		// 获取单词列表数据
 		initWordInfo();
 		// 清理过期文件
@@ -167,7 +167,7 @@
 				levelId: data.levelId,
 				typeId: data.typeId,
 				tipFlag: data.tipFlag,
-				youkeZhangId: data.zhangId,
+				youkeZhangId: data.youkeZhangId,
 				jieId: data.jieId
 			})
 			uni.redirectTo({
@@ -184,7 +184,7 @@
 			})
 		} else {
 			uni.redirectTo({
-				url: `/pages/study/index?levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.tipFlag}&youkeZhangId=${data.zhangId}&jieId=${data.jieId}`
+				url: `/pages/study/index?levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.tipFlag}&youkeZhangId=${data.youkeZhangId}&jieId=${data.jieId}`
 			})
 		}
 	}