Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

common/styles/global/components.scss

@@ -174,7 +174,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		background-image: url("@/static/images/exam/tiankong-title.png");@include ezy-no-repeat-cover;
 	}
 	.tiankong-input {width: 50px;height: 32rpx;border: 1px solid #999;}
-	.tk-input-box{display: inline-block;position: relative;font-size: 0;}
+	.tk-input-box{display: inline-block;position: relative;font-size: 0;margin: 0 4rpx;}
 	.tiankong-input{text-align: center;}
 	.tiankong-input.showError{color: #ff5757;}
 	.tiankong-input.active_right{color: green;}

common/styles/global/pages.scss

@@ -319,9 +319,10 @@
 	.ceshi-brand-item{
 			width: 185rpx;height: 121rpx;@include ezy-no-repeat-cover;
 			padding: 16rpx 10rpx 10rpx 10rpx;position: absolute;top:1112rpx;right:140rpx;
-			background-image: url("@/static/images/study/shuxue/ceshi-pai.png");
+			background-image: url("@/static/images/study/shuxue/ceshi-pai-disabled.png");
 		.brand-lock,.brand-icon,.brand-finish-icon{left: 0;top: -30rpx;}
 	}
+	.ceshi-brand-item.brand-active{background-image: url("@/static/images/study/shuxue/ceshi-pai-active.png");}
 	
 	// brand-item
 	.small-brand-item:nth-child(1){top:330rpx;right:70rpx;}
@@ -464,12 +465,13 @@
 	}
 	.brand-item.ceshi-brand-item{
 		width: 308rpx;height: 225rpx;top:1250rpx;right:30rpx;left: unset;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/study/yingyu/test-item.png");
+		background-image: url("@/static/images/study/yingyu/test-item-disabled.png");
 		.icon-content-box{background-image: unset;}
 		.brand-content{display: none;}
 		.brand-lock,.brand-finish-icon{top: 120rpx;right: 120rpx;}
 		.animal-img{top: 100rpx;right: 40rpx;animation: shakeOpacity 1s 1;}
 	}
+	.brand-item.ceshi-brand-item.brand-active{background-image: url("@/static/images/study/yingyu/test-item-active.png");}
 	
 	@media (max-height: 800px) {
 		min-height:1500rpx;
@@ -698,6 +700,7 @@
 			width: 100%;height: 100%!important;
 			.prism-big-play-btn{top: 50%;left: 50%!important;transform: translate(-50%, -50%);z-index: 20;}
 			.prism-info-display{display: none;}
+			.prism-time-display .time-bound,.prism-time-display .duration{color: #fff;}
 		}
 	}
 }
@@ -711,6 +714,7 @@
 		width: 100%;height: 400rpx!important;flex-shrink: 0;position: relative;
 		.prism-big-play-btn{top: 50%;left: 50%!important;transform: translate(-50%, -50%);z-index: 20;}
 		.prism-info-display{display: none;}
+		.prism-time-display .time-bound,.prism-time-display .duration{color: #fff;}
 	}
 	.course-content-border{
 		width: 100%;display: flex;flex: 1;position: relative;

components/questionJiexi/questionJiexi.vue

@@ -192,9 +192,9 @@
 								},
 								{
 								          "name": "timeDisplay",
-								          "align": "tl",
+								          "align": "tr",
 								          "x": 10,
-								          "y": 7
+								          "y": 5
 								        }
 							]
 						}

pages/study/lookShipin.vue

@@ -409,9 +409,9 @@
 								},
 								{
 									"name": "timeDisplay",
-									"align": "tl",
+									"align": "tr",
 									"x": 10,
-									"y": 7
+									"y": 5
 								}
 							]
 						}