From 2c08a98f7e85ec7c9376f27a7933e75e44d672f7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 27 八月 2024 15:52:59 +0800
Subject: [PATCH] ll

---
 wechat_jiaxuan/components/disProduct/index.js |  213 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 165 insertions(+), 48 deletions(-)

diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index c67db66..bc7e2fb 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,5 +1,6 @@
 import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
 import { eventBus } from '../../utils/eventBus'
+let touchDot = 0
 Component({
   /**
    * 缁勪欢鐨勫睘鎬у垪琛�
@@ -12,6 +13,10 @@
    * 缁勪欢鐨勫垵濮嬫暟鎹�
    */
   data: {
+    // 鍔ㄧ敾
+    showTouch: true,
+    animationData: {},
+
     activeIndex: -1,
     activeParam: [],
     tagCodes: [],
@@ -62,8 +67,48 @@
         getApp().globalData.catalogCode = ''
       }, 2000)
     }
+    this.animation = wx.createAnimation({
+      duration: 600,
+      timingFunction: 'ease',
+    });
   },
   methods: {
+    bindscrolltoupper() {
+      this.setData({ showTouch: true })
+      this.fadeIn();
+    },
+    touchstart(e){
+      touchDot = e.detail.scrollTop;
+    },
+    touchmove(e) {
+      var touchMove = e.detail.scrollTop;
+      if(touchMove - touchDot > 24){
+        touchDot = touchMove
+        this.fadeOut();
+      }
+      if(touchDot - touchMove > 24){
+        touchDot = touchMove
+        setTimeout(() => {
+          this.setData({ showTouch: true })
+          this.fadeIn();
+        }, 200)
+      }
+    },
+    fadeIn: function () {
+      this.animation.opacity(1).step();
+      this.setData({
+        animationData: this.animation.export()
+      });
+    },
+    fadeOut: function () {
+      this.animation.opacity(0).step();
+      this.setData({
+        animationData: this.animation.export()
+      });
+      setTimeout(() => {
+        this.setData({ showTouch: false });
+      }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
+    },
     getCatelist() {
       getCatalogList({
         catalogCode: 'product_intro'
@@ -101,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})
       })
@@ -149,71 +196,141 @@
     tagClick(e) {
       const code = e.currentTarget.dataset.code
       const paramIndex = e.currentTarget.dataset.index
-      const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
-      const index = tagCodes.indexOf(code)
-      console.log('code', code)
-      console.log('tagCodes', tagCodes)
-      console.log(secondCateList)
-      if ( secondCateList[activeIndex].tempParamIndex==null ||      secondCateList[activeIndex].tempParamIndex != paramIndex) {
-        // 鍚宲aram閲宑ode閲嶅
-        // if (activeParam && activeParam.length > 0) {
-        //   activeParam.forEach(item => {
-        //     const indexTemp = tagCodes.indexOf(item.labelValueCode)
-        //     if (indexTemp > -1) {
-        //       tagCodes.splice(indexTemp, 1)
-        //     }
-        //   })
-        // }
-        //tagCodes.push(code)
-        secondCateList[activeIndex].tempParamIndex = paramIndex
-        secondCateList[activeIndex].tempParamCode = code
-        secondCateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+      const {
+        secondCateList,
+        tagCodes,
+        activeParam,
+        activeIndex
+      } = this.data
+      // 鐐瑰嚮瀛愭爣绛�
+      console.log('openRelLabel', secondCateList[activeIndex].openRelLabel);
+      if (secondCateList[activeIndex].openRelLabel) {
+        if (secondCateList[activeIndex].tempParamRelIndex == null || secondCateList[activeIndex].tempParamRelIndex != paramIndex) {
+          secondCateList[activeIndex].tempParamRelIndex = paramIndex
+          secondCateList[activeIndex].tempParamRelCode = code
+          secondCateList[activeIndex].tempParamRelName = activeParam[paramIndex].labelValueName
+        } else {
+          secondCateList[activeIndex].tempParamRelIndex = -1
+          secondCateList[activeIndex].tempParamRelCode = ''
+          secondCateList[activeIndex].tempParamRelName = ''
+        }
+        console.log('secondCateList', secondCateList);
       } else {
-      //  tagCodes.splice(index, 1)
-        secondCateList[activeIndex].tempParamIndex = -1
-        secondCateList[activeIndex].tempParamCode = ''
-        secondCateList[activeIndex].tempParamName = ''
+        // 鐐瑰嚮鐖舵爣绛�
+        const relLabel = secondCateList[activeIndex].valueVos[paramIndex].relLabel || []
+        if (relLabel.length > 0 && relLabel[0].labelCode) {
+          secondCateList[activeIndex].relLabel = relLabel[0]
+        }else{
+          secondCateList[activeIndex].relLabel = null
+        }
+        secondCateList[activeIndex].tempParamRelIndex = -1
+        secondCateList[activeIndex].tempParamRelCode = ''
+        secondCateList[activeIndex].tempParamRelName = ''
+        if (secondCateList[activeIndex].tempParamIndex == null || secondCateList[activeIndex].tempParamIndex != paramIndex) {
+          secondCateList[activeIndex].tempParamIndex = paramIndex
+          secondCateList[activeIndex].tempParamCode = code
+          secondCateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+        } else {
+          secondCateList[activeIndex].tempParamIndex = -1
+          secondCateList[activeIndex].tempParamCode = ''
+          secondCateList[activeIndex].tempParamName = ''
+        }
       }
-      this.setData({secondCateList })
+      this.setData({
+        tagCodes,
+        secondCateList
+      })
     },
     changeShowParams(e) {
-      const { secondCateList } = this.data
+      const {
+        secondCateList,
+        activeParam
+      } = this.data
       const activeIndex = e.currentTarget.dataset.index
-      console.log('activeIndex', activeIndex)
-      console.log('secondCateList', secondCateList)
-      if (activeIndex === this.data.activeIndex) {
-        this.setData({ activeIndex: -1, activeParam: [] })
+      const type = e.currentTarget.dataset.type || ''
+      // console.log('activeIndex', activeIndex);
+      // 閽堝鏈夊瓙闆嗙殑label
+      if (type && type == 'child') {
+        if (secondCateList[activeIndex].openRelLabel) {
+          secondCateList[activeIndex].openRelLabel = false
+          this.setData({
+            activeIndex,
+            activeParam: [],
+            secondCateList
+          })
+        } else {
+          secondCateList[activeIndex].openRelLabel = true
+          this.setData({
+            activeParam: secondCateList[activeIndex].relLabel.valueVos,
+            secondCateList,
+            activeIndex
+          })
+        }
+        return
+      }
+      // 闈炲瓙闆嗙殑label
+      secondCateList[activeIndex].openRelLabel = false
+      this.setData({ secondCateList })
+      if (activeIndex === this.data.activeIndex && activeParam.length > 0) {
+        this.setData({
+          activeIndex: -1,
+          activeParam: []
+        })
       } else {
         this.setData({
           activeIndex,
           activeParam: secondCateList[activeIndex].valueVos
         })
       }
-      // this.setData({showTwo: false})
     },
     cancelParam() {
-      const { secondCateList } = this.data
-      secondCateList.forEach(item => { 
+      const {
+        secondCateList
+      } = this.data
+      secondCateList.forEach(item => {
         item.tempParamIndex = item.paramIndex
-        item.tempParamName =   item.paramName
-        item.tempParamCode =  item.paramCode 
+        item.tempParamName = item.paramName
+        item.tempParamCode = item.paramCode
+        item.relLabel = null
+        item.openRelLabel = false
+        item.tempParamRelIndex = null
+        item.tempParamRelCode = null
+        item.tempParamRelName = null
       })
       // this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 }) 
-      this.setData({ activeParam: [],activeIndex: -1 ,secondCateList}) 
+      this.setData({
+        activeParam: [],
+        activeIndex: -1,
+        secondCateList
+      })
     },
     subParam() {
-      const { secondCateList } = this.data
+      const {
+        secondCateList
+      } = this.data
       var codes = []
       secondCateList.forEach(item => {
-        item.paramIndex =  item.tempParamIndex 
-        item.paramName = item.tempParamName  
+        item.paramIndex = item.tempParamIndex
+        item.paramName = item.tempParamName
         item.paramCode = item.tempParamCode
-        if( item.paramIndex>-1 && item.tempParamCode){
-          codes.push( item.tempParamCode) 
-        } 
-      })  
-      this.setData({tagCodes:codes}) 
-      this.setData({ pageNum: 1, activeParam: [] ,activeIndex: -1, datalist: [], total: 0 })
+        item.openRelLabel = false
+        if(item.tempParamRelIndex > -1 && item.tempParamRelCode){
+          return codes.push(item.tempParamRelCode)
+        }
+        if (item.paramIndex > -1 && item.tempParamCode) {
+          codes.push(item.paramCode)
+        }
+      })
+      this.setData({
+        tagCodes: codes
+      })
+      this.setData({
+        pageNum: 1,
+        activeParam: [],
+        activeIndex: -1,
+        datalist: [],
+        total: 0
+      })
       this.getList()
     },
   }

--
Gitblit v1.9.3