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/disProduct/index.js | 86 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 9 deletions(-)
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index 2e23c6d..7bde532 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -1,4 +1,5 @@
import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -7,6 +8,10 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
tagCodes: [],
@@ -19,10 +24,10 @@
pageSize: 10,
total: 0,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: ""
},
- attached() {
+ attached() {
this.getCatelist()
var app = getApp()
console.log('globalData', app.globalData);
@@ -33,8 +38,70 @@
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); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
+ 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(){
getCatalogList({
catalogCode: 'product_intro'
@@ -72,10 +139,12 @@
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(()=>{
this.setData({isLoading:false})
})
@@ -120,9 +189,8 @@
tagClick(e) {
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
- const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
- if(index === -1){
+ const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
+ if( secondCateList[activeIndex].tempParamIndex==null || secondCateList[activeIndex].tempParamIndex != paramIndex){
// 鍚宲aram閲宑ode閲嶅
// if (activeParam && activeParam.length > 0) {
// activeParam.forEach(item => {
--
Gitblit v1.9.3