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

common/styles/global/components.scss

@@ -171,30 +171,55 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		width: 24rpx;height: 38rpx;content: '';display: block;margin-left: 24rpx;
 		background-image: url("@/static/images/common/navBar-return-btn.png");@include ezy-no-repeat-cover();
 	}
+	&::before{
+		width: 100%;height: 356rpx;content: '';display: block;position: absolute;z-index: 0;top: 0;left: 0;
+		background-image: url("@/static/images/phone/common/page-header-bj.png");@include ezy-no-repeat-cover(top);
+	}
 	/*** pad ***/
 	@include mediaSmall() {
+		padding: calc(6rpx + var(--status-bar-height)) 20rpx 6rpx;
 		.nav-bar-title{font-size: 28rpx;}
+		.nav-bar-icon{width: 65rpx;height: 65rpx;top: calc(6rpx + var(--status-bar-height));}
+		.nav-bar-icon::before{width: 16rpx;height: 25rpx;margin-left: 16rpx;}
+		&::before{height: 160rpx;background-image: url("@/static/images/pad/common/page-header-bj.png");}
 	}
 	@include mediaBig(){
 		.nav-bar-title{font-size: 66rpx;height: 180rpx;line-height: 180rpx;}
+		.nav-bar-icon{width: 180rpx;height: 180rpx;}
+		.nav-bar-icon::before{width: 38rpx;height: 61rpx;margin-left: 38rpx;}
+		&::before{height: 350rpx;}
 	}
 }
-.icon-title-navBar-box::before{
-	width: 100%;height: 356rpx;content: '';display: block;position: absolute;z-index: 0;top: 0;left: 0;
-	background-image: url("@/static/images/phone/common/page-header-bj.png");@include ezy-no-repeat-cover(top);
-	@include mediaSmall() {height: 160rpx;background-image: url("@/static/images/pad/common/page-header-bj.png");}
-	@include mediaBig() {height: 350rpx;}
-}
 // 仅一个返回按钮
-.ezy-nav-bar-icon{width: 100rpx;height: 100rpx;position: absolute;left: 0;top: var(--status-bar-height);}
-.ezy-nav-bar-icon::after{
-	width: 24rpx;height: 38rpx;content: '';display: block;margin: 12rpx 32rpx 12rpx;transform: rotate(180deg);
-	background-image: url("@/static/images/common/h-jt-icon.png");@include ezy-no-repeat-cover();
+.ezy-nav-bar-icon{
+	width: 100rpx;height: 100rpx;position: absolute;left: 0;top: var(--status-bar-height);
+	&::after {
+		width: 24rpx;height: 38rpx;content: '';display: block;margin: 12rpx 32rpx 12rpx;transform: rotate(180deg);
+		background-image: url("@/static/images/common/h-jt-icon.png");@include ezy-no-repeat-cover();
+	}
+	
+	@include mediaSmall() {
+			width: 65rpx;height: 65rpx;
+			&::after {width: 16rpx;height: 25rpx;margin: 8rpx 21rpx 8rpx;}
+		}
+	
+		@include mediaBig() {
+			width: 160rpx;height: 160rpx;
+			&::after {width: 38rpx;height: 61rpx;margin: 19rpx 51rpx 19rpx;}
+		}
 }
 
 /***** 登录按钮 *****/
-.login-btn{width: 655rpx;height: 92rpx;line-height: 92rpx;text-align: center;font-size:32rpx;
-	margin-top: 84rpx;@include ezy-no-repeat-cover;font-weight: bold;}
+.login-btn{
+	width: 655rpx;height: 92rpx;line-height: 92rpx;text-align: center;font-size:32rpx;
+	margin-top: 84rpx;@include ezy-no-repeat-cover;font-weight: bold;
+	@include mediaSmall() {
+		width: 426rpx;height: 60rpx;line-height: 60rpx;font-size: 21rpx;margin-top: 55rpx;
+	}
+	@include mediaBig() {
+		width: 1048rpx;height: 147rpx;line-height: 147rpx;font-size: 51rpx;margin-top: 134rpx;
+	}
+}
 .login-btn-disabled{background-image: url("@/static/images/login/login-btn-bj-disabled.png");color:#999b9a;}
 .login-btn-normal{background-image: url("@/static/images/login/login-btn-bj.png");color:#fff;}
 
@@ -359,6 +384,27 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		content: '';width: 52rpx;height: 52rpx;@include ezy-no-repeat-cover;
 		background-image: url("@/static/images/common/close-icon.png");
 	}
+	
+	@include mediaSmall() {
+		.tip-title{font-size: 24rpx;margin-bottom: 16rpx;}
+		.tip-content{font-size: 20rpx;padding-bottom: 27rpx;}
+		.tip-btn-box{
+			margin: 34rpx 0 0;
+			.not-confirm-btn,.confirm-btn{width: 161rpx;height: 60rpx;line-height: 60rpx;}
+		}
+		.close-btn{width: 65rpx;height: 65rpx;right: 8rpx;top: 8rpx;}
+		.close-btn::after{width: 34rpx;height: 34rpx;}
+	}
+	@include mediaBig() {
+		.tip-title{font-size: 54rpx;margin-bottom: 38rpx;}
+		.tip-content{font-size: 46rpx;padding-bottom: 67rpx;}
+		.tip-btn-box{
+			margin: 83rpx 0 0;
+			.not-confirm-btn,.confirm-btn{width: 397rpx;height: 147rpx;line-height: 147rpx;}
+		}
+		.close-btn{width: 160rpx;height: 160rpx;right: 19rpx;top: 19rpx;}
+		.close-btn::after{width: 83rpx;height: 83rpx;}
+	}
 }
 .tip-small-dialog{
 	.tip-content-box{
@@ -371,6 +417,24 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 			width: 220rpx;height: 82rpx;line-height: 82rpx;margin: 30rpx 20rpx 0;
 		}
 	}
+	@include mediaSmall() {
+		.tip-content-box{width: 406rpx;height: 237rpx;padding: 27rpx 31rpx;}
+		.tip-btn-box{
+			.not-confirm-btn,.confirm-btn{
+				width: 143rpx;height: 53rpx;line-height: 53rpx;margin: 20rpx 13rpx 0;
+				font-size: 20rpx;
+			}
+		}
+	}
+	@include mediaBig() {
+		.tip-content-box{width: 1000rpx;height: 584rpx;padding: 67rpx 77rpx;}
+		.tip-btn-box{
+			.not-confirm-btn,.confirm-btn{
+				width: 352rpx;height: 131rpx;line-height: 131rpx;margin: 48rpx 32rpx 0;
+				font-size: 46rpx;
+			}
+		}
+	}
 }
 .tip-middle-dialog{
 	.tip-content-box{

common/styles/global/pages.scss

@@ -160,7 +160,92 @@
 	}
 	@media (max-height: 550px) {
 		min-height: 1100rpx;
+	}
+	@include mediaSmall() {
+		padding-top: 156rpx;
+		.login-img{width: 177rpx;height: 169rpx;}
+		.login-body-box{margin: 104rpx auto 0;}
+		.phone-input-box{
+			width: 430rpx;height: 79rpx;
+			.phone-prefix {
+			  width: 59rpx;margin-left:12rpx;font-size: 25rpx;
+			  &::after{height: 26rpx;}
+			}
+			.phone-input {font-size: 25rpx;padding: 0 20rpx;}
+			.uni-input-placeholder {font-size: 22rpx;}
+			.close-btn{width: 27rpx;height: 27rpx;margin-right: 20rpx;}
+		}
+
+		.agreement-checkbox-box {
+			  margin-top: 21rpx;margin-left: -27rpx;
+			  .agreement-checkbox-input{width: 52rpx;height: 52rpx;}
+			  .uni-checkbox-input{
+				  width: 52rpx;height: 52rpx;
+			  	svg {width: 12rpx;height: 12rpx;top: 21rpx;left: 31rpx;}
+			  }
+			  .uni-checkbox-input::before{width: 20rpx;height: 20rpx;top: 17rpx;left: 27rpx;}
+			  .agreement-text-box {font-size: 18rpx;}
+		}
 
+		.bottom-btn-box{
+			.bottom-tip{font-size: 18rpx;margin-bottom: 39rpx;}
+			.btn-box{
+				.wx-btn,.yk-btn,.apple-btn{
+					width: 111rpx;font-size: 17rpx;
+					icon{width: 33rpx;height: 27rpx;margin-bottom: 8rpx;}
+				}
+			}
+		}
+	
+		/***** 输入验证码页面*****/
+		.yzm-show{width: 430rpx;font-size: 20rpx;margin: 0 0 16rpx 8rpx;}
+		.yzm-btn{margin-top: 27rpx;}
+		.cxfs-btn{font-size: 20rpx;margin: 39rpx auto 104rpx;}
+		.login-text{
+			width: 430rpx;font-size: 20rpx;margin: 10rpx auto 0;
+		}
+	}
+	@include mediaBig() {
+		padding-top: 384rpx;
+		.login-img{width: 435rpx;height: 416rpx;}
+		.login-body-box{margin: 256rpx auto 0;}
+		.phone-input-box{
+			width: 1059rpx;height: 195rpx;
+			.phone-prefix {
+			  width: 144rpx;margin-left:29rpx;font-size: 61rpx;
+			  &::after{height: 64rpx;}
+			}
+			.phone-input {font-size: 61rpx;padding: 0 48rpx;}
+			.uni-input-placeholder {font-size: 54rpx;}
+			.close-btn{width: 67rpx;height: 67rpx;margin-right: 48rpx;}
+		}
+
+		.agreement-checkbox-box {
+			  margin-top: 51rpx;margin-left: -67rpx;
+			  .agreement-checkbox-input{width: 128rpx;height: 128rpx;}
+			  .uni-checkbox-input{
+				  width: 128rpx;height: 128rpx;
+			  	svg {width: 30rpx;height: 30rpx;top: 51rpx;left: 77rpx;}
+			  }
+			  .uni-checkbox-input::before{width: 50rpx;height: 50rpx;top: 42rpx;left: 67rpx;}
+			  .agreement-text-box {font-size: 45rpx;}
+		}
+
+		.bottom-btn-box{
+			.bottom-tip{font-size: 45rpx;margin-bottom: 96rpx;}
+			.btn-box{
+				.wx-btn,.yk-btn,.apple-btn{
+					width: 272rpx;font-size: 42rpx;
+					icon{width: 80rpx;height: 67rpx;margin-bottom: 19rpx;}
+				}
+			}
+		}
+	
+		/***** 输入验证码页面*****/
+		.yzm-show{width: 1059rpx;font-size: 48rpx;margin: 0 0 38rpx 19rpx;}
+		.yzm-btn{margin-top: 67rpx;}
+		.cxfs-btn{font-size: 48rpx;margin: 96rpx auto 256rpx;}
+		.login-text{width: 1059rpx;font-size: 48rpx;margin: 26rpx auto 0;}
 	}
 }
 // 快捷登录
@@ -236,6 +321,21 @@
 	.confirm-btn{width: 588rpx;height: 92rpx;@include ezy-no-repeat-cover;margin: 42rpx auto 0;
 	background-image: url("@/static/images/login/agree-dialog-btn.png");}
 	.not-confirm-btn{color:#888;font-size: 32rpx;padding: 32rpx 0 0;display: inline-block;}
+	@include mediaSmall() {
+			width: 455rpx;height: 319rpx;padding: 52rpx 0 27rpx;
+			.agree-title{font-size: 24rpx;}
+			.agree-tip{font-size: 20rpx;margin-top: 30rpx;}
+			.confirm-btn{width: 382rpx;height: 60rpx;margin: 27rpx auto 0;}
+			.not-confirm-btn{font-size: 20rpx;padding: 21rpx 0 0;}
+		}
+	
+		@include mediaBig() {
+			width: 1120rpx;height: 784rpx;padding: 128rpx 0 67rpx;
+			.agree-title{font-size: 54rpx;}
+			.agree-tip{font-size: 46rpx;margin-top: 74rpx;}
+			.confirm-btn{width: 941rpx;height: 147rpx;margin: 67rpx auto 0;}
+			.not-confirm-btn{font-size: 56rpx;padding: 46rpx 0 0;}
+		}
 }
 
 // 用户协议详情弹窗
@@ -253,6 +353,17 @@
 	position: absolute;top: 64rpx;right: 44rpx;
 	background-image: url("@/static/images/common/close-icon.png");}
 	.agree-section-box{font-size: 30rpx;line-height: 1.8;overflow: auto;flex: 1;padding: 0 46rpx;word-break: break-all;}
+	@include mediaSmall() {
+		.agree-content-box{margin: 10rpx auto 0;padding: 24rpx 0;}
+		.agree-title{font-size: 22rpx;}
+		.agree-section-box{font-size: 20rpx;padding: 0 24rpx;}
+	}
+	@include mediaBig() {
+		.agree-content-box{margin: 24rpx auto 0;padding: 56rpx 0;}
+		.agree-title{font-size: 54rpx;}
+		.agree-section-box{font-size: 46rpx;padding: 0 56rpx;}
+	}
+
 }
 
 //  选课
@@ -301,11 +412,11 @@
 			border-radius: 6rpx;margin: 0 24rpx 16rpx;padding: 20rpx 20rpx 24rpx;
 			box-shadow: 0 0rpx 4rpx rgba(100, 159, 241, 0.3);
 			.card-head-box{
-				.head-img{width: 100rpx;height: 140rpx;border-radius: 8rpx;}
+				.head-img{width: 110rpx;height: 154rpx;border-radius: 8rpx;}
 				.head-right-box{
 					margin-left: 16rpx;
 					.head-title{font-size: 22rpx;margin-bottom: 12rpx;}
-					.head-content{font-size: 18rpx;margin-bottom: 6rpx;line-height: 1.8;@include multi-line-ellipsis(2);}
+					.head-content{font-size: 20rpx;margin-bottom: 6rpx;line-height: 1.8;@include multi-line-ellipsis(2);}
 				}
 			}
 			.card-body-box{
@@ -333,17 +444,18 @@
 				.head-img{width: 240rpx;height: 336rpx;border-radius: 16rpx;}
 				.head-right-box{
 					margin-left: 42rpx;
-					.head-title{font-size: 52rpx;margin-bottom: 12rpx;}
-					.head-content{font-size: 42rpx;margin-bottom: 6rpx;line-height: 1.8;@include multi-line-ellipsis(2);}
+					.head-title{font-size: 54rpx;margin-bottom: 12rpx;}
+					.head-content{font-size: 46rpx;margin-bottom: 6rpx;line-height: 1.8;@include multi-line-ellipsis(2);}
 				}
 			}
 			.card-body-box{
 				border-top: 4rpx dashed #ddd;margin-top: 36rpx;
 				.body-title{margin: 32rpx 0 24rpx;font-size: 46rpx;}
 				.dj-item{
-					width: 280rpx;height: 128rpx;line-height: 128rpx;font-size: 52rpx;margin: 16rpx 27rpx 16rpx 0;
+					width: 280rpx;height: 128rpx;line-height: 128rpx;font-size: 52rpx;margin: 16rpx 32rpx 16rpx 0;
 				}
-				.dj-item:nth-child(3n) {margin-right: 27rpx;}
+				.dj-item:nth-child(3n) {margin-right: 32rpx;}
+				.dj-item:nth-child(6n) {margin-right: 0;}
 			}
 		}
 		.sx-card-box::before{width:640rpx;height: 606rpx;top: -240rpx;left:-200rpx;}
@@ -1118,7 +1230,7 @@
 			img{max-width: 100%;    margin: 0 auto;display: block;}
 			}
 		.fx-btn-row{
-			flex-shrink: 0;display: flex;justify-content: space-between;padding: 24rpx;
+			flex-shrink: 0;display: flex;align-items: center;justify-content: space-between;padding: 24rpx;
 			box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.6);box-sizing: border-box;background-color: #f9f9f9;
 			.fx-btn{
 				width:200rpx;
@@ -1134,6 +1246,26 @@
 			}
 		}
 	}
+	@include mediaSmall() {
+		.shop-info-body{
+			.fx-btn-row{
+				padding: 16rpx;box-shadow: 0 5rpx 16rpx rgba(0, 0, 0, 0.6);
+				.fx-btn{width: 130rpx;}
+				.fx-icon{width: 28rpx;height: 25rpx;margin-bottom: 4rpx;}
+				.bmxx-btn{width: 313rpx;height: 57rpx;line-height: 57rpx;font-size: 21rpx;}
+			}
+		}
+	}
+	@include mediaBig() {
+		.shop-info-body{
+			.fx-btn-row{
+				padding: 36rpx;box-shadow: 0 12rpx 36rpx rgba(0, 0, 0, 0.6);
+				.fx-btn{width: 300rpx;}
+				.fx-icon{width: 65rpx;height: 57rpx;margin-bottom: 9rpx;}
+				.bmxx-btn{width: 722rpx;height: 132rpx;line-height: 132rpx;font-size: 48rpx;}
+			}
+		}
+	}
 }
 
 // 确认订单