From ebd0ec4f51288042b6fc5bf714b1febbb63cfacc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 09 Jan 2026 18:03:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 uniapps/work-app/src/subPackages/userDetail/infos/index.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/uniapps/work-app/src/subPackages/userDetail/infos/index.vue b/uniapps/work-app/src/subPackages/userDetail/infos/index.vue
index 209d17c..0a9f257 100644
--- a/uniapps/work-app/src/subPackages/userDetail/infos/index.vue
+++ b/uniapps/work-app/src/subPackages/userDetail/infos/index.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<div class="avatarBox">
 			<!-- @click="uploadAvatar" -->
-			<u-avatar  :src="userInfo.avatar" size="114" mode="aspectFill" />
+			<u-avatar  :src="userInfo.avatar || defaultAvatar" size="114" mode="aspectFill" />
 		</div>
 		<view class="detailBox">
 			<div class="detailCon">
@@ -30,13 +30,14 @@
 			</div>
 		</view>
 		<view class="btngroup">
-			<u-button color="#AEAEAE" class="custom-style" shape="circle" @click="reset">重置</u-button>
-			<u-button color="#1D6FE9" class="custom-style" shape="circle" @click="submit">提交</u-button>
+			<u-button color="#AEAEAE" class="custom-style"  @click="reset">重置</u-button>
+			<u-button color="#1D6FE9" class="custom-style"  @click="submit">提交</u-button>
 		</view>
 	</view>
 </template>
 
 <script setup>
+import defaultAvatar  from '/static/images/defaultAvatar.svg'
 	import {
 		getEnvObj,
 		getWebViewUrl
@@ -292,10 +293,13 @@
 
 	.custom-style {
 		width: 276rpx;
-		height: 76rpx;
+		height: 100rpx;
+		  font-family: "Source Han Sans CN";
+		font-weight: 400;
+		font-size: 36rpx;
 	}
 	:deep(.u-button.data-v-461e713c){
 		width: 276rpx !important;
-		height: 76rpx !important;
+		height: 100rpx !important;
 	}
 </style>

--
Gitblit v1.9.3