From 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/components/disCase/index.js | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 441e32a..04a3324 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -12,7 +12,7 @@
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
total: 0,
@@ -42,6 +42,11 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiWholecasePage({
catalogCode,pageNum,pageSize,tagCodes, sortType,query
@@ -52,6 +57,8 @@
dataList: [...this.data.dataList, ...res.data.records],
})
}
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -90,40 +97,33 @@
})
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
- const paramIndex = e.currentTarget.dataset.index
+ const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
-
- 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{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ const index = tagCodes.indexOf(code)
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
+ } else {
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ tagCodes, cateList })
+ this.setData({cateList })
console.log('tagCodes', tagCodes);
},
cancelParam() {
const { cateList } = this.data
- console.log('cateList', cateList);
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = 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})
@@ -131,7 +131,17 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,activeIndex: -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.paramIndex >-1 && item.paramCode){
+ codes.push(item.paramCode)
+ }
+ })
+ this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
this.getList()
},
changeShowParams(e){
--
Gitblit v1.9.3