From 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 15 八月 2024 10:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_staff/components/disProduct/index.js |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index fc5464f..7bde532 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -53,12 +53,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 () {
@@ -74,7 +78,7 @@
       });
       setTimeout(() => {
         this.setData({ showTouch: false });
-      }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+      }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
     },
     refreshCount(){   
       let  temData = wx.getStorageSync('conentCountTemp')  
@@ -135,10 +139,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(()=>{
         this.setData({isLoading:false})
       })

--
Gitblit v1.9.3