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

common/styles/global/components.scss

@@ -70,7 +70,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	.tabbar-item{width: 135rpx;height: 144rpx;@include ezy-no-repeat-cover;z-index: 2;}
 }
 .ezy-custom-tabbar::before{
-	content: '';width: 750rpx;height: 100rpx;left: 0;bottom: 0;position: absolute;
+	content: '';width:100%;height: 100rpx;left: 0;right:0;bottom: 0;position: absolute;
 	background-image: url("@/static/images/tabbar/tabbar-bg.png");@include ezy-no-repeat-cover(top);
 }
 

common/styles/global/pages.scss

@@ -237,7 +237,7 @@
 	
 //地图页	
 .ezy-study-page{
-	width:100%;height: 100vh;@include ezy-no-repeat-cover(top);display: flex;flex-direction: column;
+	width:100%;height: 100vh;display: flex;flex-direction: column;
 	box-sizing: border-box;padding-top:var(--status-bar-height);justify-content: center;position: relative;
 	.study-school-year{
 		width: 285rpx;height: 69rpx;line-height:65rpx;background-image: url("@/static/images/study/school-year-bj.png");
@@ -253,7 +253,7 @@
 }
 // 数学
 .ezy-shuxue-study-page{
-	background-color: #43c1f6;background-image: url("@/static/images/study/shuxue/study-shuxue-bj.png");
+	@include ezy-no-repeat-cover(top);background-color: #43c1f6;background-image: url("@/static/images/study/shuxue/study-shuxue-bj.png");
 	
 	.ezy-study-wrap{
 		width:750rpx;height:1394rpx;background-image: url("@/static/images/study/shuxue/study-wrap-bj.gif");
@@ -355,8 +355,8 @@
 
 // 英语
 .ezy-yingyu-study-page{
-	background-image: url("@/static/images/study/yingyu/study-yingyu-bj.png");
-	// .ezy-study-wrap{position: relative;}
+	background-color: #00aeee;
+	@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/study/yingyu/study-yingyu-bj.png");
 	.yingyu-house-box{
 		width: 750rpx;height: 769rpx;@include ezy-no-repeat-cover;position: absolute;
 		top:calc(-100rpx + var(--status-bar-height));
@@ -393,7 +393,7 @@
 	}
 	
 	// brand-item
-	.brand-item{box-sizing: border-box;text-align: center;
+	.brand-item{box-sizing: border-box;text-align: center;z-index: 3;
 	font-weight: 600;position: relative;position: absolute;@include ezy-no-repeat-cover;}
 	.brand-active {
 		.icon-content-box{background-image: url("@/static/images/study/yingyu/dao-item-active.png");}
@@ -420,11 +420,54 @@
 		.brand-lock,.brand-finish-icon{top: 62rpx;right: 200rpx;}
 	}
 	.brand-item.ceshi-brand-item{
-		width: 394rpx;height: 288rpx;top:1200rpx;right:0rpx;left: unset;@include ezy-no-repeat-cover;
+		width: 308rpx;height: 225rpx;top:1250rpx;right:30rpx;left: unset;@include ezy-no-repeat-cover;
 		background-image: url("@/static/images/study/yingyu/test-item.png");
 		.icon-content-box{background-image: unset;}
 		.brand-content{display: none;}
-		.brand-lock,.brand-finish-icon{top: 150rpx;right: 160rpx;}
+		.brand-lock,.brand-finish-icon{top: 120rpx;right: 120rpx;}
+	}
+	
+	@media (max-height: 800px) {
+		min-height:1500rpx;
+		// 0.92
+		.brand-item:nth-child(1){top:540rpx;right:30rpx;}
+		.brand-item:nth-child(2){top:640rpx;left:55rpx;}
+		.brand-item:nth-child(3){top:830rpx;right:110rpx;}
+		.brand-item:nth-child(4){top:960rpx;left:60rpx;}
+		.brand-item.ceshi-brand-item{
+			width: 250rpx;height: 183rpx;top:1050rpx;left: unset;right: 60rpx;
+			.brand-lock,.brand-finish-icon{top: 0;right: 80rpx;}
+		}
+	}
+	@media (max-height: 700px) {
+		min-height:1350rpx;
+		.brand-lock,.brand-finish-icon{width: 50rpx;height: 50rpx;}
+		.brand-lock::before{content: '';width: 26rpx;height: 33rpx;margin-top: 6rpx;}
+		// 0.9
+		.brand-item:nth-child(1){
+			width: 288rpx;height: 218rpx;top:506rpx;right:70rpx;
+			.icon-content-box{top: 150rpx;right: -10rpx;}
+			.brand-lock,.brand-finish-icon{top: 118rpx;right: 70rpx;}
+		}
+		.brand-item:nth-child(2){
+			width: 356rpx;height: 173rpx;top:610rpx;left:65rpx;
+			.icon-content-box{top: 130rpx;right: 112rpx;}
+			.brand-lock,.brand-finish-icon{top: 82rpx;right: 192rpx;}
+		}
+		.brand-item:nth-child(3){
+			width: 346rpx;height: 138rpx;top:770rpx;right:70rpx;
+			.icon-content-box{top: 90rpx;right: -10rpx;}
+			.brand-lock,.brand-finish-icon{top: 48rpx;right: 70rpx;}
+		}
+		.brand-item:nth-child(4){
+			width: 346rpx;height: 182rpx;top:850rpx;left:80rpx;
+			.icon-content-box{top: 130rpx;right: 112rpx;}
+			.brand-lock,.brand-finish-icon{top: 82rpx;right: 192rpx;}
+		}
+		.brand-item.ceshi-brand-item{
+			top:980rpx;left: unset;right:70rpx;
+			.brand-lock,.brand-finish-icon{top: 10rpx;right: 100rpx;}
+		}
 	}
 }
 

pages/study/product/yingyu.vue

@@ -26,7 +26,7 @@
 					</view>
 					<view v-if="isVip !== 'VIP'">
 						<!-- 锁 -->
-						<view class="brand-lock"></view>
+						<view v-if="item.number !='Lesson 1'" class="brand-lock"></view>
 						<!-- 动物类型 -->
 						<view v-if="item.daeFlag && growthType ==0" class="animal-img dan-img"></view>
 						<view v-if="item.daeFlag && growthType ==1" class="animal-img xiao-e-img"></view>