From 60bae3bf527b15fc5aefd555d7c76916b012b823 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 18:45:02 +0800
Subject: [PATCH] 冲突解决
---
pages/home/home.js | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 108690b..250f062 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -4,6 +4,7 @@
const app = getApp()
Page({
data: {
+ isWhite: false,
backUrl: null,
userInfo: {},
tabList: [], //鐩綍
@@ -29,6 +30,7 @@
this.getTabBar().init();
this.loadHomePage();
this.getBannerList()
+
},
onLoad(options) {
@@ -161,20 +163,8 @@
})
console.log('杞挱鍥�', this.data.bannerList);
},
- //鎼滅储
- navToSearchPage() {
- wx.navigateTo({ url: '/pages/goods/search/index' });
- },
- //杞挱鍥捐烦杞�
- navToActivityDetail({ detail }) {
- const data = this.data.bannerList[detail.index]
- console.log('璺宠浆', data.link);
- // const { index: promotionID = 0 } = detail || {};
- // wx.navigateTo({
- // url: `/pages/promotion-detail/index?promotion_id=${promotionID}`,
- // });
- },
- //鑾峰彇鐩綍
+
+
loadHomePage() {
wx.stopPullDownRefresh();
this.setData({
@@ -406,6 +396,13 @@
rankingList: res.datas
})
})
+ },
+
+ onPageScroll(e) {
+ this.setData({
+ isWhite: e.scrollTop > 50 ? true : false
+ })
+
}
});
--
Gitblit v1.9.1