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

common/styles/global/pages.scss

@@ -212,6 +212,7 @@
 			box-sizing: border-box;padding: 0 36rpx;text-align: center;
 			position: absolute;z-index: 3;left: 0;bottom: -22rpx;color: #fff;
 			display: flex;align-items: center;justify-content: center;
+			text{@include multi-line-ellipsis(2);}
 		}
 		
 	}
@@ -512,24 +513,19 @@
 .ezy-jstx-study-page{
 	@include ezy-no-repeat-cover(top);background-color: #43c1f6;background-image: url("@/static/images/study/jstx/study-jstx-bj.png");
 	
-	.ezy-study-wrap{width:750rpx;height:1623rpx;position: relative;
+	.ezy-study-wrap{width:750rpx;height:1394rpx;position: relative;margin-bottom: 100rpx;
 	background-image: url("@/static/images/study/jstx/study-wrap-bj.png");}
-	.study-name-img{width: 120rpx;height: 120rpx;position: absolute;top: 20rpx;}
-	.animal-img{left: 380rpx;top: 290rpx;}
-	.chapter-box{
-		width: 160rpx;text-align: center;font-weight: 800;color: #5c1a11;
-		font-size: 30rpx;position: absolute;top:125rpx;left:316rpx;
-	}
-	.chapter-title-box{
-		width: 330rpx;height: 80rpx;text-align: center;font-weight: 800;color: #fbb030;
-		position: absolute;top:176rpx;left:232rpx;white-space: pre-wrap;
-	}
+	.study-name-img{width: 140rpx;height: 102rpx;position: absolute;top: 136rpx;left: 294rpx;}
 	
 	// brand-content
-	.brand-content{margin: 0 auto;@include single-line-ellipsis;}
+	.brand-content{
+		width: 90%;height:60rpx;margin: 12rpx auto;
+		display: flex;align-items: center;justify-content: center;
+		text{@include multi-line-ellipsis(2);line-height: 1.2;font-weight: normal;}
+	}
 	.brand-icon,.brand-lock,.brand-finish-icon{
 		width: 70rpx;height: 70rpx;@include ezy-no-repeat-cover;
-		position: absolute;top: -50rpx;left: 50%;transform: translateX(-50%);}
+		position: absolute;top: -53rpx;left: 50%;transform: translateX(-50%);}
 	.brand-icon{
 		font-size: 36rpx;font-weight: 600;color: #ff6501;line-height: 70rpx;
 		background-image: url("@/static/images/study/shuxue/number-bj.png");
@@ -551,7 +547,6 @@
 		font-weight: 600;position: relative;position: absolute;@include ezy-no-repeat-cover;
 		background-image: url("@/static/images/study/jstx/dao-item-disabled.png");
 	.brand-arrow{transform: translateX(-50%);}
-	.brand-content{width: 90%;}
 	}
 	.brand-item.brand-active{background-image: url("@/static/images/study/jstx/dao-item-active.png");}
 	.ceshi-brand-item{
@@ -564,10 +559,48 @@
 	.ceshi-brand-item.brand-active{background-image: url("@/static/images/study/shuxue/ceshi-pai-active.png");}
 	
 	// brand-item
-	.brand-item:nth-child(1){top:330rpx;right:70rpx;}
-	.brand-item:nth-child(2){top:540rpx;left:75rpx;}
-	.brand-item:nth-child(3){top:692rpx;right:110rpx;}
-	.brand-item:nth-child(4){top:1085rpx;right:165rpx}
+	.brand-item:nth-child(1){top:500rpx;left:90rpx;}
+	.brand-item:nth-child(2){top:640rpx;right:140rpx;}
+	.brand-item:nth-child(3){top:880rpx;left:160rpx;}
+	.brand-item:nth-child(4){top:1100rpx;right:195rpx}
+	
+	@media (max-height: 800px) {
+		// 0.92
+		.ezy-study-wrap{width: 690rpx;height: 1284rpx;margin-bottom: 70rpx;}
+		.study-name-img{width: 130rpx;height: 95rpx;top: 125rpx;left: 250rpx;}
+		// brand-item
+		.brand-item:nth-child(1){top:450rpx;left:80rpx;}
+		.brand-item:nth-child(2){top:580rpx;right:120rpx;}
+		.brand-item:nth-child(3){top:800rpx;left:140rpx;}
+		.brand-item:nth-child(4){top:1000rpx;right:170rpx}
+		
+	}
+	@media (max-height: 700px) {
+		min-height: 1260rpx;
+		//0.88
+		.ezy-study-wrap{width: 645rpx;height: 1198rpx;margin-bottom: 20rpx;
+		// position: absolute;top: 0;left: 50%;transform: translateX(-50%);
+		}
+		.study-name-img{width: 120rpx;height: 88rpx;top: 120rpx;left: 235rpx;}
+		// brand-item
+		.brand-item:nth-child(1){top:405rpx;left:50rpx;}
+		.brand-item:nth-child(2){top:530rpx;right:100rpx;}
+		.brand-item:nth-child(3){top:730rpx;left:120rpx;}
+		.brand-item:nth-child(4){top:920rpx;right:150rpx}
+	}
+	@media (max-height: 600px) {
+		//0.76
+		min-height:1200rpx;
+		.ezy-study-wrap{width: 577rpx;height: 1072rpx;margin-bottom: 70rpx;
+		// position: relative;transform: unset;top: unset;left: unset;
+		}
+		.study-name-img{width: 100rpx;height: 73rpx;top: 110rpx;left: 215rpx;}
+		// brand-item
+		.brand-item:nth-child(1){top:320rpx;left:-12rpx;}
+		.brand-item:nth-child(2){top:450rpx;right:75rpx;}
+		.brand-item:nth-child(3){top:640rpx;left:110rpx;}
+		.brand-item:nth-child(4){top:810rpx;right:120rpx}
+	}
 }
 
 // 岛弹窗
@@ -849,7 +882,7 @@
 	
 // 我的页面
 .ezy-my-page{
-	width: 100%;height: 100vh;min-height: 1800rpx;background-color: #00c5fe;position: relative;overflow: auto;
+	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;overflow: auto;
 	padding-top:var(--status-bar-height);@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/my/my-page-bj.png");
 	.my-head-box{
 		width: 100%;padding: 80rpx 24rpx 42rpx;box-sizing: border-box;display: flex;align-items: center;color: #fff;
@@ -865,19 +898,11 @@
 	.hyqy-box{
 		width: 731rpx;height: 385rpx;margin: 0 auto;position: relative;
 		@include ezy-no-repeat-cover;
-		.hyqy-btn{width: 154rpx;height: 54rpx;position: absolute;top: 46rpx;right: 46rpx;
-		@include ezy-no-repeat-cover;background-image: url("@/static/images/my/hyqy-btn.png");}
-	}
-	// 1数学 2英语
-	.hyqy-box1{background-image: url("@/static/images/my/hyqy-img1.png");}
-	.hyqy-disabled-box1{background-image: url("@/static/images/my/hyqy-img-disabled1.png");}
-	.hyqy-box2{background-image: url("@/static/images/my/hyqy-img2.png");}
-	.hyqy-disabled-box2{background-image: url("@/static/images/my/hyqy-img-disabled2.png");}
-	// 游客
-	 .yk-disabled-box{background-image: url("@/static/images/my/hyqy-img3.png");}
+		.hyqy-box-img{width: 731rpx;height: 385rpx;margin: 0 auto;display: block;border-radius: 10rpx;}
+	}
 	// list
 	.my-list-box{
-		width:700rpx;margin: 36rpx auto 0;
+		width:700rpx;margin: 36rpx auto 240rpx;
 		.list-row{border-bottom: 2rpx solid #5bcdfb;color: #fff;box-sizing: border-box;padding: 30rpx 20rpx;
 		display: flex;align-items: center;position: relative;}
 		.list-row::after{
@@ -898,24 +923,20 @@
 		.cpsc-icon{background-image: url("@/static/images/my/list-icon9.png");}
 	}
 	@media (max-height: 736px) {
-		min-height: 1500rpx;
 		.my-head-box{padding: 46rpx 24rpx 16rpx;}
 		.my-list-box{
-			margin: 6rpx auto 0;
+			margin: 6rpx auto 260rpx;
 			.list-row{padding: 20rpx;}
 		}
 	}
 	@media (max-height: 600px) {
 		.my-head-box{padding: 42rpx 24rpx 24rpx;}
 		.my-list-box{
-			margin: 12rpx auto 0;
+			margin: 12rpx auto 240rpx;
 			.list-row{padding: 16rpx;font-size: 30rpx;}
 			.list-row::after{right: 16rpx;}
 		}
 	}
-	@media (max-height: 500px) {
-		min-height: 1300rpx;
-	}
 }
 .ezy-my-page::before{
 	content: '';width: 279rpx;height: 250rpx;display:block;

pages/selectGradesTerms/index.vue

@@ -15,7 +15,7 @@
 					<view v-for="item in xuekeList" :key="item.id" :id="`s_${item.id}`"  @click="handleSelectGrade(item)"
 						:class="['subject-item', {active: item.id == activeProduct}]">
 							<img :src="item.cover" class="subject-item-img" />
-							<view class="subject-item-text">{{item.lable}}</view>
+							<view class="subject-item-text"><text>{{item.lable}}</text></view>
 					</view>
 				</view>
 			<!-- </view> -->