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

common/styles/global/components.scss

@@ -735,6 +735,34 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	}
 	.share-close{width: 360rpx;height: 70rpx;line-height: 70rpx;background-color: #fff;border: 1rpx solid #3fd2a1;
 		color: #3fd2a1;text-align: center;border-radius: 8rpx;margin: 32rpx auto 0;border-radius: 35rpx;}
+	
+	@include mediaSmall() {
+			padding: 21rpx;
+	
+			.share-title{font-size: 22rpx;margin-bottom: 23rpx;}
+			.close-btn{width: 65rpx;height: 65rpx;}
+			.close-btn::after{width: 23rpx;height: 23rpx;}
+			.share-list{margin: 27rpx 0;}
+			.share-item{
+				.share-icon{width: 52rpx;height: 52rpx;margin-bottom: 10rpx;}
+				.share-text{font-size: 20rpx;}
+			}
+			.share-close{width: 234rpx;height: 46rpx;line-height: 46rpx;border-radius: 23rpx;margin: 21rpx auto 0;}
+		}
+	
+		@include mediaBig() {
+			padding: 51rpx;
+	
+			.share-title{font-size: 54rpx;margin-bottom: 58rpx;}
+			.close-btn{width: 160rpx;height: 160rpx;}
+			.close-btn::after{width: 58rpx;height: 58rpx;}
+			.share-list{margin: 67rpx 0;}
+			.share-item{
+				.share-icon{width: 128rpx;height: 128rpx;margin-bottom: 16rpx;}
+				.share-text{font-size: 46rpx;}
+			}
+			.share-close{width: 576rpx;height: 112rpx;line-height: 112rpx;border-radius: 56rpx;margin: 51rpx auto 0;}
+		}
 }
 
 // 遮盖层

common/styles/global/pages.scss

@@ -2,7 +2,7 @@
 // 课程完成
 .course-finish-dialog{
 	width: 750rpx;height: 1250rpx;@include ezy-no-repeat-cover;
-	background-image: url("@/static/images/common/exam/video-finish-bj.png");
+	background-image: url("@/static/images/phone/common/video-finish-bj.png");
 	margin-bottom: 20%;position: relative;
 	.text-score{display: none;}
 	.return-btn,.continue-btn{width: 115.38rpx;height: 135rpx;@include ezy-no-repeat-cover;margin: 0 36rpx;}
@@ -11,16 +11,16 @@
 	.continue-btn{background-image: url("@/static/images/common/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;}
-		}
+		width: 749rpx;height: 1078rpx;margin:0 auto 20%;
+		background-image: url("@/static/images/pad/common/video-finish-bj.png");
+		.return-btn,.continue-btn{width: 95rpx;height: 108rpx;margin: 0 23rpx;}
+		.course-btn-box{bottom: 200rpx;}
+	}
 
 	@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;}
+		width: 1870rpx;height: 2496rpx;margin-bottom: 20%;
+		.return-btn,.continue-btn{width: 240rpx;height: 276rpx;margin: 0 58rpx;}
+		.course-btn-box{bottom: 480rpx;}
 	}
 }
 
@@ -503,8 +503,8 @@
 				.dj-item:nth-child(6n) {margin-right: 0;}
 			}
 		}
-		.sx-card-box::before{width:300rpx;height: 284rpx;top: -120rpx;left:-100rpx;}
-		.sx-card-box::after{width: 120rpx;height: 114rpx;bottom: -25rpx;right:-30rpx;}
+		.sx-card-box::before{width: 325rpx;height: 307rpx;top: -78rpx;left: -91rpx;}
+		.sx-card-box::after{width: 182rpx;height: 172rpx;bottom: -42rpx;right: -42rpx;}
 	}
 	@include mediaBig() {
 		padding-bottom: 180rpx;
@@ -530,8 +530,8 @@
 				.dj-item:nth-child(6n) {margin-right: 0;}
 			}
 		}
-		.sx-card-box::before{width:640rpx;height: 606rpx;top: -240rpx;left:-200rpx;}
-		.sx-card-box::after{width: 280rpx;height: 265rpx;bottom: -50rpx;right:-60rpx;}
+		.sx-card-box::before{width: 800rpx;height: 757rpx;top: -192rpx;left: -224rpx;}
+		.sx-card-box::after{width: 448rpx;height: 424rpx;bottom: -64rpx;right: -96rpx;}
 	}
 }
 
@@ -1810,15 +1810,16 @@
 	.order-scroll-view{overflow-y: auto;}
 	.order-body{padding: 0;}
 	.order-card-box{
-		border-radius: 16rpx;margin: 32rpx 24rpx 0;padding: 24rpx;
-		box-shadow: 0 0rpx 6rpx rgba(100, 159, 241, 0.3);
+		border-radius: 16rpx;margin: 32rpx 24rpx 0;padding: 24rpx;overflow: hidden;
+		box-shadow: 0 0rpx 6rpx rgba(100, 159, 241, 0.3);position: relative;
 		.card-head-box{
-			display: flex;align-items: center;justify-content: space-between;line-height: 1.6;
+			display: flex;align-items: center;justify-content: space-between;
+			line-height: 1.6;position: relative;z-index: 4;
 			.head-name{font-size: 30rpx;color: #333;font-weight: bold;}
 			.head-status{font-size: 28rpx;color: #666;}
 		}
 		.card-body-box{
-			display: flex;margin-top: 16rpx;
+			display: flex;margin-top: 16rpx;position: relative;z-index: 4;
 			.order-img{width: 200rpx;height: 280rpx;flex-shrink: 0;border-radius: 16rpx;}
 			.body-right-box{
 				margin-left: 24rpx;flex: 1;
@@ -1829,6 +1830,63 @@
 			}
 		}
 	}
+	.order-card-box::before,.order-card-box::after{
+		content: '';@include ezy-no-repeat-cover;
+		position: absolute;z-index: 3;opacity: 0.7;
+		}
+	.order-card-box::before{width: 500rpx;height: 473rpx;background-image: url("@/static/images/common/xk-mask-img1.png");top: -120rpx;left:-140rpx;}
+	.order-card-box::after{background-image: url("@/static/images/common/xk-mask-img2.png");width: 280rpx;height: 265rpx;bottom: -40rpx;right:-60rpx;}
+	@include mediaSmall() {
+		.order-card-box{
+			border-radius: 10rpx;margin: 21rpx 16rpx 0;padding: 16rpx;
+			box-shadow: 0 0rpx 4rpx rgba(100, 159, 241, 0.3);
+
+			.card-head-box{
+				.head-name{font-size: 20rpx;}
+				.head-status{font-size: 18rpx;}
+			}
+			.card-body-box{
+				margin-top: 10rpx;
+				.order-img{width: 130rpx;height: 182rpx;border-radius: 10rpx;}
+				.body-right-box{
+					margin-left: 16rpx;
+					.body-title{font-size: 22rpx;margin-bottom: 21rpx;}
+					.taocan-text{font-size: 18rpx;margin-bottom: 16rpx;}
+					.tip-text{font-size: 18rpx;margin-bottom: 16rpx;}
+					.money-text{font-size: 28rpx;}
+				}
+			}
+		}
+		.order-card-box::before{width: 325rpx;height: 307rpx;top: -78rpx;left: -91rpx;}
+		.order-card-box::after{width: 182rpx;height: 172rpx;bottom: -26rpx;right: -39rpx;}
+	}
+	
+	@include mediaBig() {
+		.order-card-box{
+			border-radius: 26rpx;
+			margin: 51rpx 38rpx 0;
+			padding: 38rpx;
+			box-shadow: 0 0rpx 10rpx rgba(100, 159, 241, 0.3);
+
+			.card-head-box{
+				.head-name{font-size: 48rpx;}
+				.head-status{font-size: 45rpx;}
+			}
+			.card-body-box{
+				margin-top: 26rpx;
+				.order-img{width: 320rpx;height: 448rpx;border-radius: 26rpx;}
+				.body-right-box{
+					margin-left: 38rpx;
+					.body-title{font-size: 54rpx;margin-bottom: 51rpx;}
+					.taocan-text{font-size: 46rpx;margin-bottom: 38rpx;}
+					.tip-text{font-size: 46rpx;margin-bottom: 38rpx;}
+					.money-text{font-size: 68rpx;}
+				}
+			}
+		}
+		.order-card-box::before{width: 800rpx;height: 757rpx;top: -192rpx;left: -224rpx;}
+		.order-card-box::after{width: 448rpx;height: 424rpx;bottom: -64rpx;right: -96rpx;}
+	}
 }
 
 // 产品商城
@@ -1836,16 +1894,23 @@
 	width: 100%;height: 100vh;display: flex;flex-direction: column;
 	.shop-card-list{overflow-y: auto;flex: 1;padding: 12rpx 0 0;}
 	.shop-card-box{
-		border-radius: 16rpx;margin: 0 24rpx 32rpx;padding: 32rpx;
-		box-shadow: 0 0rpx 6rpx rgba(100, 159, 241, 0.3);display: flex;
-		.shop-img{width: 200rpx;height: 280rpx;flex-shrink: 0;border-radius: 16rpx;}
+		border-radius: 16rpx;margin: 0 24rpx 32rpx;padding: 32rpx;position: relative;
+		box-shadow: 0 0rpx 6rpx rgba(100, 159, 241, 0.3);display: flex;overflow: hidden;
+		.shop-img{width: 200rpx;height: 280rpx;flex-shrink: 0;border-radius: 16rpx;position: relative;z-index: 4;}
 		.card-right-box{
-			margin-left: 24rpx;display: flex;flex-direction: column;justify-content: space-between;
+			margin-left: 24rpx;position: relative;z-index: 4;
+			display: flex;flex-direction: column;justify-content: space-between;
 			.card-title{font-size: 34rpx;color: #333;font-weight: bold;margin-bottom: 24rpx;margin-top: 6rpx;}
 			.card-content{font-size: 28rpx;color: #666;text-align: justify;margin-bottom: 24rpx;@include multi-line-ellipsis(3);line-height: 1.6;}
 			.card-price{font-size: 34rpx;color: #ff0202;font-weight: bolder;}
 		}
 	}
+	.shop-card-box::before,.shop-card-box::after{
+		content: '';@include ezy-no-repeat-cover;
+		position: absolute;z-index: 3;opacity: 0.7;
+		}
+	.shop-card-box::before{width: 500rpx;height: 473rpx;background-image: url("@/static/images/common/xk-mask-img1.png");top: -120rpx;left:-140rpx;}
+	.shop-card-box::after{background-image: url("@/static/images/common/xk-mask-img2.png");width: 280rpx;height: 265rpx;bottom: -40rpx;right:-60rpx;}
 
 	@include mediaSmall() {
 		.shop-card-list{padding: 4rpx 0 0;}
@@ -1860,6 +1925,8 @@
 				.card-price{font-size: 22rpx;}
 			}
 		}
+		.shop-card-box::before{width: 325rpx;height: 307rpx;top: -78rpx;left: -91rpx;}
+		.shop-card-box::after{width: 182rpx;height: 172rpx;bottom: -26rpx;right: -39rpx;}
 	}
 	@include mediaBig() {
 		.shop-card-list{padding: 42rpx 0 0;}
@@ -1874,6 +1941,8 @@
 				.card-price{font-size: 54rpx;}
 			}
 		}
+		.shop-card-box::before{width: 800rpx;height: 757rpx;top: -192rpx;left: -224rpx;}
+		.shop-card-box::after{width: 448rpx;height: 424rpx;bottom: -64rpx;right: -96rpx;}
 	}
 }
 

pages/login/index.vue

@@ -118,6 +118,11 @@
 	} = useVersionUpdate()
 
 	onLoad((options) => {
+		/* 设备信息打印
+		const info = uni.getSystemInfoSync()
+		console.log('窗口宽度（逻辑像素）:', info.windowWidth)
+		console.log('设备像素比 DPR:', info.pixelRatio)
+		console.log('物理分辨率宽:', info.windowWidth * info.pixelRatio) */
 		showAppleLogin.value = isIOS13OrAbove();
 		getLoginInit()
 		getUUid()