Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 wechat_staff/components/disProduct/index.js

@@ -1,4 +1,8 @@
import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
import {
  getCatalogList,
  getCataLogTagList,
  getZhongTaiProductPage
} from '../../api/index'
let touchDot = 0
Component({
  /**
@@ -32,7 +36,9 @@
    var app = getApp()
    console.log('globalData', app.globalData);
    if(app.globalData.catalogCode){
      this.setData({ catalogCode: app.globalData.catalogCode })
      this.setData({
        catalogCode: app.globalData.catalogCode
      })
      setTimeout(() => {
        console.log('catalogCode', this.data.catalogCode);
        getApp().globalData.catalogCode = ''
@@ -45,7 +51,9 @@
  },
  methods: {
    bindscrolltoupper() {
      this.setData({ showTouch: true })
      this.setData({
        showTouch: true
      })
      this.fadeIn();
    },
    touchstart(e){
@@ -60,7 +68,9 @@
      if(touchDot - touchMove > 24){
        touchDot = touchMove
        setTimeout(() => {
          this.setData({ showTouch: true })
          this.setData({
            showTouch: true
          })
          this.fadeIn();
        }, 200)
      }
@@ -77,7 +87,9 @@
        animationData: this.animation.export()
      });
      setTimeout(() => {
        this.setData({ showTouch: false });
        this.setData({
          showTouch: false
        });
      }, 200); // 动画持续时间
    },
    refreshCount(){   
@@ -98,7 +110,9 @@
                }
              }   
          })
          this.setData({datalist:dataList})
        this.setData({
          datalist: dataList
        })
           wx.setStorageSync('conentCountTemp',null)
      }
    },
@@ -131,13 +145,29 @@
    },
    bindblur() {
      console.log('失去焦点');
      this.setData({ pageNum: 1,datalist: [],total: 0})
      this.setData({
        pageNum: 1,
        datalist: [],
        total: 0
      })
      this.getList()
    },
    getList() {  
      const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
      const {
        catalogCode,
        tagCodes,
        pageNum,
        pageSize,
        sortType,
        query
      } = this.data
      getZhongTaiProductPage({
        catalogCode,pageNum,pageSize,sortType,query,tagCodes
        catalogCode,
        pageNum,
        pageSize,
        sortType,
        query,
        tagCodes
      }).then(res => {
        if(res.data && res.data.records){
          this.setData({
@@ -146,14 +176,22 @@
          })
        }
      }).finally(()=>{
        this.setData({isLoading:false})
        this.setData({
          isLoading: false
        })
      })
    },
    scrolltolower() {
      console.log('触底事件');
      const { total, datalist, pageNum } = this.data
      const {
        total,
        datalist,
        pageNum
      } = this.data
      if(total > datalist.length){
        this.setData({ pageNum: pageNum + 1 })
        this.setData({
          pageNum: pageNum + 1
        })
        this.getList()
      }else{
        wx.showToast({
@@ -163,21 +201,38 @@
      }
    },
    cateClick(e) {
      var {isLoading} = this.data
      var {
        isLoading
      } = this.data
      if(isLoading){
        return
      }
      this.setData({isLoading:true})
      this.setData({
        isLoading: true
      })
      const catalogCode = e.currentTarget.dataset.code
      this.setData({ catalogCode, tagCodes: [] })
      this.setData({ pageNum: 1,datalist: [],total: 0})
      this.setData({
        catalogCode,
        tagCodes: []
      })
      this.setData({
        pageNum: 1,
        datalist: [],
        total: 0
      })
      this.getTag()
      this.getList()
    },
    statusChange(e) {
      const sortType = e.currentTarget.dataset.status
      this.setData({sortType})
      this.setData({ pageNum: 1,datalist: [],total: 0})
      this.setData({
        sortType
      })
      this.setData({
        pageNum: 1,
        datalist: [],
        total: 0
      })
      this.getList()
    },
    handleDetail(e) {
@@ -189,69 +244,141 @@
    tagClick(e) {
      const code = e.currentTarget.dataset.code
      const paramIndex = e.currentTarget.dataset.index
      const { secondCateList, tagCodes, activeParam, activeIndex } = this.data 
      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 {
        // 点击父标签
        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){
         // 同param里code重复
        // 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
      } else {
      //  tagCodes.splice(index, 1)
        secondCateList[activeIndex].tempParamIndex = -1
        secondCateList[activeIndex].tempParamCode = ''
        secondCateList[activeIndex].tempParamName = ''
      }
      this.setData({ tagCodes, 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('activeIndex', this.data.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
        })
      }
      console.log('activeParam', this.data.activeParam);
      // this.setData({showTwo: false})
    },
    cancelParam() {
      const { secondCateList } = this.data
      const {
        secondCateList
      } = this.data
      secondCateList.forEach(item => { 
        item.tempParamIndex = item.paramIndex
        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.paramCode = item.tempParamCode
        item.openRelLabel = false
        if(item.tempParamRelIndex > -1 && item.tempParamRelCode){
          return codes.push(item.tempParamRelCode)
        }
        if( item.paramIndex>-1 && item.tempParamCode){
          codes.push( item.tempParamCode) 
          codes.push(item.paramCode)
        } 
      })  
      this.setData({tagCodes:codes}) 
      this.setData({ pageNum: 1, activeParam: [] ,activeIndex: -1, datalist: [], total: 0 })
      this.setData({
        tagCodes: codes
      })
      this.setData({
        pageNum: 1,
        activeParam: [],
        activeIndex: -1,
        datalist: [],
        total: 0
      })
      this.getList()
    },
  }