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

common/styles/global/components.scss

@@ -233,19 +233,21 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 /***** 考试须知  *****/
 .phone-ksxz-dialog{
+	position: relative;
 	.uni-dialog-title{
 		padding: 24rpx 0!important;font-size: 30rpx;border-bottom: 1px solid #f5f5f5;
 		.uni-popup__info{color: #333!important;}
 	}
-	.uni-dialog-content{
-		justify-content: flex-start!important;
-	}
+	.ksxz-close-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover;
+	position: absolute;top: 26rpx;right: 20rpx;
+			background-image: url("@/static/images/common/close-icon.svg");}
+	.uni-dialog-content{justify-content: flex-start!important;}
 	
 	.uni-dialog-button-text{color: #999!important;}
 	.uni-dialog-button-text.uni-button-color{color: #3fd2a1!important;}
 	
 	.ksxz-content-box{
-		font-size: 28rpx;color: #333;
+		font-size: 28rpx;color: #333;max-height: 70vh;overflow: auto;
 		>view{margin-bottom: 12rpx;line-height: 1.6;}
 		.ksms-row{margin-bottom: 12rpx;}
 		.ksms-intro{color: #666;}

common/styles/global/pages.scss

@@ -214,8 +214,8 @@
 	.kc-name-box{
 		display: flex;align-items: center;box-sizing: border-box;padding: 24rpx 36rpx 6rpx;
 		icon{
-			width: 20rpx;height: 32rpx;margin-right: 10rpx;font-size: 32rpx;
-			background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
+			width: 20rpx;height: 32rpx;margin-right: 24rpx;font-size: 32rpx;flex-shrink: 0;
+			background-image: url("@/static/images/common/nav-bar-green-jt.svg");@include ezy-no-repeat-cover();
 		}
 	}
 	.kc-info-box{width: 100%;box-sizing: border-box;padding: 6rpx 36rpx 24rpx;border-bottom: 1rpx solid #ebebeb;
@@ -242,9 +242,10 @@
 			}
 		}
 		
-		.kejian-item{display: flex;align-items: center;padding: 16rpx;font-size: 28rpx;
+		.kejian-item{display: flex;align-items: center;padding: 16rpx;font-size: 28rpx;justify-content: space-between;
 		color: #666;border-radius: 4rpx;background-color: #f4f7ff;margin-bottom:16rpx;}
 		.kejian-item-icon{background-image: url("@/static/images/common/play-icon.svg");flex-shrink: 0;margin-right: 8rpx;}
+		.kejian-item-name{margin-right: auto;}
 		.kejian-active{
 			color: #3fd2a1;background-color: #3fd2a11a;
 			.kejian-item-icon{background-image: url("@/static/images/common/play-icon-a.svg");}
@@ -349,8 +350,8 @@
 	.head-img-box{
 		width: 170rpx;height: 170rpx;margin-right: 32rpx;border-radius: 50%;overflow: hidden;
 	}
-	.head-img,.head-icon{    width: 100%;height: auto;}
-	.head-icon-box{width: 413rpx;height: 582rpx;background-image: url("@/static/images/my/client-default-icon.png");@include ezy-no-repeat-cover();}
+	.head-img,.head-icon{width: 100%;height: auto;}
+	.head-icon{width: 170rpx;height: 170rpx;background-image: url("@/static/images/my/user-default-img.png");@include ezy-no-repeat-cover();}
 	.head-content-box{
 		font-size: 32rpx;color: #fff;
 		.head-content-row-box{display: flex;align-items: center;margin-top: 20rpx;}

components/identification/identification.vue

@@ -4,7 +4,7 @@
 			mask-background-color="rgba(0, 0, 0, 0.4);">
 			<uni-popup-dialog mode="input" class="phone-ksxz-dialog" title="身份确认" :duration="2000" :before-close="true"
 				cancelText="修改" @close="handleClose" @confirm="handleConfirm">
-				<view @click="handleCloseOnly" class="closeIcon">x</view>
+				<view @click="handleCloseOnly" class="ksxz-close-icon"></view>
 				<view class="ksxz-content-box">
 					<view class="phone-name-box">
 						<!-- #ifdef H5 -->

components/kecheng-mulu/kecheng-mulu.vue

@@ -6,7 +6,7 @@
 				:open="jie.open">
 				<view :class="{'kejian-active': activeKjId == item.kjId,'kejian-item':true }" v-for="item in jie.kejianList" @click.stop="handleKejianClick(item)">
 					<icon class="kejian-item-icon"></icon>
-					<text>{{item.name}}</text>
+					<text class="kejian-item-name">{{item.name}}</text>
 					<text v-if="isHasProgress">
 						<text v-if="item.maxProcess < 100">{{item.maxProcess >= item.curProcess ? item.maxProcess: item.curProcess}}%</text>
 						<text v-else>{{item.maxProcess}}%</text>