From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/components/disProduct/index.js |   61 +++++++++++++++---------------
 1 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 6a8d494..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({
   /**
    * 缁勪欢鐨勫睘鎬у垪琛�
@@ -28,21 +28,20 @@
   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,13 +65,13 @@
       })
     },
     bindblur() {
-      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],
@@ -81,12 +80,12 @@
       })
     },
     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'
@@ -94,20 +93,20 @@
       }
     },
     scrolltoupper() {
-      this.setData({ pageNum: 1,datalist: [],total: 0})
+      this.setData({ pageNum: 1, datalist: [], total: 0 })
       this.getList()
     },
     cateClick(e) {
       const catalogCode = e.currentTarget.dataset.code
       this.setData({ catalogCode, tagCodes: [] })
-      this.setData({ pageNum: 1,datalist: [],total: 0})
+      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) {
@@ -121,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)
             }
           })
@@ -136,22 +135,22 @@
         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({ 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
         })
@@ -162,13 +161,13 @@
       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