From b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 七月 2024 15:34:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/components/disProduct/index.js |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 102 insertions(+), 16 deletions(-)

diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 273d6e0..88d9997 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,29 +1,41 @@
-import { getCatalogList, getZhongTaiProductPage } from '../../api/index'
+import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
 Component({
   /**
    * 缁勪欢鐨勫睘鎬у垪琛�
    */
   properties: {
-
+    menuButtonInfo: Object
   },
 
   /**
    * 缁勪欢鐨勫垵濮嬫暟鎹�
    */
   data: {
-    showOne: false,
-    showTwo: false,
+    activeIndex: -1,
+    activeParam: [],
+    tagCodes: [],
 
     cateList: [],
+    secondCateList: [],
     datalist: [],
     pageNum: 1,
     pageSize: 10,
-    search: '',
+    total: 0,
+    query: '',
     sortType: 'NORMAL',
     catalogCode: ""
   },
   attached() {
     this.getCatelist()
+    var app = getApp()
+    console.log('globalData', app.globalData);
+    if(app.globalData.catalogCode){
+      this.setData({ catalogCode: app.globalData.catalogCode })
+      setTimeout(() => {
+        console.log('catalogCode', this.data.catalogCode);
+        getApp().globalData.catalogCode = ''
+      }, 2000)
+    }
   },
   methods: {
     getCatelist(){
@@ -32,22 +44,33 @@
       }).then(res => {
         if(res.data && res.data.length > 0){
           this.setData({
-            catalogCode: res.data[0].code,
+            catalogCode: this.data.catalogCode || res.data[0].code,
             cateList: res.data
           })
+          this.getTag()
           setTimeout(() => {
             this.getList()
           }, 300)
         }
       })
     },
+    getTag() {
+      const catalogCode = this.data.catalogCode
+      getCataLogTagList({
+        catalogCode
+      }).then(res => {
+        this.setData({
+          secondCateList: res.data || [],
+        })
+      })
+    },
     bindblur() {
       this.getList()
     },
     getList() {
-      const { catalogCode, pageNum, pageSize, sortType, search } = this.data
+      const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
       getZhongTaiProductPage({
-        catalogCode,pageNum,pageSize,sortType,search
+        catalogCode,pageNum,pageSize,sortType,query,tagCodes
       }).then(res => {
         this.setData({
           datalist: [...this.data.datalist, ...res.data.records],
@@ -55,14 +78,30 @@
         })
       })
     },
+    scrolltolower() {
+      console.log('瑙﹀簳浜嬩欢');
+      const { total, datalist, pageNum } = this.data
+      if(total > datalist.length){
+        this.setData({ pageNum: pageNum + 1 })
+        this.getList()
+      }else{
+        wx.showToast({
+          title: '鏆傛棤鏇村鏁版嵁',
+          icon: 'none'
+        })
+      }
+    },
     cateClick(e) {
       const catalogCode = e.currentTarget.dataset.code
       this.setData({ catalogCode })
+      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.getList()
     },
     handleDetail(e) {
@@ -71,15 +110,62 @@
         url: '/pages/detailDis/product?id=' + id,
       })
     },
-    changeOne(){
-      const showOne = !this.data.showOne
-      this.setData({showOne})
-      this.setData({showTwo: false})
+    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);
+      if(index === -1){
+        // 鍚宲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].paramIndex = paramIndex
+        secondCateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+      }else{
+        tagCodes.splice(index, 1)
+        secondCateList[activeIndex].paramIndex = -1
+        secondCateList[activeIndex].paramName = ''
+      }
+      this.setData({ pageNum: 1,datalist: [],total: 0})
+      this.setData({ tagCodes, secondCateList })
     },
-    changeTwo(){
-      const showTwo = !this.data.showTwo
-      this.setData({showTwo})
-      this.setData({showOne: false})
+    changeShowParams(e){
+      const { secondCateList } = 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: [] })
+      }else{
+        this.setData({ 
+          activeIndex,
+          activeParam: secondCateList[activeIndex].valueVos
+        })
+      }
+      console.log('activeParam', this.data.activeParam);
+      // this.setData({showTwo: false})
+    },
+    cancelParam() {
+      const { secondCateList } = this.data
+      secondCateList.forEach(item => {
+        item.paramIndex = -1
+        item.paramName = ''
+      })
+      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+    },
+    subParam() {
+      this.setData({ activeParam: [] })
+      this.setData({ pageNum: 1,datalist: [],total: 0})
+      this.getList()
     },
   }
 })

--
Gitblit v1.9.3