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

common/styles/global/pages.scss

@@ -210,6 +210,8 @@
 		width:100%;height: 460rpx;
 		.kecheng-video{height: 460rpx!important;}
 		.prism-big-play-btn{display: none!important;}
+		.prism-player .prism-progress .prism-progress-played{background-color: #3fd2a1;}
+		.prism-player .prism-progress .prism-progress-cursor{background: unset;}
 	}
 	.kc-name-box{
 		display: flex;align-items: center;box-sizing: border-box;padding: 24rpx 36rpx 6rpx;
@@ -408,7 +410,7 @@
 			.file-picker-image{max-height: 200rpx;max-width: 160rpx;}
 			img{max-width: 100%;max-height: 200rpx;}
 		}
-		.head-icon-box{width: 160rpx;height: 200rpx;margin: 0 auto;
+		.head-icon-box{width: 170rpx;height: 170rpx;margin: 0 auto;
 		background-image: url("@/static/images/my/user-default-img.png");@include ezy-no-repeat-cover();}
 	}
 	.info-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}

pages/client/my/myInfo.vue

@@ -7,11 +7,11 @@
 		</view>
 		<!-- 头像 -->
 		<view class="user-img-box">
-			<!-- <uni-file-picker limit="1" :del-icon="false" disable-preview :auto-upload="false" v-if="data.icon"
+			<uni-file-picker limit="1" :del-icon="false" disable-preview :auto-upload="false" v-if="data.icon"
 				@select="handleSelect" file-mediatype="image" class="phone-file-picker user-file-picker">
 				<img class="head-img" :src="data.icon" v-if="data.icon">
-			</uni-file-picker> -->
-			<icon class="head-icon-box"></icon>
+			</uni-file-picker>
+			<icon class="head-icon-box" v-else></icon>
 			<!-- <view>图片地址：{{data.icon}}</view> -->
 		</view>
 		<!-- 姓名 -->