From b9b6de6fc6cf1d586bd43b2c72b447da03cb01f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 05 八月 2024 18:38:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/components/disProduct/index.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 85c328b..36c966b 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,5 +1,6 @@
import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
import { eventBus } from '../../utils/eventBus'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -12,6 +13,10 @@
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
tagCodes: [],
@@ -24,7 +29,8 @@
total: 0,
query: '',
sortType: '',
- catalogCode: ""
+ catalogCode: "",
+ scrollTop: 0
},
pageLifetimes: {
show: function() {
@@ -34,8 +40,17 @@
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 =(item.viewCount||0) +1
}
})
this.setData({ datalist })
@@ -52,8 +67,44 @@
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 > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ 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 });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
getCatelist() {
getCatalogList({
catalogCode: 'product_intro'
@@ -111,10 +162,6 @@
icon: 'none'
})
}
- },
- scrolltoupper() {
- this.setData({ pageNum: 1, datalist: [], total: 0 })
- this.getList()
},
cateClick(e) {
var {isLoading} = this.data
--
Gitblit v1.9.3