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/disCase/index.js |   68 ++++++++++++++++------------------
 1 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index ac0a0ea..0c52299 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -26,12 +26,12 @@
     this.getCatelist()
   },
   methods: {
-    getCatelist(){
+    getCatelist() {
       const { catalogCode } = this.data
       getCataLogTagList({
         catalogCode
       }).then(res => {
-        if(res.data && res.data.length > 0){
+        if (res.data && res.data.length > 0) {
           this.setData({
             cateList: res.data
           })
@@ -42,29 +42,25 @@
       })
     },
     getList() {
-      const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
+      const { sortType, query, tagCodes, pageNum, pageSize, catalogCode } = this.data
       getZhongTaiWholecasePage({
-        catalogCode,pageNum,pageSize,tagCodes, sortType,query
+        catalogCode, pageNum, pageSize, tagCodes, sortType, query
       }).then(res => {
-        if(res.data){
-          this.setData({ 
+        if (res.data) {
+          this.setData({
             total: res.data.total,
             dataList: [...this.data.dataList, ...res.data.records],
           })
-        }  
+        }
       })
     },
-    scrolltoupper() {
-      this.setData({ pageNum: 1,datalist: [],total: 0})
-      this.getList()
-    },
     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'
@@ -73,11 +69,11 @@
     },
     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()
     },
-    handleAction(e){
+    handleAction(e) {
       const actionType = e.currentTarget.dataset.code
       const id = e.currentTarget.dataset.id
       actionDo({
@@ -98,13 +94,13 @@
       const paramIndex = e.currentTarget.dataset.index
       const { cateList, tagCodes, activeParam, activeIndex } = this.data
       const index = tagCodes.indexOf(code)
-      
-      if(index === -1){
+
+      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)
             }
           })
@@ -112,50 +108,50 @@
         tagCodes.push(code)
         cateList[activeIndex].paramIndex = paramIndex
         cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
-      }else{
+      } else {
         tagCodes.splice(index, 1)
         cateList[activeIndex].paramIndex = -1
         cateList[activeIndex].paramName = ''
       }
-      this.setData({ pageNum: 1,dataList: [],total: 0})
+      this.setData({ pageNum: 1, dataList: [], total: 0 })
       this.setData({ tagCodes, cateList })
-      console.log('tagCodes', tagCodes);
+      console.log('tagCodes', tagCodes)
     },
     cancelParam() {
       const { cateList } = this.data
       cateList.forEach(item => {
         item.paramIndex = -1
-        item.paramName = ''
+        item.paramName = item.paramName || ''
       })
-      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+      this.setData({ tagCodes: [], activeParam: [], cateList, activeIndex: -1 })
     },
     bindblur() {
-      this.setData({ pageNum: 1,dataList: [],total: 0})
+      this.setData({ pageNum: 1, dataList: [], total: 0 })
       this.getList()
     },
     subParam() {
       this.setData({ activeParam: [] })
-      this.setData({ pageNum: 1,dataList: [],total: 0})
+      this.setData({ pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
       this.getList()
     },
-    changeShowParams(e){
+    changeShowParams(e) {
       const { cateList } = this.data
       const activeIndex = e.currentTarget.dataset.index
-      if(activeIndex === this.data.activeIndex){
+      if (activeIndex === this.data.activeIndex) {
         this.setData({ activeIndex: -1, activeParam: [], selParam: '' })
-      }else{
-        this.setData({ 
+      } else {
+        this.setData({
           activeIndex,
           activeParam: cateList[activeIndex].valueVos
         })
       }
-      
+
       // this.setData({showTwo: false})
     },
-    changeTwo(){
+    changeTwo() {
       const showTwo = !this.data.showTwo
-      this.setData({showTwo})
-      this.setData({showOne: false})
+      this.setData({ showTwo })
+      this.setData({ showOne: false })
     },
   }
 })

--
Gitblit v1.9.3