From 26fb0b3e76f52212a2cef49a0bc0b94e7425880c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 10:55:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_jiaxuan/components/disCase/index.js |   85 +++++++++++++++++++++++++++++-------------
 1 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 1059c35..0c52299 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -4,7 +4,7 @@
    * 缁勪欢鐨勫睘鎬у垪琛�
    */
   properties: {
-
+    menuButtonInfo: Object
   },
   data: {
     activeIndex: -1,
@@ -15,22 +15,23 @@
 
     cateList: [],
     dataList: [],
+    total: 0,
     pageNum: 1,
     pageSize: 10,
-    search: '',
-    sortType: 'NORMAL',
+    query: '',
+    sortType: '',
     catalogCode: 'whole_case'
   },
   attached() {
     this.getCatelist()
   },
   methods: {
-    getCatelist(){
+    getCatelist() {
       const { catalogCode } = this.data
       getCataLogTagList({
-        catalogCode: 'real_case'
+        catalogCode
       }).then(res => {
-        if(res.data && res.data.length > 0){
+        if (res.data && res.data.length > 0) {
           this.setData({
             cateList: res.data
           })
@@ -41,19 +42,38 @@
       })
     },
     getList() {
-      const { sortType, search, tagCodes, pageNum, pageSize } = this.data
+      const { sortType, query, tagCodes, pageNum, pageSize, catalogCode } = this.data
       getZhongTaiWholecasePage({
-        catalogCode: 'whole_case',tagCodes,pageNum,pageSize, sortType,search
+        catalogCode, pageNum, pageSize, tagCodes, sortType, query
       }).then(res => {
-        this.setData({ dataList: res.data.records })
+        if (res.data) {
+          this.setData({
+            total: res.data.total,
+            dataList: [...this.data.dataList, ...res.data.records],
+          })
+        }
       })
+    },
+    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'
+        })
+      }
     },
     statusChange(e) {
       const sortType = e.currentTarget.dataset.status
-      this.setData({sortType})
+      this.setData({ sortType })
+      this.setData({ pageNum: 1, dataList: [], total: 0 })
       this.getList()
     },
-    handleAction(e){
+    handleAction(e) {
       const actionType = e.currentTarget.dataset.code
       const id = e.currentTarget.dataset.id
       actionDo({
@@ -64,8 +84,9 @@
       })
     },
     handleDetail(e) {
+      const id = e.currentTarget.dataset.id
       wx.navigateTo({
-        url: '/pages/detailDis/case',
+        url: '/pages/detailDis/case?id=' + id,
       })
     },
     tagClick(e) {
@@ -73,52 +94,64 @@
       const paramIndex = e.currentTarget.dataset.index
       const { cateList, tagCodes, activeParam, activeIndex } = this.data
       const index = tagCodes.indexOf(code)
-      
-      if(index === -1){
+
+      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)
         cateList[activeIndex].paramIndex = paramIndex
         cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
-      }else{
+      } else {
         tagCodes.splice(index, 1)
         cateList[activeIndex].paramIndex = -1
         cateList[activeIndex].paramName = ''
       }
+      this.setData({ pageNum: 1, dataList: [], total: 0 })
       this.setData({ tagCodes, cateList })
-      console.log('tagCodes', tagCodes);
+      console.log('tagCodes', tagCodes)
     },
     cancelParam() {
       const { cateList } = this.data
       cateList.forEach(item => {
         item.paramIndex = -1
-        item.paramName = ''
+        item.paramName = item.paramName || ''
       })
-      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+      this.setData({ tagCodes: [], activeParam: [], cateList, activeIndex: -1 })
     },
     bindblur() {
+      this.setData({ pageNum: 1, dataList: [], total: 0 })
       this.getList()
     },
     subParam() {
       this.setData({ activeParam: [] })
+      this.setData({ pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
       this.getList()
     },
-    changeShowParams(e){
+    changeShowParams(e) {
       const { cateList } = this.data
       const activeIndex = e.currentTarget.dataset.index
-      if(activeIndex === this.data.activeIndex){
+      if (activeIndex === this.data.activeIndex) {
         this.setData({ activeIndex: -1, activeParam: [], selParam: '' })
-      }else{
-        this.setData({ 
+      } else {
+        this.setData({
           activeIndex,
           activeParam: cateList[activeIndex].valueVos
         })
       }
-      
+
       // this.setData({showTwo: false})
     },
-    changeTwo(){
+    changeTwo() {
       const showTwo = !this.data.showTwo
-      this.setData({showTwo})
-      this.setData({showOne: false})
+      this.setData({ showTwo })
+      this.setData({ showOne: false })
     },
   }
 })

--
Gitblit v1.9.3