From 86cc94d842633a88f26ac3479a88603181749145 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 19 Apr 2024 14:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/newGoods.vue | 17 +++++++++--------
 pages/user/vip/goods.vue    |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pages/activity/newGoods.vue b/pages/activity/newGoods.vue
index 8b6e0f2..f2acdf4 100644
--- a/pages/activity/newGoods.vue
+++ b/pages/activity/newGoods.vue
@@ -38,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="lookBtn" @click="backtop">
+			<view class="lookBtn" @click="backtop" v-if="scrollTop>200">
 				再挑挑看<u-icon name="arrow-upward" color="#242424" size="30"></u-icon>
 			</view>
 			<view class="lookJie" v-html="content">
@@ -66,7 +66,8 @@
 				},
 				backgroundImg: '',
 				list: [],
-				content: ''
+				content: '',
+				 scrollTop: 0
 			}
 		},
 		/**
@@ -79,14 +80,13 @@
 		},
 
 		methods: {
-			// 获取预售规则
 			getCarousel(type) {
 				const app = this;
 				help.getAgreement({
 						type: 'copyright'
 					})
 					.then(result => {
-						let content = result.data.detail.content || '';
+						let content = result.data.detail?result.data.detail.content:'';
 						this.content = content
 					})
 					.finally(() => app.isLoading = false)
@@ -104,7 +104,7 @@
 				}
 				Api.brandList(pamars)
 					.then(result => {
-						app.list = result.data.data;
+						app.list = result.data.data
 					})
 					.finally(() => app.isLoading = false)
 			},
@@ -129,9 +129,10 @@
 					scrollTop: 0
 				});
 			}
-
-		}
-
+		},
+		onPageScroll(e) {
+		    this.scrollTop = e.scrollTop;
+		  }
 	}
 </script>
 
diff --git a/pages/user/vip/goods.vue b/pages/user/vip/goods.vue
index 254f448..8e974f2 100644
--- a/pages/user/vip/goods.vue
+++ b/pages/user/vip/goods.vue
@@ -178,8 +178,8 @@
 				this.page = 1;
 				this.list = [];
 				this.$refs.uWaterfall1.clear();
-				this.category_id = item.category_id
-				this.getBrandList(item.category_id)
+				this.category_id = index==-1?'':item.category_id
+				this.getBrandList(this.category_id)
 			},
 			tabItem1(item, index) {
 				this.tabIndex1 = index;