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

common/styles/global/pages.scss

@@ -340,22 +340,24 @@
 
 /*** 我的页面***/
 .client-my-page{
-	background-color:#f8f9fd;height: 100vh;
+	background-color:#f8f9fd;height: 100vh;box-sizing: border-box;padding-bottom: 120rpx;overflow: auto;
 	// head
 	.my-head-box{
 		width: 100%;height:300rpx;display: flex;align-items: center;box-sizing: border-box;padding: 24rpx 52rpx;
 		background-image: url("@/static/images/my/client-my-bj.png");@include ezy-no-repeat-cover(top);
 	}
-	.head-img-box,.head-icon-box{
-		max-width: 160rpx;max-height: 200rpx;
-		border: 1rpx solid #fff;margin-right: 32rpx;
+	.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-content-box{
-		font-size: 36rpx;color: #fff;
-		.idcard-row-box{display: flex;align-items: center;margin-top: 24rpx;}
-		.idcard-icon{width: 56rpx;height:56rpx;background-image: url("@/static/images/my/my-card-icon.png");@include ezy-no-repeat-cover();flex-shrink: 0;}
-		.idcard-text{font-size: 32rpx;margin-left: 10rpx;}
+		font-size: 32rpx;color: #fff;
+		.head-content-row-box{display: flex;align-items: center;margin-top: 20rpx;}
+		.tel-icon,.idcard-icon{width: 40rpx;height:40rpx;@include ezy-no-repeat-cover();flex-shrink: 0;}
+		.tel-icon{background-image: url("@/static/images/my/my-tel-icon.png");}
+		.idcard-icon{background-image: url("@/static/images/my/my-idcard-icon.png");}
+		.content-text{font-size: 30rpx;margin-left: 10rpx;}
 	}
 	
 	// num

pages/client/my/index.vue

@@ -1,13 +1,19 @@
 <template>
 	<view class="client-my-page">
 		<view class="my-head-box">
-			<img class="head-img-box" :src="myInfoData.userImg" v-if="myInfoData.userImg">
-			<icon class="head-icon-box" v-else></icon>
+			<view class="head-img-box">
+				<img class="head-img" :src="myInfoData.userImg" v-if="myInfoData.userImg">
+				<icon class="head-icon" v-else></icon>
+			</view>
 			<view class="head-content-box">
 				<text>{{myInfoData.realName}}</text>
-				<view class="idcard-row-box" v-if="myInfoData.idcard">
+				<view class="head-content-row-box" v-if="myInfoData.userName">
+					<icon class="tel-icon"></icon>
+					<text class="content-text" >{{myInfoData.userName}}</text>
+				</view>
+				<view class="head-content-row-box" v-if="myInfoData.idcard">
 					<icon class="idcard-icon"></icon>
-					<text class="idcard-text" >{{myInfoData.idcard}}</text>
+					<text class="content-text" >{{myInfoData.idcard}}</text>
 				</view>
 			</view>
 		</view>
@@ -80,6 +86,7 @@
 		userImg: '',
 		realName: '',
 		idcard: '',
+		userName: '',
 		kaoshiCount: '',
 		kechengCount: '',
 		lianxiCount: '',
@@ -129,6 +136,7 @@
 			myInfoData.userImg= res.data.icon;
 			myInfoData.realName = res.data.realName;
 			myInfoData.idcard = res.data.idcard;
+			myInfoData.userName = res.data.userName;
 		})
 	}
 	function getNumInfo(){