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

common/styles/global/pages.scss

@@ -188,9 +188,10 @@
 	background-image: url("@/static/images/grade/grades-terms-bj1.png");@include ezy-no-repeat-cover(top);
 	// padding-top: 52%;
 	position: relative;min-height: 1212rpx;
+	.grades-terms-bar-icon{z-index: 99;}
 	.grade-item-box{
 		display: flex;flex-wrap: wrap;justify-content: space-evenly;
-		box-sizing: border-box;padding:  calc(270rpx - var(--status-bar-height)) 4% 1%;}
+		box-sizing: border-box;padding:  calc(286rpx - var(--status-bar-height)) 4% 1%;}
 	.grade-item {
 		width: 270rpx;height: 80rpx;line-height: 70rpx;
 		background-image: url("@/static/images/grade/grades-bj.png");@include ezy-no-repeat-cover;

pages/selectGradesTerms/index.vue

@@ -1,9 +1,6 @@
 <template>
 	<view class="grades-terms-page"  @touchmove.stop.prevent>
-		<view class="icon-title-navBar-box">
-			<!-- 返回按钮↓ -->
-			<view class="nav-bar-icon" @click="handleBack"></view>
-		</view>
+		<view class="ezy-nav-bar-icon grades-terms-bar-icon" @click="handleBack"></view>
 		<view class="grade-item-box">
 			<view :key="xueke.id" @click="handleSelectXueke(xueke)" v-for="xueke in xuekeData"
 				:class="['grade-item',{active: xueke.id == activeXueke}]">{{xueke.lable}}</view>

pages/study/index.vue

@@ -165,9 +165,13 @@
 			productTipImg.value = 'static/images/study/yingyu/yingyu-tip.gif'
 			getBj('yingyu');
 		} else if (currentProduct.value == 1 && typeId.value == 1) {
-			// 计算特训
+			// 数学新（计算特训）
 			productTipImg.value = 'static/images/study/jstx/jstx-tip.gif'
 			getBj('shuxueNew');
+		} else if (currentProduct.value == 2 && typeId.value == 1) {
+			// 英语新（超级单词）
+			productTipImg.value = 'static/images/study/jstx/yingyu-tip.gif'
+			getBj('yingyuNew');
 		}
 	}
 
@@ -204,10 +208,15 @@
 					yingyu: 'has'
 				})
 			} else if (currentProduct.value == 1 && typeId.value == 1) {
-				// 英语
+				// 数学新（计算特训）
 				cacheManager.updateObject('dao-tip', {
 					shuxueNew: 'has'
 				})
+			} else if (currentProduct.value == 2 && typeId.value == 1) {
+				// 英语新（超级单词）
+				cacheManager.updateObject('dao-tip', {
+					yingyuNew: 'has'
+				})
 			}
 		} else {
 			//游客

pages/study/product/yingyuNew.vue

@@ -1,10 +1,11 @@
 <template>
-	<view class="ezy-study-page ezy-yingyu-study-page">
+	<view class="ezy-study-page ezy-cjdc-study-page">
 		<view class="study-school-year" @click="clickGradeTerm">{{gradeTerm}}</view>
 		<view class="ezy-study-wrap" @touchstart="onTouchStart" @touchend="onTouchEnd">
 			<img class="study-name-img" :src="growthImg"/>
-			<view></view>
-			<view @click="handleCheckCatalogue" class="chapter-title-box">{{zhangName}}</view>
+			<!-- <img class="study-book-img" :src="bookImg"/> -->
+			<img class="study-book-img" src="@/static/images/study/cjdc/book-default-img.png"/>
+			<view @click="handleCheckCatalogue" :class="getTitleClass(zhangName)">{{zhangName}}</view>
 			<!-- 动物类型 -->
 			<view v-if="growthType!=null" :class="currentGrowth()"></view>
 			<view>
@@ -68,6 +69,7 @@
 	} from '@dcloudio/uni-app';
 	const growthType = ref(null);
 	const growthImg = ref(null);
+	const bookImg = ref(null);
 	const youkeImageBook = ref(null);
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue', 'listClick'])
 	const props = defineProps({
@@ -90,6 +92,8 @@
 	onShow(() => {
 		growthType.value = cacheManager.get('auth')?cacheManager.get('auth').growthType:props.youkeImage
 			growthImg.value = cacheManager.get('auth') ? cacheManager.get('zhangInfo').icon : props.youkeImage;
+			// 待修改  wgy看这
+			bookImg.value = cacheManager.get('auth') ? cacheManager.get('zhangInfo').icon : props.youkeImage;
 			youkeImageBook.value = cacheManager.get('auth') ? cacheManager.get('zhangInfo').zhangIcon : props.youkeImageBook;
 			
 	})
@@ -141,18 +145,16 @@
 			return 'animal-img da-e-img'
 		}
 	}
-	// 章换行显示
-	function getZhangContent(data) {
-		console.log(data.length, 'data.length');
-		let length = data.length;
-		// 初始将字符串平分成两半
-		let halfLength = Math.floor(length / 2);
-
-		// 插入换行符
-		let firstLine = data.slice(0, halfLength);
-		let secondLine = data.slice(halfLength);
-		console.log(firstLine + '\n' + secondLine, 'firstLine + + secondLine');
-		return firstLine + '\n' + secondLine;
+	// 章名称显示显示
+	function getTitleClass(data) {
+		console.log(data.length, 'data.length666');
+		if(data.length <= 5){
+			return 'chapter-title-box'
+		}else if(data.length <= 8){
+			return 'chapter-big-title-box'
+		}else{
+			return 'chapter-last-title-box'
+		}
 	}
 
 	// 获取节class