Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

common/styles/global/components.scss

@@ -98,9 +98,9 @@ view{box-sizing: border-box;}
 }
 // 带背景色client使用
 .icon-title-bjcolor-navBar-box{
-	background-color: #3fd2a1;padding: 20rpx;
+	background-color: #3fd2a1;padding: 10rpx;
 	.nav-bar-title{color: #fff;}
-	.nav-bar-icon{background-image: url("@/static/images/common/nav-white-bar-jt.svg");top:32rpx;}
+	.nav-bar-icon{background-image: url("@/static/images/common/nav-white-bar-jt.svg");top:22rpx;}
 }
 // 仅一个返回按钮
 .phone-nav-bar-icon{width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: var(--status-bar-height);

common/styles/global/pages.scss

@@ -120,8 +120,8 @@
 /*** 考试页面***/
 .phone-list-page{
 	box-sizing: border-box;
-	.phone-scroll-view {height: calc(100vh - 322rpx);}
-	.client-kaoshi-scroll-view{height: calc(100vh - 212rpx);}
+	.phone-scroll-view {height: calc(100vh - 182rpx);}
+	// .client-serch-scroll-view{height: calc(100vh - 322rpx);}
 	.admin-list-box{
 		.admin-list-item-box{border-bottom: 20rpx solid #f4f6fa;}
 		.uni-list--border{display: none;}
@@ -136,23 +136,27 @@
 			.ks-zyLevelName {font-size: 26rpx;padding: 4rpx 24rpx;border-radius: 4px;border: 1px solid #3fd2a1;color:#3fd2a1;}
 		}
 		.ks-totalTm {font-size: 26rpx;color: #333;margin-bottom: 20rpx;line-height: 1;margin-left: 40rpx;}
-		.phone-time-icon,.phone-cishu-icon,.phone-zongfen-icon,.phone-jigefen-icon{width: 24rpx;height: 24rpx;@include ezy-no-repeat-cover();
+		.phone-time-icon,.phone-cishu-icon,.phone-zongfen-icon,.phone-jigefen-icon,.phone-defen-icon{width: 24rpx;height: 24rpx;@include ezy-no-repeat-cover();
 		vertical-align: middle;margin-right: 10rpx;}
 		.phone-time-icon{background-image: url("@/static/images/common/time-icon.png");}
 		.phone-cishu-icon{background-image: url("@/static/images/common/cishu-icon.png");}
 		.phone-zongfen-icon{background-image: url("@/static/images/common/zongfen-icon.png");vertical-align: unset;}
 		.phone-jigefen-icon{background-image: url("@/static/images/common/jigefen-icon.png");vertical-align: unset;}
+		.phone-defen-icon{background-image: url("@/static/images/common/defen-icon.png");vertical-align: unset;}
 		.ks-score-content{
-			font-size: 26rpx;background-color: #f4f6fa;width: 500rpx;line-height: 1;border-radius: 8rpx;
-			margin-bottom: 20rpx;display: flex;padding: 16rpx 30rpx;box-sizing: border-box;
+			font-size: 26rpx;line-height: 1;display: flex;
+			margin-bottom: 20rpx;box-sizing: border-box;
 			.ks-score {
-				padding-right: 60rpx;
+				background-color: #f4f6fa;padding: 12rpx 0 12rpx 16rpx;border-radius: 8rpx 0 0 8rpx;
 				text{color: #ff7023;}
 			}
 			.ks-okScore {
+				background-color: #f4f6fa;padding:12rpx 6%;border-radius:0 8rpx 8rpx 0;
 				text{color: #3fd2a1;}
 			}
+			.cj-okScore{border-radius:0;padding:12rpx 3%;}
 			.ks-getScore {
+				background-color: #f4f6fa;padding: 12rpx 16rpx 12rpx 0;border-radius:0 8rpx 8rpx 0;
 				text{color: #3fd2a1;}
 			}
 		}
@@ -384,6 +388,8 @@
 		.user-icon{background-image: url("@/static/images/my/my-editor-icon.png");}
 		.score-icon{background-image: url("@/static/images/my/my-score-icon.png");}
 		.login-out-icon{background-image: url("@/static/images/my/login-out-icon.png");}
+		.sxtcs-icon{background-image: url("@/static/images/my/my-sxtcs-icon.png");}
+		.sxtsm-icon{background-image: url("@/static/images/my/my-sxtsm-icon.png");}
 	}
 }
 

pages/client/Chengji/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="phone-list-page">
-		<view class="icon-title-navBar-box">
+		<view class="icon-title-bjcolor-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">成绩</text>
 		</view>
@@ -26,11 +26,11 @@
 								<view class="ks-score">
 									<icon class="phone-zongfen-icon" />总分：<text>{{item.ksScore}}</text>
 								</view>
-								<view class="ks-okScore">
+								<view class="ks-okScore cj-okScore">
 									<icon class="phone-jigefen-icon" />及格分：<text>{{item.okScore}}</text>
 								</view>
 								<view class="ks-getScore">
-									<icon class="phone-jigefen-icon" />得分：<text>{{item.userScore}}</text>
+									<icon class="phone-defen-icon" />得分：<text>{{item.userScore}}</text>
 								</view>
 							</view>
 							<button @click="checkKecheng(item)" type="primary" size="mini"

pages/client/Kaoshi/list.vue

@@ -7,7 +7,7 @@
 		<!-- 考试列表 -->
 		<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 			:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
-			class="phone-scroll-view client-kaoshi-scroll-view">
+			class="phone-scroll-view">
 			<uni-list class="admin-list-box">
 				<uni-list-item v-for="item in data.list" class="admin-list-item-box">
 					<template v-slot:body>

pages/client/Kecheng/study.vue

@@ -10,7 +10,7 @@
 		<!-- 中间区域 -->
 		<view class="kc-name-box">
 			<icon @click="goUpPage"></icon>
-			<view>{{name}}</view>
+			<view>{{zyName}} {{zyLevelName}}</view>
 		</view>
 		<view class="kc-info-box">
 			<view>时长：{{period}}分钟</view>
@@ -79,7 +79,9 @@
 				curPlayData: null,
 				timer1: null,
 				kcId: null,
-				from: ''
+				from: '',
+				zyName: '',
+				zyLevelName: '',
 			}
 		},
 		onLoad(options) {
@@ -250,11 +252,15 @@
 						name,
 						kejianUserVo,
 						intro,
-						operId
+						operId,
+						zyName,
+						zyLevelName,
 					} = res.data;
 					this.userCount = userCount;
 					this.period = formatDuration(period);
 					this.name = name;
+					this.zyName = zyName;
+					this.zyLevelName = zyLevelName;
 					this.formatData(kejianUserVo.zhangList)
 					this.list = kejianUserVo.zhangList;
 					this.intro = intro;