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/disRealpic/index.js | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 000c3d7..aa2ca72 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
@@ -41,6 +41,11 @@
})
},
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,6 +54,8 @@
dataList: [...this.data.dataList, ...res.data.records],
total: res.data.total,
})
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -66,9 +73,10 @@
},
videoClick(e) {
const { videourl } = e.currentTarget.dataset
- wx.previewMedia({
- sources: [{ url: videourl, type: 'video' }]
- })
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(videourl,this );
+ }
},
priviewFull(e){
const item = e.currentTarget.dataset.item
@@ -121,44 +129,50 @@
}
},
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
+ const { cateList, tagCodes, activeParam, activeIndex } = this.data
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
+ console.log(code)
}else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
+ console.log(1)
}
- this.setData({ tagCodes, cateList })
+ this.setData({ cateList })
},
cancelParam() {
const { cateList } = this.data
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})
this.getList()
},
subParam() {
- this.setData({ activeParam: [] })
+ 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()
},
--
Gitblit v1.9.3