From 9a9af13c74e98dfdb61afd9cbe56b1b7ec8c3414 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 15 八月 2024 18:23:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/components/disProduct/index.js | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 36c966b..59064f2 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -82,12 +82,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchMove - touchDot > 24){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if(touchDot - touchMove > 24){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ }, 200)
}
},
fadeIn: function () {
@@ -103,7 +107,7 @@
});
setTimeout(() => {
this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
getCatelist() {
getCatalogList({
@@ -142,10 +146,12 @@
getZhongTaiProductPage({
catalogCode, pageNum, pageSize, sortType, query, tagCodes
}).then(res => {
- this.setData({
- datalist: [...this.data.datalist, ...res.data.records],
- total: res.data.total
- })
+ if (res.data && res.data.records) {
+ this.setData({
+ datalist: [...this.data.datalist, ...res.data.records],
+ total: res.data.total
+ })
+ }
}).finally(()=>{
that.setData({isLoading:false})
})
--
Gitblit v1.9.3