From f9e8c441945f939a0845e99d2ed2c9035697d807 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Sat, 11 May 2024 18:07:21 +0800
Subject: [PATCH] 1

---
 pages/cloud_warehouse/home/home.vue     | 2 +-
 pages/cloud_warehouse/market/market.vue | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index e683262..898423a 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -19,7 +19,7 @@
 			top: calc(82rpx + var(--status-bar-height));
 			padding: 0rpx 20rpx;
 			background-color: #fff;
-			transition: height .7s;
+			transition: height .5s;
 			overflow: hidden;
 			margin-bottom: 20rpx;
 
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 6d3c7a4..dfcbc1d 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -25,7 +25,6 @@
 			background-color: #fff;
 			transition: height .7s;
 			overflow: hidden;
-			margin-bottom: 20rpx;
 
 			.wholeSale-nav {
 				display: flex;
@@ -448,13 +447,13 @@
 			this.storeMerchantList();
 		},
 		onReachBottom() {
-			this.storeMerchantList();
+			// this.storeMerchantList();
 		},
 		onPageScroll() {
 			uni.$emit('scroll');
 		},
 		onPullDownRefresh() {
-			this.storeMerchantList(true);
+			// this.storeMerchantList(true);
 		},
 		methods: {
 			scrolltoupper() {
@@ -466,6 +465,8 @@
 			},
 
 			onScroll(e) {
+				console.log(e);
+
 				if (this.scrollTop >= e.target.scrollTop) { //上拉
 					this.wrapHeight = 300;
 				} else {