Merge remote-tracking branch 'origin/master'

k94314517

2024-08-15 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e

 wechat_staff/components/disProduct/index.js

@@ -1,4 +1,5 @@
import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
let touchDot = 0
Component({
  /**
   * 组件的属性列表
@@ -7,6 +8,10 @@
    menuButtonInfo: Object
  },
  data: {
    // 动画
    showTouch: true,
    animationData: {},

    activeIndex: -1,
    activeParam: [],
    tagCodes: [],
@@ -14,14 +19,15 @@
    cateList: [],
    secondCateList: [],
    datalist: [],
    isLoading:false,
    pageNum: 1,
    pageSize: 10,
    total: 0,
    query: '',
    sortType: 'NORMAL',
    sortType: '',
    catalogCode: ""
  },
  attached() {
   attached() {
    this.getCatelist()
    var app = getApp()
    console.log('globalData', app.globalData);
@@ -32,8 +38,70 @@
        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); // 动画持续时间
    },
    refreshCount(){   
      let  temData = wx.getStorageSync('conentCountTemp')  
      if(temData && this.data.datalist){  
          var dataList =this.data.datalist;
          dataList.forEach(item =>{ 
              if(item.id+'' == temData.id+'' ){
                  item.viewCount = (item.viewCount ||0)+1; 
                  if( item.isCollection != temData.isCollection){ 
                    if(item.isCollection){
                        item.collectCount = (item.collectCount || 0)-1
                        item.collectCount  =   item.collectCount >=0?  item.collectCount :0;
                    } else{ 
                        item.collectCount = (item.collectCount || 0)+1
                    }
                    item.isCollection = temData.isCollection
                }
              }   
          })
          this.setData({datalist:dataList})
           wx.setStorageSync('conentCountTemp',null)
      }
    },
    getCatelist(){
      getCatalogList({
        catalogCode: 'product_intro'
@@ -66,15 +134,19 @@
      this.setData({ pageNum: 1,datalist: [],total: 0})
      this.getList()
    },
    getList() {
    getList() {  
      const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
      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})
      })
    },
    scrolltolower() {
@@ -91,6 +163,11 @@
      }
    },
    cateClick(e) {
      var {isLoading} = this.data
      if(isLoading){
        return
      }
      this.setData({isLoading:true})
      const catalogCode = e.currentTarget.dataset.code
      this.setData({ catalogCode, tagCodes: [] })
      this.setData({ pageNum: 1,datalist: [],total: 0})
@@ -112,25 +189,26 @@
    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)
      if(index === -1){
        // 同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].paramIndex = paramIndex
        secondCateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
      }else{
        tagCodes.splice(index, 1)
        secondCateList[activeIndex].paramIndex = -1
        secondCateList[activeIndex].paramName = ''
      const { secondCateList, tagCodes, activeParam, activeIndex } = this.data 
      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 })
    },
@@ -138,6 +216,7 @@
      const { secondCateList } = 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: [] })
@@ -152,16 +231,27 @@
    },
    cancelParam() {
      const { secondCateList } = this.data
      secondCateList.forEach(item => {
        item.paramIndex = -1
        item.paramName = ''
      secondCateList.forEach(item => { 
        item.tempParamIndex = item.paramIndex
        item.tempParamName =   item.paramName
        item.tempParamCode =  item.paramCode 
      })
      this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
      this.getList()
      // this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 }) 
      this.setData({ activeParam: [],activeIndex: -1 ,secondCateList}) 
    },
    subParam() {
      this.setData({ activeParam: [] })
      this.setData({ pageNum: 1,datalist: [],total: 0})
      const { secondCateList } = this.data
      var codes = []
      secondCateList.forEach(item => {
        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 })
      this.getList()
    },
  }