From 9a9af13c74e98dfdb61afd9cbe56b1b7ec8c3414 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 15 八月 2024 18:23:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/components/disProduct/index.js | 157 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 125 insertions(+), 32 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index ae5777e..59064f2 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,4 +1,6 @@
import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -11,10 +13,14 @@
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
tagCodes: [],
-
+ isLoading:false,
cateList: [],
secondCateList: [],
datalist: [],
@@ -23,7 +29,33 @@
total: 0,
query: '',
sortType: '',
- catalogCode: ""
+ catalogCode: "",
+ scrollTop: 0
+ },
+ pageLifetimes: {
+ show: function() {
+ // 椤甸潰琚睍绀�
+ console.log('缁勪欢琚睍绀�');
+ eventBus.once('productDeBack', (info) => {
+ const datalist = this.data.datalist
+ datalist.forEach(item => {
+ if(item.id === info.id){
+ console.log(item)
+ console.log(info)
+ if(item.isCollection != info.isCollection){
+ if(!item.isCollection){
+ item.collectCount = (item.collectCount || 0)+1
+ }else if(item.collectCount >0){
+ item.collectCount = (item.collectCount || 0)-1
+ }
+ }
+ item.isCollection = info.isCollection
+ item.viewCount =(item.viewCount||0) +1
+ }
+ })
+ this.setData({ datalist })
+ })
+ },
},
attached() {
this.getCatelist()
@@ -35,8 +67,48 @@
getApp().globalData.catalogCode = ''
}, 2000)
}
+ 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); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
getCatelist() {
getCatalogList({
catalogCode: 'product_intro'
@@ -69,14 +141,19 @@
this.getList()
},
getList() {
+ var that =this
const { catalogCode, tagCodes, pageNum, pageSize, sortType, query } = this.data
getZhongTaiProductPage({
catalogCode, pageNum, pageSize, sortType, query, tagCodes
}).then(res => {
- this.setData({
- datalist: [...this.data.datalist, ...res.data.records],
- total: res.data.total
- })
+ if (res.data && res.data.records) {
+ this.setData({
+ datalist: [...this.data.datalist, ...res.data.records],
+ total: res.data.total
+ })
+ }
+ }).finally(()=>{
+ that.setData({isLoading:false})
})
},
scrolltolower() {
@@ -92,11 +169,12 @@
})
}
},
- scrolltoupper() {
- this.setData({ pageNum: 1, datalist: [], total: 0 })
- this.getList()
- },
cateClick(e) {
+ var {isLoading} = this.data
+ if(isLoading){
+ return
+ }
+ this.setData({isLoading:true})
const catalogCode = e.currentTarget.dataset.code
this.setData({ catalogCode, tagCodes: [] })
this.setData({ pageNum: 1, datalist: [], total: 0 })
@@ -122,25 +200,28 @@
const index = tagCodes.indexOf(code)
console.log('code', code)
console.log('tagCodes', tagCodes)
- if (index === -1) {
+ console.log(secondCateList)
+ if ( secondCateList[activeIndex].tempParamIndex==null || secondCateList[activeIndex].tempParamIndex != paramIndex) {
// 鍚宲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)
- secondCateList[activeIndex].paramIndex = paramIndex
- secondCateList[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)
+ secondCateList[activeIndex].tempParamIndex = paramIndex
+ secondCateList[activeIndex].tempParamCode = code
+ secondCateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
} else {
- tagCodes.splice(index, 1)
- secondCateList[activeIndex].paramIndex = -1
- secondCateList[activeIndex].paramName = ''
+ // tagCodes.splice(index, 1)
+ secondCateList[activeIndex].tempParamIndex = -1
+ secondCateList[activeIndex].tempParamCode = ''
+ secondCateList[activeIndex].tempParamName = ''
}
- this.setData({ tagCodes, secondCateList })
+ this.setData({secondCateList })
},
changeShowParams(e) {
const { secondCateList } = this.data
@@ -159,15 +240,27 @@
},
cancelParam() {
const { secondCateList } = this.data
- secondCateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ secondCateList.forEach(item => {
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
})
- this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 })
+ // this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 })
+ this.setData({ activeParam: [],activeIndex: -1 ,secondCateList})
},
subParam() {
- this.setData({ activeParam: [] })
- this.setData({ pageNum: 1, activeIndex: -1, datalist: [], total: 0 })
+ const { secondCateList } = this.data
+ var codes = []
+ secondCateList.forEach(item => {
+ item.paramIndex = item.tempParamIndex
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if( item.paramIndex>-1 && item.tempParamCode){
+ codes.push( item.tempParamCode)
+ }
+ })
+ this.setData({tagCodes:codes})
+ this.setData({ pageNum: 1, activeParam: [] ,activeIndex: -1, datalist: [], total: 0 })
this.getList()
},
}
--
Gitblit v1.9.3