From 310eaa8617baf25a6fa3c7adb390dead45decb5e Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Mon, 3 Jul 2023 17:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/detail.vue | 2 +-
 pages/my/my.vue         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index 585333b..95c75d9 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -210,7 +210,7 @@
 
 <style lang="scss" scoped>
 .details{
-	height:calc(100vh);
+	min-height:calc(100vh);
 	background-color: #ffffff;
 }
 .u-nav-slot{
diff --git a/pages/my/my.vue b/pages/my/my.vue
index b77936f..2a65edc 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -15,7 +15,7 @@
 					<view class="userInfo">
 						<view v-if="isLogin">
 							<view class="userName">
-								{{source=='phone'?userInfo.nickname:userInfo.nickName}}
+								{{source=='phone'?userInfo.nickname:userInfo.nickname}}
 							</view>
 							<view class="id" v-if="source=='phone'"> 
 								ID：{{userInfo.user_id}}
@@ -124,7 +124,7 @@
 		},
 		onShow() {
 			this.source = uni.getStorageSync('source')
-			console.log(this.source)
+			console.log(this.source,"ooo")
 			let info = JSON.parse(JSON.stringify(uni.getStorageSync('userInfo')))
 			if(info.avatar){
 				if(info.avatar.indexOf("http")  == -1 && info.avatar.indexOf("uploads/") == 0){