tanxue 1 ヶ月 前
コミット
33c6eb5e1e
1 ファイル変更15 行追加9 行削除
  1. 15 9
      common/styles/global/pages.scss

+ 15 - 9
common/styles/global/pages.scss

@@ -185,22 +185,21 @@
 
 // 选择年级和学期
 .grades-terms-page{
-	width:100%;height:100vh;background-color: #43c1f6;box-sizing: border-box;padding-top:var(--status-bar-height);
+	width:100%;height:100vh;background-color: #43c1f6;box-sizing: border-box;
 	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(286rpx - var(--status-bar-height)) 4% 1%;}
+		display: flex;flex-wrap: wrap;justify-content: space-evenly;    
+		box-sizing: border-box;padding: 290rpx 4% 20rpx;}
 	.grade-item {
-		width: 270rpx;height: 80rpx;line-height: 70rpx;
+		width: 270rpx;height: 80rpx;line-height: 70rpx; 
 		background-image: url("@/static/images/grade/grades-bj.png");@include ezy-no-repeat-cover;
 		text-align: center;font-size: 36rpx;color: #fff;font-weight: 800;
 	}
 	.subject-body{
-		width: 100%;height: calc(100vh - 620rpx);overflow-y: auto;
-		display: flex;flex-direction: column;margin: 0 auto;box-sizing: border-box;margin: 80rpx 0 0;
+		width: 100%;height: calc(100vh - 640rpx);overflow-y: auto;
+		display: flex;flex-direction: column;margin: 0 auto;box-sizing: border-box;margin: 76rpx 0 0;
 	}
 	.subject-content-box{
 		width: 750rpx;height: auto;display: flex;flex-direction: row;flex-wrap: wrap;
@@ -221,7 +220,7 @@
 	.subject-item::before{
 		content: '';width: 231rpx;height: 304rpx;z-index: 2;display: block;
 		background-image: url("@/static/images/grade/grades-item.png");@include ezy-no-repeat-cover;
-		position: absolute;top: 5rpx;
+		position: absolute;top: 0;
 	}
 	.subject-item.active::before{background-image: url("@/static/images/grade/grades-item-a.png");}
 	.subject-jstx-item::before{background-image: url("@/static/images/grade/grades-jstx-item.png");}
@@ -239,7 +238,14 @@
 		background-image: url("@/static/images/grade/confirm-btn.png");@include ezy-no-repeat-cover;
 	}
 	.grade-confirm-btn:after{display: none;}
-	
+	// 安卓测试机兼容
+	@media (min-width: 391px)and (max-width: 412px) and (min-height: 844px) and (max-height: 915px) {
+		.grade-item-box{padding: 295rpx 4% 20rpx;}
+	}
+	@media (max-width: 345px)and (min-height: 880px)  {
+		.grade-item-box{padding: 348rpx 4% 32rpx;}
+		.subject-body{width: 100%;height: calc(100vh - 700rpx);}
+	}
 }