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 | 118 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 22 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index e932f66..ae5777e 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,44 +1,47 @@
-import { getCatalogList, getZhongTaiProductPage } from '../../api/index'
+import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
*/
properties: {
+ menuButtonInfo: Object
},
/**
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
- showOne: false,
- showTwo: false,
+ activeIndex: -1,
+ activeParam: [],
+ tagCodes: [],
cateList: [],
+ secondCateList: [],
datalist: [],
pageNum: 1,
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
@@ -52,17 +55,23 @@
},
getTag() {
const catalogCode = this.data.catalogCode
- getCatalogList({
+ getCataLogTagList({
catalogCode
+ }).then(res => {
+ this.setData({
+ secondCateList: res.data || [],
+ activeParam: []
+ })
})
},
bindblur() {
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
getList() {
- const { catalogCode, pageNum, pageSize, sortType, query } = this.data
+ const { catalogCode, tagCodes, pageNum, pageSize, sortType, query } = this.data
getZhongTaiProductPage({
- catalogCode,pageNum,pageSize,sortType,query
+ catalogCode, pageNum, pageSize, sortType, query, tagCodes
}).then(res => {
this.setData({
datalist: [...this.data.datalist, ...res.data.records],
@@ -70,14 +79,34 @@
})
})
},
+ scrolltolower() {
+ console.log('瑙﹀簳浜嬩欢')
+ const { total, datalist, pageNum } = this.data
+ if (total > datalist.length) {
+ this.setData({ pageNum: pageNum + 1 })
+ this.getList()
+ } 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({ 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({ sortType })
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
handleDetail(e) {
@@ -86,15 +115,60 @@
url: '/pages/detailDis/product?id=' + id,
})
},
- changeOne(){
- const showOne = !this.data.showOne
- this.setData({showOne})
- this.setData({showTwo: false})
+ 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)
+ console.log('code', code)
+ console.log('tagCodes', tagCodes)
+ 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)
+ secondCateList[activeIndex].paramIndex = paramIndex
+ secondCateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ } else {
+ tagCodes.splice(index, 1)
+ secondCateList[activeIndex].paramIndex = -1
+ secondCateList[activeIndex].paramName = ''
+ }
+ this.setData({ tagCodes, secondCateList })
},
- changeTwo(){
- const showTwo = !this.data.showTwo
- this.setData({showTwo})
- this.setData({showOne: false})
+ 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) {
+ this.setData({ activeIndex: -1, activeParam: [] })
+ } else {
+ this.setData({
+ activeIndex,
+ activeParam: secondCateList[activeIndex].valueVos
+ })
+ }
+ // this.setData({showTwo: false})
+ },
+ cancelParam() {
+ const { secondCateList } = this.data
+ secondCateList.forEach(item => {
+ item.paramIndex = -1
+ item.paramName = item.paramName || ''
+ })
+ this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 })
+ },
+ subParam() {
+ this.setData({ activeParam: [] })
+ this.setData({ pageNum: 1, activeIndex: -1, datalist: [], total: 0 })
+ this.getList()
},
}
})
--
Gitblit v1.9.3