From 14de3e90ae29af2ccfd51b08c6a11ab02fe8f8e7 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 05 三月 2024 19:02:35 +0800
Subject: [PATCH] feat(合并代码): 和冰帝阿
---
pages/home/home.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index c15deef..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: [], //鐩綍
@@ -274,7 +275,6 @@
})
})
},
-<<<<<<< HEAD
tabChangeHandle(item) {
let info = this.data.courseTypeList[item.detail.value]
this.getCourseList(info)
@@ -396,8 +396,13 @@
rankingList: res.datas
})
})
+ },
+
+ onPageScroll(e) {
+ this.setData({
+ isWhite: e.scrollTop > 50 ? true : false
+ })
+
}
-=======
->>>>>>> master
});
--
Gitblit v1.9.1