From 196d6f657ee93b7ecaa6cf9415f0e74018faede7 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Fri, 25 Aug 2023 10:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=95=86=E5=93=81=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=A1=B5=E9=9D=A2=E5=94=A4=E9=86=92=E5=8D=B3=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=EF=BC=9B=E6=88=91=E7=9A=84=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=92=8C=E6=98=B5=E7=A7=B0=E7=94=A8=E6=88=B7=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E6=94=B9=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pages_zhentou/homePage/homePage.vue |  4 +---
 pages/pages_zhentou/myPage/myPage.vue     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pages/pages_zhentou/homePage/homePage.vue b/pages/pages_zhentou/homePage/homePage.vue
index c53ee23..88096ba 100644
--- a/pages/pages_zhentou/homePage/homePage.vue
+++ b/pages/pages_zhentou/homePage/homePage.vue
@@ -54,9 +54,7 @@
 				}
 			}
 			//商品信息
-			if (this.bgSrc == '') {
-				this.queryGoodsInfo();
-			}
+			this.queryGoodsInfo();
 		},
 		methods: {
 			//商品信息
diff --git a/pages/pages_zhentou/myPage/myPage.vue b/pages/pages_zhentou/myPage/myPage.vue
index 2eff983..0797347 100644
--- a/pages/pages_zhentou/myPage/myPage.vue
+++ b/pages/pages_zhentou/myPage/myPage.vue
@@ -4,12 +4,14 @@
 			<view class="avatar_warp">
 				<text>头像</text>
 				<button open-type="chooseAvatar" @chooseavatar="chooseavatar" class="avatar-box">
-					<image :src="userInfo.avatar" class="avatar"></image>
+					<image v-if="userInfo.avatar" :src="userInfo.avatar" class="avatar"></image>
+					<image v-else :src="avatarUrl" class="avatar"></image>
 				</button>
 			</view>
 			<view class="nickname_warp">
 				<text>昵称</text>
-				<input @blur="formSubmit" v-model="userInfo.username" class="nickname" type="nickname" placeholder="请输入昵称" />
+				<input v-if="userInfo.phone" @blur="formSubmit" v-model="userInfo.username" class="nickname" type="nickname" placeholder="请输入昵称" />
+				<input v-else class="nickname" type="nickname" placeholder="请输入昵称" />
 			</view>
 		</view>
 		<view class="cnt-box">
@@ -46,10 +48,12 @@
 	export default {
 		data() {
 			return {
+				nickName: '',//默认值
 				avatarUrl: 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0',
 				userInfo: {
 					username: '',
-					avatar: ''
+					avatar: '',
+					phone: ''
 				}
 			}
 		},
@@ -63,6 +67,7 @@
 			}
 		},
 		methods: {
+			//获取昵称
 			formSubmit(e) {
 				console.log(e.detail)
 				if(e.detail.value) {
@@ -71,7 +76,10 @@
 			},
 			//获取头像
 			chooseavatar(e) {
-				console.log(e);
+				if(!this.userInfo.phone) {
+					this.avatarUrl = e.detail.value;
+					return;
+				}
 				uni.uploadFile({
 					url: getApp().globalData.baseUrl + '/blade-resource/oss/endpoint/put-file',
 					filePath: e.detail.avatarUrl,