From e10571239087d718266eff4637e8769a9bb12575 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Mon, 28 Oct 2024 15:45:25 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91:=20?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=A4=B4=E5=83=8F=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=8F=AF=E4=BB=A5=E4=BB=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/set/userInfo/userInfo.scss         | 16 ++++++
 .../member/set/userInfo/userInfo.vue          | 51 ++++++++++++-------
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.scss
index 83df9e4b..dd066062 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.scss
@@ -41,6 +41,22 @@
 							height: 100%;
 						}
 					}
+					.avatar-botton {
+						background-color: none;
+						padding: 0;
+						line-height: inherit;
+						width: 150rpx;
+						height: 150rpx;
+						border-radius: 15rpx;
+						.img {
+							display: block;
+							width: 100%;
+							height: 100%;
+						}
+						&::after {
+							content: none;
+						}
+					}
 				}
 			}
 			.center {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue
index 62d231e0..ab1abb2c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue
@@ -12,16 +12,24 @@
 					<view class="item-box">
 						<view class="lab">头像</view>
 						<view class="val">
+							<!-- #ifdef MP-WEIXIN  -->
+							<button class="avatar-botton" open-type="chooseAvatar" @chooseavatar="getChooseavatar">
+								<image v-if="state.avatar" class="img" :src="state.avatar"></image>
+								<image v-else class="img" src="/static/images/member/upload.png"></image>
+							</button>
+							<!-- #endif --> 
+							<!-- #ifndef MP-WEIXIN -->
 							<view class="upload-box" @click="handleUploadAvatar">
 								<image v-if="state.avatar" class="img" :src="state.avatar"></image>
 								<image v-else class="img" src="/static/images/member/upload.png"></image>
 							</view>
+							<!-- #endif -->
 						</view>
 					</view>
 					<view class="item-box center">
 						<view class="lab">昵称</view>
 						<view class="val">
-							<uv-input placeholder="请输入昵称" border="none" v-model="state.nickname"></uv-input>
+							<input type="nickname" placeholder="请输入昵称" border="none" v-model="state.nickname" ></input>
 						</view>
 					</view>
 					<view class="item-box center">
@@ -99,38 +107,47 @@
 	});
 
 	onReady(() => {
-		datetimePicker.value.setFormatter(formatter)
+		datetimePicker?.value.setFormatter(formatter)
 	});
 
+	/** 获取头像*/
+	const getChooseavatar = (res : any) => {
+		handleUploadImages(res.detail.avatarUrl);
+	}
+
 	/** 上传 */
 	const handleUploadAvatar = () => {
 		uni.chooseImage({
 			count: 1,
-			async success(res : any) {
-				const img : Response<any> = await queryUploadImages(res.tempFilePaths[0]);
-				if (img.status) {
-					state.avatar = img?.data?.src;
-
-					const changeAvatar : Response<any> = await queryChangeAvatar({ id: img?.data?.src });
-					if (changeAvatar.status) {
-						handleShowToast('上传成功', 'success');
-					} else {
-						handleShowToast('上传失败');
-					}
-				} else {
-					handleShowToast('上传失败');
-				}
+			success(res : any) {
+				handleUploadImages(res.tempFilePaths[0]);
 			}
 		})
 	}
 
+	/** 请求上传头像 */
+	const handleUploadImages = async (url : string) => {
+		const img : Response<any> = await queryUploadImages(url);
+		if (img.status) {
+			state.avatar = img?.data?.src;
+			const changeAvatar : Response<any> = await queryChangeAvatar({ id: img?.data?.src });
+			if (changeAvatar.status) {
+				handleShowToast('上传成功', 'success');
+			} else {
+				handleShowToast('上传失败');
+			}
+		} else {
+			handleShowToast('上传失败');
+		}
+	}
+
 	/** 获取用户信息 */
 	const getUserInfo = async () => {
 		const userInfo : Response<UserInfoType> = await queryUserInfo();
 		state.userInfo = userInfo?.data;
 		if (userInfo?.data?.birthday) {
 			state.percentage += 25;
-			state.birthdayTemporary = new Date(userInfo?.data?.birthday).getTime();
+			state.birthdayTemporary = String(new Date(userInfo?.data?.birthday).getTime());
 			state.birthday = timeFormat(userInfo?.data?.birthday, 'yyyy-mm-dd');
 		}
 		if (userInfo?.data?.nickName) {