From 816d84a76c1a2f16f88dba70664397961f55caa1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disCase/index.js | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index f10577b..3e13e89 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,10 +15,11 @@
cateList: [],
dataList: [],
+ total: 0,
pageNum: 1,
pageSize: 10,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: 'whole_case'
},
attached() {
@@ -46,13 +47,30 @@
catalogCode,pageNum,pageSize,tagCodes, sortType,query
}).then(res => {
if(res.data){
- this.setData({ dataList: res.data.records })
+ 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({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
handleAction(e){
@@ -78,6 +96,15 @@
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
@@ -86,6 +113,7 @@
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
+ this.setData({ pageNum: 1,dataList: [],total: 0})
this.setData({ tagCodes, cateList })
console.log('tagCodes', tagCodes);
},
@@ -98,10 +126,12 @@
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,dataList: [],total: 0})
this.getList()
},
changeShowParams(e){
--
Gitblit v1.9.3