From 3f324f4c5ec2dc66d502adf2ac72bc84f05a2ffd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:29:01 +0800
Subject: [PATCH] 提交

---
 wechat_jiaxuan/components/disRealpic/index.js |   78 +++++++++++++++++++++++++++------------
 1 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index bf22744..24d02de 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -11,14 +11,14 @@
     activeParam: [],
     selParam: '',
     tagCodes: [],
-
+    isLoading:false,
 
     cateList: [],
     dataList: [],
     pageNum: 1,
     pageSize: 10,
     query: '',
-    sortType: 'NORMAL',
+    sortType: '',
     catalogCode: 'real_case'
   },
   attached() {
@@ -41,6 +41,10 @@
       })
     },
     getList() {
+      if(this.data.isLoading){
+        return
+      }
+      this.setData({isLoading:true})
       const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
       getZhongTaiRealcasePage({
         catalogCode,tagCodes,pageNum,pageSize, sortType,query
@@ -49,7 +53,13 @@
           dataList: [...this.data.dataList, ...res.data.records],
           total: res.data.total,
         })
+      }).finally(()=>{
+        this.setData({isLoading:false})
       })
+    },
+    scrolltoupper() {
+      this.setData({ pageNum: 1,datalist: [],total: 0})
+      this.getList()
     },
     scrolltolower() {
       console.log('瑙﹀簳浜嬩欢');
@@ -108,6 +118,10 @@
       if(item.openType == 'link'){
         wx.navigateTo({
           url: '/pages/webView/index?link=' + item.openContent,
+          success: function(res) {
+            // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+            res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent})
+          }
         })
       }
       if(item.openType == 'page'){
@@ -117,46 +131,62 @@
       }
     },
     tagClick(e) {
+      if(this.data.isLoading){
+        return
+      }
       const code = e.currentTarget.dataset.code
       const paramIndex = e.currentTarget.dataset.index
       const { cateList, tagCodes, activeParam, activeIndex } = this.data
       const index = tagCodes.indexOf(code)
       
       if(index === -1){
-        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
+        // 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].tempParamIndex = paramIndex
+        cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+        cateList[activeIndex].tempParamCode = code
       }else{
-        tagCodes.splice(index, 1)
-        cateList[activeIndex].paramIndex = -1
-        cateList[activeIndex].paramName = ''
+        // tagCodes.splice(index, 1)
+        cateList[activeIndex].tempParamIndex = -1
+        cateList[activeIndex].tempParamName = null
+        cateList[activeIndex].tempParamCode = null
       }
-      this.setData({ pageNum: 1,dataList: [],total: 0})
-      this.setData({ tagCodes, cateList })
-      console.log('tagCodes', tagCodes);
+      // this.setData({ pageNum: 1,dataList: [],total: 0})
+      this.setData({ cateList }) 
     },
     cancelParam() {
       const { cateList } = this.data
       cateList.forEach(item => {
-        item.paramIndex = -1
-        item.paramName = ''
+        item.tempParamIndex = item.paramIndex
+        item.tempParamName =   item.paramName 
+        item.tempParamCode =   item.paramCode
       })
-      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+      this.setData({    activeParam: [],cateList,activeIndex: -1 }) 
     },
     bindblur() {
+      this.setData({ pageNum: 1,dataList: [],total: 0})
       this.getList()
     },
     subParam() {
-      this.setData({ activeParam: [] })
-      this.setData({ pageNum: 1,dataList: [],total: 0})
+      const { cateList } = this.data
+      var codes =[]
+      cateList.forEach(item => { 
+        item.paramIndex = item.tempParamIndex
+        item.paramName =   item.tempParamName 
+        item.paramCode =   item.tempParamCode
+        if(item.tempParamIndex >-1 && item.tempParamCode){
+          codes.push(item.tempParamCode)
+        }
+      }) 
+      this.setData({ activeParam: [],tagCodes:codes })
+      this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
       this.getList()
     },
     changeShowParams(e){

--
Gitblit v1.9.3