From 4c3428168c42e4e126e0d576b0e15f01ade2ad9c Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 13 Jan 2026 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 uniapps/work-wx/src/subPackages/userDetail/infos/index.vue |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/uniapps/work-wx/src/subPackages/userDetail/infos/index.vue b/uniapps/work-wx/src/subPackages/userDetail/infos/index.vue
index 4bf1b95..2c407b9 100644
--- a/uniapps/work-wx/src/subPackages/userDetail/infos/index.vue
+++ b/uniapps/work-wx/src/subPackages/userDetail/infos/index.vue
@@ -1,22 +1,23 @@
+<!-- 个人资料 -->
 <template>
 	<view class="container">
 		<view class="pageBg"></view>
 		<div class="avatarBox">
-			<u-avatar @click="uploadAvatar" :src="userInfo.avatar" size="114" mode="aspectFill" />
+			<u-avatar @click="uploadAvatar" :src="userInfo.avatar || showDefaultHeader" size="114" mode="aspectFill" />
 		</div>
 		<view class="detailBox">
 			<div class="detailCon">
 				<div class="orderRow">
 					<div class="rowTitle">姓名</div>
-					<div>{{userInfo.realName}}</div>
+					<div>{{userInfo.nickName}}</div>
 				</div>
 				<!-- <div class="orderRow">
 					<div class="rowTitle">所属单位</div>
 					<div>{{userInfo.deptName}}</div>
 				</div> -->
 				<div class="orderRow">
-					<div class="rowTitle">是否认证</div>
-					<div>{{userInfo.isAuth ? '已认证' : '未认证'}}</div>
+					<div class="rowTitle">认证状态</div>
+					<div>{{userInfo.status === 1 ? '已认证' : '未认证'}}</div>
 				</div>
 				<div class="orderRow">
 					<div class="rowTitle">手机号</div>
@@ -40,6 +41,7 @@
 </template>
 
 <script setup>
+	import showDefaultHeader from "@/static/images/user/default-header.svg";
 	import {
 		getEnvObj,
 		getWebViewUrl
@@ -55,7 +57,7 @@
 	const userInfo = ref({
 		id: '',
 		avatar: '',
-		realName: '',
+		nickName: '',
 		name: '',
 		phone: '',
 		email: '',
@@ -95,14 +97,15 @@
 	const getUserInfoData = () => {
 		getUserInfo().then(res => {
 			const user = res.data.data;
+			console.log('user',user)
 			userInfo.value = {
-				id: user.id,
+				id: user.userId,
 				avatar: user.avatar,
-				name: user.name,
-				realName: user.realName,
-				phone: user.phone,
-				email: user.email,
-				deptName: user.deptName,
+				nickName: user.nickName,
+				// realName: user.realName,
+				phone: user.phonenumber,
+				email: user.sysDept.email,
+				deptName: user.sysDept.deptName,
 			};
 
 		});
@@ -250,6 +253,7 @@
 		width: 100%;
 		height: 100%;
 		background: url("@/static/images/user/userbg.svg")  no-repeat ;
+		background-size: 100%;
 	}
 	.avatarBox {
 		width: 228rpx;
@@ -323,6 +327,8 @@
 		height: 100rpx !important;
 	}
 	.note {
+		position: absolute;
+		bottom: 400rpx;
 		font-family: Source Han Sans CN, Source Han Sans CN;
 		font-weight: 400;
 		font-size: 10px;

--
Gitblit v1.9.3