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

common/styles/global/components.scss

@@ -443,6 +443,17 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	}
 	.tip-content{padding-bottom: 42rpx;}
 	.tip-btn-box{margin: 32rpx 0 0;}
+	@include mediaSmall() {
+		.tip-content-box{width: 406rpx;height: 275rpx;padding: 27rpx 31rpx;}
+		.tip-content{padding-bottom: 27rpx;}
+		.tip-btn-box{margin: 21rpx 0 0;}
+	}
+
+	@include mediaBig() {
+		.tip-content-box{width: 1000rpx;height: 677rpx;padding: 67rpx 77rpx;}
+		.tip-content{padding-bottom: 67rpx;}
+		.tip-btn-box{margin: 51rpx 0 0;}
+	}
 }
 .tip-big-dialog{
 	.tip-content-box{
@@ -450,6 +461,15 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		background-image: url("@/static/images/common/tip-big-bj.png");
 	}
 	.tip-content{min-height: 240rpx;text-align: justify;}
+	@include mediaSmall() {
+		.tip-content-box{width: 406rpx;height: 337rpx;padding: 27rpx 31rpx;}
+		.tip-content{min-height: 156rpx;}
+	}
+
+	@include mediaBig() {
+		.tip-content-box{width: 1000rpx;height: 830rpx;padding: 67rpx 77rpx;}
+		.tip-content{min-height: 384rpx;}
+	}
 }
 // 一个确认按钮的弹窗
 .small-one-button-dialog{
@@ -598,6 +618,15 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		margin: 0 auto 32rpx;
 		background-image: url("@/static/images/xuexi/dialog-e-img2.png");
 	}
+	@include mediaSmall() {
+		font-size: 22rpx;
+		icon{width: 142rpx;height: 156rpx;margin: 0 auto 21rpx;}
+	}
+	
+	@include mediaBig() {
+		font-size: 54rpx;
+		icon{width: 350rpx;height: 384rpx;margin: 0 auto 51rpx;}
+	}
 }
 
 // 分享

common/styles/global/pages.scss

@@ -10,6 +10,18 @@
 	.return-btn{background-image: url("@/static/images/exam/fh-btn.png");}
 	.continue-btn{background-image: url("@/static/images/exam/jx-btn.png");}
 	@media (max-height: 600px) {margin-bottom: 40%;}
+	@include mediaSmall() {
+			width: 488rpx;height: 813rpx;margin:0 auto 20%;
+			.return-btn,.continue-btn{width: 75rpx;height: 88rpx;margin: 0 23rpx;}
+			.course-btn-box{bottom: 130rpx;}
+		}
+	
+	@include mediaBig() {
+		width: 1200rpx;height: 2000rpx;margin-bottom: 20%;
+		
+		.return-btn,.continue-btn{width: 185rpx;height: 216rpx;margin: 0 58rpx;}
+		.course-btn-box{bottom: 320rpx;}
+	}
 }
 
 // 绑定手机号弹窗
@@ -262,6 +274,27 @@
 			flex-shrink: 0;margin-left: 16rpx;color: #fff;font-size: 34rpx;
 		}
 	}
+	@include mediaSmall() {
+		.yzm-row{
+			width: 430rpx;margin: 23rpx 0 0;
+				.phone-input-box{border-radius: 18rpx;}
+				.yzm-text-btn{
+					width: 163rpx;height: 76rpx;line-height: 76rpx;
+					border-radius: 18rpx;margin-left: 10rpx;font-size: 22rpx;
+				}
+		}
+	}
+	@include mediaBig() {
+		.yzm-row{
+			width: 1059rpx;
+			margin: 58rpx 0 0;
+				.phone-input-box{border-radius: 45rpx;}
+				.yzm-text-btn{
+					width: 400rpx;height: 192rpx;line-height: 192rpx;
+					border-radius: 45rpx;margin-left: 26rpx;font-size: 54rpx;
+				}
+			}
+	}
 
 	/* .tel-input{
 		width: 662rpx;height: 100rpx;border: 1rpx solid #dfdfdf;border-radius: 16rpx;
@@ -510,7 +543,7 @@
 		background-color: #fff;flex: 1;overflow-y: auto;padding-bottom: 32rpx;
 		.xbb-item-box{
 			width: 731rpx;height:273rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/xuanke/xbb-item-bj.png");
+			background-image: url("@/static/images/phone/xuanke/xbb-item-bj.png");
 			position: relative;z-index: 1;box-sizing: border-box;padding: 26rpx 36rpx;
 			display: flex;align-items: center;margin:0 auto 16rpx;flex-shrink: 0;
 		}
@@ -526,7 +559,7 @@
 			position: absolute;bottom: 12rpx;right: 12rpx;
 		&::before{
 				content: '';width: 46rpx;height: 48rpx;display: block;
-				background-image: url("@/static/images/xuanke/xbb-item-jt.png");@include ezy-no-repeat-cover;
+				background-image: url("@/static/images/common/xbb-item-jt.png");@include ezy-no-repeat-cover;
 			}
 		}
 	}
@@ -534,14 +567,15 @@
 	@include mediaSmall() {
 			.xbb-list-box{
 				padding-bottom: 21rpx;
-				.xbb-item-box{width: 720rpx;height: 180rpx;padding: 17rpx 23rpx;margin: 0 auto 10rpx;}
+				.xbb-item-box{width: 717rpx;height: 178rpx;padding: 17rpx 23rpx;margin: 0 auto 10rpx;
+				background-image: url("@/static/images/pad/xuanke/xbb-item-bj.png");}
 				.item-img-box{width: 117rpx;height: 143rpx;border-radius: 8rpx;margin-right: 21rpx;}
 				.item-content-box{
 					.item-name{font-size: 22rpx;margin-bottom: 10rpx;}
 					.item-bb{font-size: 20rpx;}
 				}
 				.item-play-btn{
-					width: 65rpx;height: 65rpx;bottom: 8rpx;right: 8rpx;
+					width: 65rpx;height: 65rpx;bottom: 20rpx;right: 24rpx;
 					&::before{width: 30rpx;height: 31rpx;@include ezy-no-repeat-contain;}
 				}
 			}
@@ -550,14 +584,14 @@
 		@include mediaBig() {
 			.xbb-list-box{
 				padding-bottom: 51rpx;
-				.xbb-item-box{width: auto;height: 437rpx;padding: 42rpx 58rpx;margin: 0 42rpx 26rpx;}
+				.xbb-item-box{width: 1964rpx;height: 488rpx;padding: 42rpx 58rpx;margin: 0 42rpx 26rpx;}
 				.item-img-box{width: 288rpx;height: 352rpx;border-radius: 19rpx;margin-right: 51rpx;}
 				.item-content-box{
 					.item-name{font-size: 54rpx;margin-bottom: 26rpx;}
 					.item-bb{font-size: 46rpx;}
 				}
 				.item-play-btn{
-					width: 160rpx;height: 160rpx;bottom: 19rpx;right: 19rpx;
+					width: 160rpx;height: 160rpx;bottom: 40rpx;right: 60rpx;
 					&::before{width: 74rpx;height: 77rpx;}
 				}
 			}
@@ -680,9 +714,8 @@
 				}
 		}
 		.card-progress-box{
-			display: flex;align-items: center;
+			display: flex;align-items: center;margin-top: 10rpx;
 			.xx-progress-box{flex: 1;margin-right: 64rpx;color: #fff;font-size: 28rpx;}
-			.progress-title{margin-top: 16rpx;}
 			.xx-progress{border-radius: 40rpx;overflow: hidden;margin-top: 10rpx;}
 			.jxxx-btn{
 				width: 177rpx;height: 89rpx;@include ezy-no-repeat-cover;margin-right: 24rpx;
@@ -738,7 +771,7 @@
 		.xx-item-title{text-align: center;margin: 32rpx 0;font-size: 32rpx;color: #444;}
 		.xx-more-btn{
 			width: 630rpx;height: 89rpx;@include ezy-no-repeat-cover;margin: 0 auto 32rpx;
-			background-image: url("@/static/images/xuexi/more-btn.png");
+			background-image: url("@/static/images/phone/xuexi/more-btn.png");
 		}
 
 		.xx-item-box{
@@ -746,7 +779,7 @@
 			display: flex;align-items: center;justify-content: space-between;color: #4b4b4b;;
 			margin: 0 auto 24rpx;box-sizing: border-box;padding: 20rpx;border-radius: 12rpx;
 			line-height: 1.5;font-size: 32rpx;position: relative;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/common/xuexi/xx-ml-bj.png");
+			background-image: url("@/static/images/phone/xuexi/xx-ml-bj.png");
 			img{width: 120rpx;height: 120rpx;border-radius: 12rpx;margin-right: 24rpx;}
 			.xx-item-status{
 				width: 89rpx;height: 87rpx;@include ezy-no-repeat-cover;
@@ -759,7 +792,7 @@
 			.xx-item-lock-btn{background-image: url("@/static/images/common/xuexi/xx-ml-lock-icon.png");}
 		}
 		.xx-disabled-item-box{
-			background-image: url("@/static/images/common/xuexi/xx-ml-disabled-bj.png");
+			background-image: url("@/static/images/phone/xuexi/xx-ml-disabled-bj.png");
 		}
 	}
 
@@ -781,7 +814,7 @@
 		.xuexi-page-body{padding:0 0 65rpx;}
 		.xxjl-card-box-padding{padding-top: 42rpx;}
 		.item-dy-box{margin-bottom: 16rpx;
-			.dy-left-box{width: 135rpx;height: 71rpx;font-size: 42rpx;padding:0 16rpx;
+			.dy-left-box{width: 135rpx;height: 71rpx;font-size: 42rpx;padding:0 24rpx;
 			background-image: url("@/static/images/pad/xuexi/xx-ml-left.png");}
 			.dy-left-box::after{width: 21rpx;height: 22rpx;}
 			.dy-right-box{
@@ -805,7 +838,7 @@
 				}
 			}
 			.card-progress-box{
-				position: absolute;bottom: 12rpx;left:140rpx;right: 10rpx;
+				position: absolute;bottom: 12rpx;left:140rpx;right: 10rpx;margin-top: 0;
 				.xx-progress-box{margin-right: 42rpx;font-size: 18rpx;}
 				.xx-progress{margin-top: 0;}
 				.progress-title{display: none;}
@@ -827,12 +860,18 @@
 		.xx-item-list{
 			padding-bottom: 16rpx;
 			.xx-item-title{margin: 20rpx 0;font-size: 20rpx;}
-			.xx-more-btn{width: 410rpx;height: 58rpx;margin: 0 auto 21rpx;}
-			.xx-item-box{width: 715rpx;height: 92rpx;margin: 0 auto 16rpx;padding: 10rpx;border-radius: 12rpx;font-size: 21rpx;
+			.xx-more-btn{width: 676rpx;height: 65rpx;margin: 0 auto 21rpx;
+			background-image: url("@/static/images/pad/xuexi/more-btn.png");}
+			.xx-item-box{
+				width: 718rpx;height: 92rpx;margin: 0 auto 16rpx;padding: 10rpx;border-radius: 12rpx;font-size: 21rpx;
+				background-image: url("@/static/images/pad/xuexi/xx-ml-bj.png");
 				img{width: 72rpx;height: 72rpx;border-radius: 8rpx;margin-right: 16rpx;}
 				.xx-item-status{width: 58rpx;height: 57rpx;top:1rpx;}
 				.xx-item-btn,.xx-item-lock-btn{width: 50rpx;height: 50rpx;margin-right: 12rpx;}
 			}
+			.xx-disabled-item-box{
+				background-image: url("@/static/images/pad/xuexi/xx-ml-disabled-bj.png");
+			}
 		}
 		.xx-next-btn{width: 426rpx;height: 60rpx;line-height: 60rpx;margin: 21rpx auto;font-size: 21rpx;}
 		.xx-xw-text{font-size: 21rpx;margin: 21rpx auto;}
@@ -844,7 +883,7 @@
 		.xxjl-card-box-padding{padding-top: 102rpx;}
 		.item-dy-box{
 			margin-bottom: 38rpx;
-			.dy-left-box{width: 363rpx;height: 194rpx;font-size: 102rpx;padding:0 38rpx;}
+			.dy-left-box{width: 363rpx;height: 194rpx;font-size: 102rpx;padding:0 64rpx;}
 			.dy-left-box::after{width: 51rpx;height: 54rpx;}
 			.dy-right-box{
 				width: 1577rpx;height: 194rpx;padding:0 38rpx;font-size: 46rpx;
@@ -893,8 +932,8 @@
 		.xx-item-list{
 			padding-bottom: 38rpx;
 			.xx-item-title{margin: 51rpx 0;font-size: 46rpx;}
-			.xx-more-btn{width: 1008rpx;height: 142rpx;margin: 0 auto 51rpx;}
-			.xx-item-box{width: 1940rpx;height: 220rpx;margin: 0 auto 38rpx;padding: 32rpx;border-radius: 19rpx;font-size: 46rpx;
+			.xx-more-btn{width: 1880rpx;height: 182rpx;margin: 0 auto 51rpx;}
+			.xx-item-box{width: 1950rpx;height: 253rpx;margin: 0 auto 38rpx;padding: 32rpx;border-radius: 19rpx;font-size: 46rpx;
 			img{width: 192rpx;height: 192rpx;border-radius: 19rpx;margin-right: 38rpx;}
 			.xx-item-status{width: 142rpx;height: 139rpx;top:3rpx;}
 			.xx-item-btn,.xx-item-lock-btn{width: 123rpx;height: 123rpx;margin-right: 19rpx;}
@@ -1065,6 +1104,35 @@
 		.dycs-fenshu-box{margin: 46rpx auto;}
 		.dycs-btn-box{margin-top: 36rpx;}
 	}
+	@include mediaSmall() {
+		.dycs-img{width: 280rpx;height: 228rpx;margin: 16% auto 21rpx;}
+		.dycs-tip{font-size: 22rpx;}
+		.dycs-fenshu-box{
+			width: 364rpx;margin: 47rpx auto;padding: 27rpx 21rpx;border-radius: 8rpx;font-size: 22rpx;
+			.fenshu-item-box{font-size: 22rpx;}
+			.item-number{font-size: 36rpx;margin-bottom: 6rpx;}
+			.item-line{height: 78rpx;}
+		}
+		.dycs-btn-box{
+			margin-top: 42rpx;
+			.cxcs-btn,.ckda-btn{width: 179rpx;height: 57rpx;line-height: 57rpx;font-size: 22rpx;margin: 0 6rpx;}
+		}
+	}
+	
+	@include mediaBig() {
+		.dycs-img{width: 688rpx;height: 560rpx;margin: 20% auto 51rpx;}
+		.dycs-tip{font-size: 54rpx;}
+		.dycs-fenshu-box{
+			width: 896rpx;margin: 115rpx auto;padding: 67rpx 51rpx;border-radius: 19rpx;font-size: 54rpx;
+			.fenshu-item-box{font-size: 54rpx;}
+			.item-number{font-size: 90rpx;margin-bottom: 16rpx;}
+			.item-line{height: 192rpx;}
+		}
+		.dycs-btn-box{
+			margin-top: 102rpx;
+			.cxcs-btn,.ckda-btn{width: 440rpx;height: 141rpx;line-height: 141rpx;font-size: 54rpx;margin: 0 16rpx;}
+		}
+	}
 }
 
 // 成绩页