From 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 15 八月 2024 10:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/components/disCase/index.js | 138 +++++++++++++++++++++++++++++++++++----------
1 files changed, 106 insertions(+), 32 deletions(-)
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 441e32a..77e8f55 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -1,4 +1,5 @@
import { getCataLogTagList, getZhongTaiWholecasePage, actionDo } from '../../api/index'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -7,25 +8,92 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
total: 0,
pageNum: 1,
pageSize: 10,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: 'whole_case'
},
attached() {
this.getCatelist()
+ this.getList()
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 24){
+ touchDot = touchMove
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 24){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ }, 200)
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
+ refreshCount(){
+ let temData = wx.getStorageSync('conentCountTemp')
+ if(temData && this.data.dataList){
+ var dataList =this.data.dataList;
+ dataList.forEach(item =>{
+ if(item.id+'' == temData.id+'' ){
+ item.viewCount = (item.viewCount ||0)+1;
+ if( item.isCollection != temData.isCollection){
+ if(item.isCollection){
+ item.collectCount = (item.collectCount || 0)-1
+ item.collectCount = item.collectCount >=0? item.collectCount :0;
+ } else{
+ item.collectCount = (item.collectCount || 0)+1
+ }
+ item.isCollection = temData.isCollection
+ }
+ }
+ })
+ this.setData({dataList:dataList})
+ wx.setStorageSync('conentCountTemp',null)
+ }
+ },
getCatelist(){
const { catalogCode } = this.data
getCataLogTagList({
@@ -35,23 +103,26 @@
this.setData({
cateList: res.data
})
- setTimeout(() => {
- this.getList()
- }, 300)
}
})
},
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
}).then(res => {
- if(res.data){
+ if(res.data && res.data.records){
this.setData({
total: res.data.total,
dataList: [...this.data.dataList, ...res.data.records],
})
}
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -90,40 +161,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 +195,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