From 26fb0b3e76f52212a2cef49a0bc0b94e7425880c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 10:55:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/components/disProduct/index.js | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index abd00dd..ae5777e 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,4 +1,4 @@
-import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -22,27 +22,26 @@
pageSize: 10,
total: 0,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: ""
},
attached() {
this.getCatelist()
var app = getApp()
- console.log('globalData', app.globalData);
- if(app.globalData.catalogCode){
+ if (app.globalData.catalogCode) {
this.setData({ catalogCode: app.globalData.catalogCode })
setTimeout(() => {
- console.log('catalogCode', this.data.catalogCode);
+ console.log('catalogCode', this.data.catalogCode)
getApp().globalData.catalogCode = ''
}, 2000)
}
},
methods: {
- getCatelist(){
+ getCatelist() {
getCatalogList({
catalogCode: 'product_intro'
}).then(res => {
- if(res.data && res.data.length > 0){
+ if (res.data && res.data.length > 0) {
this.setData({
catalogCode: this.data.catalogCode || res.data[0].code,
cateList: res.data
@@ -66,14 +65,13 @@
})
},
bindblur() {
- console.log('澶卞幓鐒︾偣');
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
getList() {
- const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
+ const { catalogCode, tagCodes, pageNum, pageSize, sortType, query } = this.data
getZhongTaiProductPage({
- catalogCode,pageNum,pageSize,sortType,query,tagCodes
+ catalogCode, pageNum, pageSize, sortType, query, tagCodes
}).then(res => {
this.setData({
datalist: [...this.data.datalist, ...res.data.records],
@@ -82,29 +80,33 @@
})
},
scrolltolower() {
- console.log('瑙﹀簳浜嬩欢');
+ console.log('瑙﹀簳浜嬩欢')
const { total, datalist, pageNum } = this.data
- if(total > datalist.length){
+ if (total > datalist.length) {
this.setData({ pageNum: pageNum + 1 })
this.getList()
- }else{
+ } else {
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
icon: 'none'
})
}
},
+ scrolltoupper() {
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
+ this.getList()
+ },
cateClick(e) {
const catalogCode = e.currentTarget.dataset.code
- this.setData({ catalogCode })
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ catalogCode, tagCodes: [] })
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getTag()
this.getList()
},
statusChange(e) {
const sortType = e.currentTarget.dataset.status
- this.setData({sortType})
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ sortType })
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
handleDetail(e) {
@@ -118,14 +120,14 @@
const paramIndex = e.currentTarget.dataset.index
const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
- console.log('code', code);
- console.log('tagCodes', tagCodes);
- if(index === -1){
+ console.log('code', code)
+ console.log('tagCodes', tagCodes)
+ if (index === -1) {
// 鍚宲aram閲宑ode閲嶅
- if(activeParam && activeParam.length > 0){
+ if (activeParam && activeParam.length > 0) {
activeParam.forEach(item => {
const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
+ if (indexTemp > -1) {
tagCodes.splice(indexTemp, 1)
}
})
@@ -133,41 +135,39 @@
tagCodes.push(code)
secondCateList[activeIndex].paramIndex = paramIndex
secondCateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
- }else{
+ } else {
tagCodes.splice(index, 1)
secondCateList[activeIndex].paramIndex = -1
secondCateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,datalist: [],total: 0})
this.setData({ tagCodes, secondCateList })
},
- changeShowParams(e){
+ changeShowParams(e) {
const { secondCateList } = this.data
const activeIndex = e.currentTarget.dataset.index
- console.log('activeIndex', activeIndex);
- console.log('secondCateList', secondCateList);
- if(activeIndex === this.data.activeIndex){
+ console.log('activeIndex', activeIndex)
+ console.log('secondCateList', secondCateList)
+ if (activeIndex === this.data.activeIndex) {
this.setData({ activeIndex: -1, activeParam: [] })
- }else{
- this.setData({
+ } else {
+ this.setData({
activeIndex,
activeParam: secondCateList[activeIndex].valueVos
})
}
- console.log('activeParam', this.data.activeParam);
// this.setData({showTwo: false})
},
cancelParam() {
const { secondCateList } = this.data
secondCateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
- this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
+ this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 })
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1, activeIndex: -1, datalist: [], total: 0 })
this.getList()
},
}
--
Gitblit v1.9.3