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

common/styles/global/components.scss

@@ -1,40 +1,40 @@
 /******************** 这里放组件样式 ********************/
-/**************** 系统响应式 ****************/
-@mixin mediaSmall() {
-  @media screen and (min-width: 650px) {
-    @content;
-  }
-}
-
-@mixin mediaMiddle() {
-  @media screen and (min-width: 820px) {
-    @content;
-  }
-}
-
-@mixin mediaBig() {
-  @media screen and (min-width: 1024px) {
-    @content;
-  }
-}
-
-// pad上隐藏 (大于650的) vue中使用
-  @media screen and (min-width: 650px) {
-    .ezy-hidden-pad{display: none!important;}
-  }
-
-// 手机上隐藏 (小于650的) vue中使用
-  @media screen and (max-width: 649px) {
-    .ezy-hidden-phone{display: none!important;}
+/**************** 系统响应式 ****************/
+@mixin mediaSmall() {
+  @media screen and (min-width: 650px) {
+    @content;
   }
-  
+}
+
+@mixin mediaMiddle() {
+  @media screen and (min-width: 820px) {
+    @content;
+  }
+}
+
+@mixin mediaBig() {
+  @media screen and (min-width: 1024px) {
+    @content;
+  }
+}
+
+// pad上隐藏 (大于650的) vue中使用
+  @media screen and (min-width: 650px) {
+    .ezy-hidden-pad{display: none!important;}
+  }
+
+// 手机上隐藏 (小于650的) vue中使用
+  @media screen and (max-width: 649px) {
+    .ezy-hidden-phone{display: none!important;}
+  }
+
   // 对于Pad上隐藏的元素 ---scss中使用
   @mixin hideOnPad() {
      @media screen and (min-width: 650px) {
          display: none !important;
        }
   }
-  
+
   // 对于手机上隐藏的元素 ---scss media中使用
   @mixin hideOnPhone() {
       @media screen and (max-width: 649px) {
@@ -197,12 +197,12 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		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;}
@@ -220,8 +220,8 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		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;}
+.login-btn-disabled{background-image: url("@/static/images/common/login/login-btn-bj-disabled.png");color:#999b9a;}
+.login-btn-normal{background-image: url("@/static/images/common/login/login-btn-bj.png");color:#fff;}
 
 /***** 试题 *****/
 // 标题
@@ -384,7 +384,7 @@ $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;}
@@ -496,10 +496,10 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		width: 100%;text-align: center;font-size: 30rpx;color: #9e9e9f;
 		margin-top: 16rpx;
 	}
-	
+
 	@include mediaSmall() {
 			width: 406rpx;height: 337rpx;padding: 27rpx 31rpx;
-	
+
 			.close-btn{width: 65rpx;height: 65rpx;right: 8rpx;top: 8rpx;}
 			.close-btn::after{width: 34rpx;height: 34rpx;}
 			.e-img{height: 156rpx;margin: 27rpx auto 16rpx;}
@@ -508,12 +508,12 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 			.text-score{font-size: 22rpx;}
 			.time-tip-box{font-size: 20rpx;margin-top: 10rpx;}
 		}
-	
+
 		@include mediaBig() {
 			width: 1000rpx;
 			height: 830rpx;
 			padding: 67rpx 77rpx;
-	
+
 			.close-btn{width: 160rpx;height: 160rpx;right: 19rpx;top: 19rpx;}
 			.close-btn::after{width: 83rpx;height: 83rpx;}
 			.e-img{height: 384rpx;margin: 67rpx auto 38rpx;}
@@ -535,7 +535,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	.tab-item.active{
 		color: #fff;background-image: url("@/static/images/phone/xuanke/tab-item-a.png");
 	}
-	
+
 	@include mediaSmall() {
 		.tab-item{
 			width: 238rpx;height: 58rpx;line-height: 58rpx;font-size: 24rpx;
@@ -546,7 +546,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		.tab-item{width: 620rpx;height: 152rpx;line-height: 152rpx;font-size: 60rpx;margin: 0 6rpx;}
 		}
 
-	
+
 }
 
 // tab页面

common/styles/global/pages.scss

@@ -2,13 +2,13 @@
 // 课程完成
 .course-finish-dialog{
 	width: 750rpx;height: 1250rpx;@include ezy-no-repeat-cover;
-	background-image: url("@/static/images/course/video-finish-bj.png");
+	background-image: url("@/static/images/exam/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;}
 	.course-btn-box{position: absolute;bottom: 200rpx;display: flex;left: 50%;transform: translateX(-50%);}
-	.return-btn{background-image: url("@/static/images/course/fh-btn.png");}
-	.continue-btn{background-image: url("@/static/images/course/jx-btn.png");}
+	.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%;}
 }
 
@@ -35,7 +35,7 @@
 		.my-input {font-size: 32rpx;padding: 0 22rpx;box-sizing: border-box;color: #666;flex: 1;}
 		.uni-input-placeholder {font-size: 32rpx;color: #ccc;}
 		.close-btn{width: 36rpx;height: 36rpx;margin-right: 30rpx;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/login/login-close-icon.png");flex-shrink: 0;}
+		background-image: url("@/static/images/common/login/login-close-icon.png");flex-shrink: 0;}
 	}
 
 	.get-yzm-btn{color: #3b73bf;margin:46rpx 0 32rpx;font-size: 32rpx;}
@@ -67,7 +67,7 @@
 	box-sizing: border-box;padding-top: 240rpx;
 	.login-img{
 		width: 272rpx;height: 260rpx;@include ezy-no-repeat-cover;margin: 0 auto;
-		background-image: url("@/static/images/login/login-logo.png");display: block;
+		background-image: url("@/static/images/common/login/login-logo.png");display: block;
 	}
 	.login-body-box{
 		display: flex;flex-direction: column;align-items: center;margin: 160rpx auto 0;
@@ -76,7 +76,7 @@
 	.phone-input-box{
 		width: 662rpx;height: 122rpx;
 		display: flex;align-items: center;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/login/login-tel-bj.png");
+		background-image: url("@/static/images/common/login/login-tel-bj.png");
 		.phone-prefix {
 		  width: 90rpx;margin-left:18rpx;font-size: 38rpx;color: #ffffffd9;
 		  font-weight: normal;display: flex;align-items: center;justify-content: space-between;flex-shrink: 0;
@@ -86,7 +86,7 @@
 		.uni-input-placeholder {font-size: 34rpx;color: #ffffffd9;
 		}
 		.close-btn{width: 42rpx;height: 42rpx;margin-right: 30rpx;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/login/login-close-icon.png");flex-shrink: 0;}
+		background-image: url("@/static/images/common/login/login-close-icon.png");flex-shrink: 0;}
 	}
 
 	.agreement-checkbox-box {
@@ -121,9 +121,9 @@
 				color: #666;font-size: 26rpx;
 				icon{width: 50rpx;height: 42rpx;@include ezy-no-repeat-cover;margin-bottom: 12rpx;}
 			}
-			.wx-btn icon{background-image: url("@/static/images/login/login-wx-btn.jpg");}
-			.yk-btn icon{background-image: url("@/static/images/login/login-yk-btn.jpg");}
-			.apple-btn icon{background-image: url("@/static/images/login/login-apple-btn.jpg");}
+			.wx-btn icon{background-image: url("@/static/images/common/login/login-wx-btn.jpg");}
+			.yk-btn icon{background-image: url("@/static/images/common/login/login-yk-btn.jpg");}
+			.apple-btn icon{background-image: url("@/static/images/common/login/login-apple-btn.jpg");}
 		}
 
 	}
@@ -299,7 +299,7 @@
 		.phone-input {font-size: 38rpx;padding: 0 30rpx;box-sizing: border-box;color: #555;flex: 1;overflow: hidden;}
 		.uni-input-placeholder {font-size: 34rpx;color: #acacae;}
 		.close-btn{width: 42rpx;height: 42rpx;margin-right: 30rpx;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/login/login-close-icon.png");flex-shrink: 0;}
+		background-image: url("@/static/images/common/login/login-close-icon.png");flex-shrink: 0;}
 	}
 	.yzm-row{
 		width: 100%;margin: 36rpx 0 0;display: flex;align-items: center;
@@ -315,11 +315,11 @@
 // 用户协议弹窗
 .agree-sections-dialog{
 	width: 700rpx;height: 490rpx;padding: 80rpx 0 42rpx;box-sizing: border-box;text-align: center;margin-bottom: 26%;
-	background-image: url("@/static/images/login/agree-dialog-bg.png");@include ezy-no-repeat-cover;
+	background-image: url("@/static/images/common/login/agree-dialog-bg.png");@include ezy-no-repeat-cover;
 	.agree-title{color:#111;font-size: 40rpx;}
 	.agree-tip{color:#666;font-size: 30rpx;margin-top: 46rpx;}
 	.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");}
+	background-image: url("@/static/images/common/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;
@@ -636,13 +636,14 @@
 			img{width: 190rpx;height: 242rpx;border-radius: 16rpx;}
 			.body-right{
 				width: 100%;color: #c8e4f8;margin-left: 24rpx;font-size: 30rpx;
-				view{margin: 8rpx 0;}
+				display: flex;flex-direction: column;justify-content: space-between;
 				.right-name{font-size: 34rpx;color: #fff;margin-top: 2rpx;}
 				}
 		}
 		.card-progress-box{
 			display: flex;align-items: center;
 			.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;
@@ -726,7 +727,7 @@
 	.xx-next-btn{
 		width: 655rpx;height: 92rpx;line-height: 92rpx;margin: 32rpx auto;
 		font-size: 32rpx;color: #fff;text-align: center;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/login/login-btn-bj.png");
+		background-image: url("@/static/images/common/login/login-btn-bj.png");
 	}
 	.xx-xw-text{text-align: center;font-size: 32rpx;color: #666;margin: 32rpx auto;}
 	// 回到顶部
@@ -758,9 +759,9 @@
 			.card-body-box{
 				img{width: 124rpx;height: 157rpx;border-radius: 10rpx;}
 				.body-right{
-					margin-left: 16rpx;font-size: 20rpx;view{margin: 5rpx 0;}
-					.right-name{font-size: 22rpx;}
-					.right-item{width: 50%;display: inline-block;vertical-align: middle;}
+					margin-left: 16rpx;font-size: 20rpx;display: block;
+					.right-name{font-size: 22rpx;margin: 5rpx 0;}
+					.right-item{width: 50%;display: inline-block;vertical-align: middle;margin: 5rpx 0;}
 					.right-item-mini{width: 40%;}
 				}
 			}
@@ -819,9 +820,10 @@
 			.card-body-box{
 				img{width: 304rpx;height: 387rpx;border-radius: 26rpx;}
 				.body-right{
-					margin-left: 38rpx;font-size: 46rpx;view{margin: 13rpx 0;}
-					.right-name{font-size: 54rpx;}
-					.right-item{width: 50%;display: inline-block;vertical-align: middle;}
+					margin-left: 38rpx;font-size: 46rpx;
+					.right-name{font-size: 54rpx;margin: 16rpx 0;}
+					.right-item{width: 50%;display: inline-block;vertical-align: middle;margin: 16rpx 0;}
+					view{margin: 16rpx 0;}
 					.right-item-mini{width: 40%;}
 				}
 			}
@@ -897,6 +899,7 @@
 	}
 	.ksp-scroll-view{overflow-y: auto;}
 	.ksp-page-body{padding: 24rpx 0 0;}
+	.jstx-ksp-page-body{padding: 0;}
 	.ksp-video-box{
 		width: 95%;height: 423rpx;padding: 8px;box-sizing: border-box;
 		border-radius: 16rpx;margin:32rpx auto;flex-shrink: 0;
@@ -1661,7 +1664,7 @@
 		.duihuan-confirm-btn{
 			width: 100%;height: 92rpx;line-height: 92rpx;text-align: center;font-size:32rpx;
 			margin-top: 42rpx;@include ezy-no-repeat-contain;font-weight: bold;
-			background-image: url("@/static/images/login/login-btn-bj.png");color:#fff;
+			background-image: url("@/static/images/common/login/login-btn-bj.png");color:#fff;
 		}
 	}
 

pages/jisuantexun/lookShipin.vue

@@ -4,7 +4,7 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{jieInfo.jieIntro}}</text>
 		</view>
-		<view class="ezy-page-body ksp-page-body">
+		<view class="ezy-page-body jstx-ksp-page-body">
 			<!-- 核心基础题 -->
 			<videoPlayVue ref="c1" :key="1" :videoId1="videoId" :progressMarkers1="progressMarkers"
 				:playAuth1="playAuth" :hideFlag1="hideFlag" :seek-time1="seekTime" class="ksp-video-box"