xiaoe_mp_npm 0.5.42-test13 → 0.5.42-test15

package/miniprogram_dist/CouponList/couponColumn/index.js

@@ -35,7 +35,7 @@ Component({
         type: Object,
         value: {},
         observer(newVal) {
-          newVal.switch && this.handlerListInfo(newVal)
+          this.handlerListInfo(newVal)
         }
       }
     },

package/miniprogram_dist/LiveGoodsList/index.js

@@ -16,6 +16,18 @@ import {
 import { rpxToVmin } from '../common/utils/index.js'
 const computedBehavior = require('miniprogram-computed').behavior
 
+let activityCountdownTimer = null // 活动倒计时计时器
+let hadActivity = false
+let activityList = [] // 参与活动的商品
+
+// 预热模块
+let preheatTimer = null // 预热倒计时计时器
+let hadPreheat = false
+let preheatList = [] // 参与活动的商品
+
+let hasActivity = false // 是否有参与活动的商品
+let hasPreheat = false // 是否有参与预热的商品
+
 const MARKET_ACTIVITY_MAP = {
   3: "限时折扣",
   4: "好友助力",
@@ -60,6 +72,12 @@ Component({
         newVal && this.data.explainingGoods.length && this.getExplainingGoodsInfo()
         newVal && this.getPreferentialPriceSetting()
         newVal && this.onLoad()
+        if(!newVal){
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
       }
     },
     // 讲解中商品
@@ -121,7 +139,7 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        newVal.switch && this.handlerListInfo(newVal)
+        this.handlerListInfo(newVal)
       }
     },
     orientation: {
@@ -163,6 +181,56 @@ Component({
     },
   },
   methods: {
+    // 商品总活动倒计时
+    startActivityCountdown(list) {
+      clearInterval(activityCountdownTimer)
+      activityCountdownTimer = setInterval(() => {
+        hadActivity = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) return
+          hadActivity = true
+          let temp = `goodsInfo[${i.index}].activityCountdown`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadActivity) {
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+        }
+      }, 1000)
+    },
+    // 预热倒计时
+    startPreheatCountdown(list) {
+      clearInterval(preheatTimer)
+      preheatTimer = setInterval(() => {
+        hadPreheat = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) {
+            activityList.push({
+              time: this.data.goodsInfo[i.index].end_at,
+              index: i.index,
+            })
+            this.setData({
+              [`goodsInfo[${i.index}].preheatTime`]: 0,
+            })
+            return
+          }
+          hadPreheat = true
+          let temp = `goodsInfo[${i.index}].preheatTime`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadPreheat) {
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
+      }, 1000)
+    },
+
     /**
     * 带货/优惠券实时同步
     * @param {object} msgData im消息体
@@ -171,10 +239,14 @@ Component({
     handlerListInfo(msgData) {
       let type = '', marketInfo = []
 
-      // jer todo 还有im接受的相关逻辑需要补充
       // 遍历获取操作类型
       for (let key in msgData) {
         switch (key) {
+          // 带货开关操作
+          case "switch":
+            type = "goodsSwitch";
+            marketInfo = Number(msgData[key]);
+            break;
           // 新增操作
           case "conf_list":
             type = "goodsConfList";
@@ -214,6 +286,27 @@ Component({
       let goodsInfo = this.data.goodsInfo,
       formExplainingGoods = this.data.formExplainingGoods
       switch (type) {
+        // 带货和优惠券开关操作
+        case "goodsSwitch":
+          if (!marketInfo) {
+            // 清空数据
+            this.setData({
+              goodsInfo: [],
+              page_index: 1,
+              total: 0,
+              refreshing: false,
+              finishedTxt: '加载中',
+              finished: false,
+              formExplainingGoods: {},
+              explainingGoodsIndex: 1,
+              currentGoodsItem: {},
+              componentsState: 1
+            })
+          } else if (this.data.goodsInfo.length === 0 && marketInfo === 1) {
+            // 重新打开按钮后,请求一次列表
+            this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          }
+          break;
         case "goodsConfList":
           // 如果已经加载完了，可以拼接数据
           if (this.data.finished) this.formatData(marketInfo, true);
@@ -222,7 +315,6 @@ Component({
         case "goodsBatchSwitchList":
           marketInfo.map((item) => {
             for (let index = 0; index < goodsInfo.length; index++) {
-              // jer todo 可能需要更改一下这个超级会员的字段
               if (item.id === goodsInfo[index].id) {
                 // 遍历插入相应的修改值
                 for (let key in item) {
@@ -238,14 +330,13 @@ Component({
                 break;
               } else if (type === "goodsBatchSwitchList" && item.is_display_package === 1 && item.order_weight < goodsInfo[index].order_weight) {
                 // 由于兼容显示商品时，接口并没有此商品的话，需要做一个插入商品到对应位置的操作，获取需要插入状态值(只有学员才需要操作)
+                this.formatItem(item)
                 goodsInfo.splice(index, 0, item);
                 break;
               }
             };
           });
-          this.setData({
-            goodsInfo,
-          })
+          this.formatData(goodsInfo, false)
           break;
         case "goodsDelList":
           let delIndex = -1; // 删除数据的当前下标
@@ -265,9 +356,7 @@ Component({
             // 重置删除下标
             delIndex = -1;
           });
-          this.setData({
-            goodsInfo,
-          })
+          this.formatData(goodsInfo, false)
           break;
         default:
           break;
@@ -420,7 +509,45 @@ Component({
               //下拉刷新的时候直接赋值
               goodsInfo = JSON.parse(JSON.stringify(data))
             }
-            this.setData({goodsInfo})
+            this.setData({goodsInfo},()=>{
+              this.getActivityStatus(this.data.goodsInfo)
+            })
+      },
+      getActivityStatus(data){
+        activityList = []
+        preheatList = []
+        data.forEach((item, index) => {
+          if (item.is_activity && item.end_at) {
+            hasActivity = true
+            item.activityCountdown = 0
+            activityList.push({
+              time: item.end_at,
+              index,
+            })
+          }
+          // this.data.isSeckill && this.data.preheating
+          if (item.activity_type === 8 && item.sec_kill_is_preheat === 1) {
+            //预热开始时间
+            let startTime = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let times = startTime.getTime() - item.sec_kill_preheat_time * 1000
+            let preHeatTime = new Date(times) || new Date()
+  
+            let startTime2 = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let nowTime = new Date().getTime()
+            let preheating = nowTime > preHeatTime.getTime() && startTime2.getTime() > nowTime
+  
+            if (preheating) {
+              hasPreheat = true
+              item.preheatTime = 0
+              preheatList.push({
+                time: item.start_at,
+                index,
+              })
+            }
+          }
+        })
+        if (hasActivity) this.startActivityCountdown(activityList) //活动倒计时
+        if (hasPreheat) this.startPreheatCountdown(preheatList) // 预热倒计时
       },
       formatItem(e) {
           e.resourceTypeName = e.resource_type_name // 商品类型

package/miniprogram_dist/LiveGoodsList/index.wxml

@@ -44,6 +44,7 @@
         <coupon-list
           showList="{{ showList }}"
           aliveInfo="{{ aliveInfo }}"
+          msgCouponData="{{msgCouponData}}"
           bind:showPopup="showInfoCollection"
           bind:receivedSuccess="receivedSuccess"
           sensorReportParams="{{sensorReportParams}}"

package/miniprogram_dist/TeacherGoodsList/index.js

@@ -103,7 +103,7 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        newVal.switch && this.handlerListInfo(newVal)
+        this.handlerListInfo(newVal)
       },
     },
     isManage: {
@@ -162,6 +162,11 @@ Component({
       // 遍历获取操作类型
       for (let key in msgData) {
         switch (key) {
+          // 带货开关操作
+          case "switch":
+            type = "goodsSwitch";
+            marketInfo = Number(msgData[key]);
+            break;
           // 新增操作
           case 'conf_list':
             type = 'goodsConfList'
@@ -197,17 +202,37 @@ Component({
     // 处理实时同步的带货逻辑
     changeGoodsList(type, marketInfo) {
       let goodsInfo = this.data.goodsInfo,
-        delIndex = -1 // 删除数据的当前下标
-        // jer todo 添加批量显隐的数组
-        // selectGoodsIndexArr = this.data.selectGoodsIndexArr, // 批量隐藏id数组
-        // selectGoods = this.data.selectGoods // 批量隐藏数据数组
+        delIndex = -1, // 删除数据的当前下标
+        selectGoods = this.data.selectGoods, // 批量隐藏数组id
+        selectGoodsIndexArr = this.data.selectGoodsIndexArr, // 批量隐藏数组索引
+        total = this.data.total, // 管理商品总数
+        isHasGoods = false // 是否已有这个商品
       switch (type) {
+        // 带货和优惠券开关操作
+        case "goodsSwitch":
+          if (!marketInfo) {
+            this.triggerEvent("closePopup")
+          }
+          break;
         case 'goodsConfList':
           // 如果已经加载完了，可以拼接数据
-          if (this.data.finished) this.formatData(marketInfo);
-          // 管理商品需要增加
-          // jer todo 添加批量显隐的总数逻辑
-          // this.data.marketResource.courseList[0].total += marketInfo.length
+          // 由于看不出为何触发了两次，做id过滤
+          if (this.data.finished) {
+            marketInfo.map((item) => {
+              for (let index = 0; index < goodsInfo.length; index++) {
+                if (item.id === goodsInfo[index].id) {
+                  isHasGoods = true;
+                  break
+                }
+              }
+              if (!isHasGoods) {
+                // 管理商品需要增加
+                total += marketInfo.length
+                this.formatData([item]);
+              }
+              isHasGoods = false;
+            })
+          }
           break
         case 'goodsUpdateList':
         case 'goodsBatchSwitchList':
@@ -222,6 +247,7 @@ Component({
               }
             }
           })
+          this.formatData(goodsInfo, true);
           break
         case 'goodsDelList':
           marketInfo.map((id) => {
@@ -240,28 +266,30 @@ Component({
             // 重置删除下标
             delIndex = -1
 
-            // jer todo 此处处理批量显隐的，删掉了，需要把选择的也删掉
-            // if (selectGoodsIndexArr.length > 0) {
-            //   for (let index = 0; index < selectGoodsIndexArr.length; index++) {
-            //     if (id === selectGoodsIndexArr[index]) {
-            //       // 删除操作，获取下标
-            //       selectGoodsIndexArr.splice(index, 1)
-            //       selectGoods.splice(index, 1)
-            //       index--
-            //     }
-            //   }
-            // }
+            // 此处处理批量显隐的，删掉了，需要把选择的也删掉
+            if (selectGoodsIndexArr.length > 0) {
+              for (let index = 0; index < selectGoodsIndexArr.length; index++) {
+                if (id === selectGoodsIndexArr[index]) {
+                  console.log("jer==========???删了几次？", id, selectGoodsIndexArr[index]);
+                  // 删除操作，获取下标
+                  selectGoodsIndexArr.splice(index, 1)
+                  selectGoods.splice(index, 1)
+                  index--
+                  // 管理商品需要减少
+                  total--
+                }
+              }
+            }
           })
-          // jer todo 管理商品需要减少
-          // this.data.marketResource.courseList[0].total -= marketInfo.length
+          this.formatData(goodsInfo, true);
           break
         default:
           break
       }
       this.setData({
-        goodsInfo,
-        // selectGoodsIndexArr,
-        // selectGoods,
+        total,
+        selectGoods,
+        selectGoodsIndexArr,
       })
     },
     // 管理商品多选

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.5.42-test13",
+  "version": "0.5.42-test15",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/CouponList/couponColumn/index.js

@@ -35,7 +35,7 @@ Component({
         type: Object,
         value: {},
         observer(newVal) {
-          newVal.switch && this.handlerListInfo(newVal)
+          this.handlerListInfo(newVal)
         }
       }
     },

package/src/LiveGoodsList/index.js

@@ -16,6 +16,18 @@ import {
 import { rpxToVmin } from '../common/utils/index.js'
 const computedBehavior = require('miniprogram-computed').behavior
 
+let activityCountdownTimer = null // 活动倒计时计时器
+let hadActivity = false
+let activityList = [] // 参与活动的商品
+
+// 预热模块
+let preheatTimer = null // 预热倒计时计时器
+let hadPreheat = false
+let preheatList = [] // 参与活动的商品
+
+let hasActivity = false // 是否有参与活动的商品
+let hasPreheat = false // 是否有参与预热的商品
+
 const MARKET_ACTIVITY_MAP = {
   3: "限时折扣",
   4: "好友助力",
@@ -60,6 +72,12 @@ Component({
         newVal && this.data.explainingGoods.length && this.getExplainingGoodsInfo()
         newVal && this.getPreferentialPriceSetting()
         newVal && this.onLoad()
+        if(!newVal){
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
       }
     },
     // 讲解中商品
@@ -121,7 +139,7 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        newVal.switch && this.handlerListInfo(newVal)
+        this.handlerListInfo(newVal)
       }
     },
     orientation: {
@@ -163,6 +181,56 @@ Component({
     },
   },
   methods: {
+    // 商品总活动倒计时
+    startActivityCountdown(list) {
+      clearInterval(activityCountdownTimer)
+      activityCountdownTimer = setInterval(() => {
+        hadActivity = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) return
+          hadActivity = true
+          let temp = `goodsInfo[${i.index}].activityCountdown`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadActivity) {
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+        }
+      }, 1000)
+    },
+    // 预热倒计时
+    startPreheatCountdown(list) {
+      clearInterval(preheatTimer)
+      preheatTimer = setInterval(() => {
+        hadPreheat = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) {
+            activityList.push({
+              time: this.data.goodsInfo[i.index].end_at,
+              index: i.index,
+            })
+            this.setData({
+              [`goodsInfo[${i.index}].preheatTime`]: 0,
+            })
+            return
+          }
+          hadPreheat = true
+          let temp = `goodsInfo[${i.index}].preheatTime`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadPreheat) {
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
+      }, 1000)
+    },
+
     /**
     * 带货/优惠券实时同步
     * @param {object} msgData im消息体
@@ -171,10 +239,14 @@ Component({
     handlerListInfo(msgData) {
       let type = '', marketInfo = []
 
-      // jer todo 还有im接受的相关逻辑需要补充
       // 遍历获取操作类型
       for (let key in msgData) {
         switch (key) {
+          // 带货开关操作
+          case "switch":
+            type = "goodsSwitch";
+            marketInfo = Number(msgData[key]);
+            break;
           // 新增操作
           case "conf_list":
             type = "goodsConfList";
@@ -214,6 +286,27 @@ Component({
       let goodsInfo = this.data.goodsInfo,
       formExplainingGoods = this.data.formExplainingGoods
       switch (type) {
+        // 带货和优惠券开关操作
+        case "goodsSwitch":
+          if (!marketInfo) {
+            // 清空数据
+            this.setData({
+              goodsInfo: [],
+              page_index: 1,
+              total: 0,
+              refreshing: false,
+              finishedTxt: '加载中',
+              finished: false,
+              formExplainingGoods: {},
+              explainingGoodsIndex: 1,
+              currentGoodsItem: {},
+              componentsState: 1
+            })
+          } else if (this.data.goodsInfo.length === 0 && marketInfo === 1) {
+            // 重新打开按钮后,请求一次列表
+            this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          }
+          break;
         case "goodsConfList":
           // 如果已经加载完了，可以拼接数据
           if (this.data.finished) this.formatData(marketInfo, true);
@@ -222,7 +315,6 @@ Component({
         case "goodsBatchSwitchList":
           marketInfo.map((item) => {
             for (let index = 0; index < goodsInfo.length; index++) {
-              // jer todo 可能需要更改一下这个超级会员的字段
               if (item.id === goodsInfo[index].id) {
                 // 遍历插入相应的修改值
                 for (let key in item) {
@@ -238,14 +330,13 @@ Component({
                 break;
               } else if (type === "goodsBatchSwitchList" && item.is_display_package === 1 && item.order_weight < goodsInfo[index].order_weight) {
                 // 由于兼容显示商品时，接口并没有此商品的话，需要做一个插入商品到对应位置的操作，获取需要插入状态值(只有学员才需要操作)
+                this.formatItem(item)
                 goodsInfo.splice(index, 0, item);
                 break;
               }
             };
           });
-          this.setData({
-            goodsInfo,
-          })
+          this.formatData(goodsInfo, false)
           break;
         case "goodsDelList":
           let delIndex = -1; // 删除数据的当前下标
@@ -265,9 +356,7 @@ Component({
             // 重置删除下标
             delIndex = -1;
           });
-          this.setData({
-            goodsInfo,
-          })
+          this.formatData(goodsInfo, false)
           break;
         default:
           break;
@@ -420,7 +509,45 @@ Component({
               //下拉刷新的时候直接赋值
               goodsInfo = JSON.parse(JSON.stringify(data))
             }
-            this.setData({goodsInfo})
+            this.setData({goodsInfo},()=>{
+              this.getActivityStatus(this.data.goodsInfo)
+            })
+      },
+      getActivityStatus(data){
+        activityList = []
+        preheatList = []
+        data.forEach((item, index) => {
+          if (item.is_activity && item.end_at) {
+            hasActivity = true
+            item.activityCountdown = 0
+            activityList.push({
+              time: item.end_at,
+              index,
+            })
+          }
+          // this.data.isSeckill && this.data.preheating
+          if (item.activity_type === 8 && item.sec_kill_is_preheat === 1) {
+            //预热开始时间
+            let startTime = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let times = startTime.getTime() - item.sec_kill_preheat_time * 1000
+            let preHeatTime = new Date(times) || new Date()
+  
+            let startTime2 = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let nowTime = new Date().getTime()
+            let preheating = nowTime > preHeatTime.getTime() && startTime2.getTime() > nowTime
+  
+            if (preheating) {
+              hasPreheat = true
+              item.preheatTime = 0
+              preheatList.push({
+                time: item.start_at,
+                index,
+              })
+            }
+          }
+        })
+        if (hasActivity) this.startActivityCountdown(activityList) //活动倒计时
+        if (hasPreheat) this.startPreheatCountdown(preheatList) // 预热倒计时
       },
       formatItem(e) {
           e.resourceTypeName = e.resource_type_name // 商品类型

package/src/LiveGoodsList/index.wxml

@@ -44,6 +44,7 @@
         <coupon-list
           showList="{{ showList }}"
           aliveInfo="{{ aliveInfo }}"
+          msgCouponData="{{msgCouponData}}"
           bind:showPopup="showInfoCollection"
           bind:receivedSuccess="receivedSuccess"
           sensorReportParams="{{sensorReportParams}}"

package/src/TeacherGoodsList/index.js

@@ -103,7 +103,7 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        newVal.switch && this.handlerListInfo(newVal)
+        this.handlerListInfo(newVal)
       },
     },
     isManage: {
@@ -162,6 +162,11 @@ Component({
       // 遍历获取操作类型
       for (let key in msgData) {
         switch (key) {
+          // 带货开关操作
+          case "switch":
+            type = "goodsSwitch";
+            marketInfo = Number(msgData[key]);
+            break;
           // 新增操作
           case 'conf_list':
             type = 'goodsConfList'
@@ -197,17 +202,37 @@ Component({
     // 处理实时同步的带货逻辑
     changeGoodsList(type, marketInfo) {
       let goodsInfo = this.data.goodsInfo,
-        delIndex = -1 // 删除数据的当前下标
-        // jer todo 添加批量显隐的数组
-        // selectGoodsIndexArr = this.data.selectGoodsIndexArr, // 批量隐藏id数组
-        // selectGoods = this.data.selectGoods // 批量隐藏数据数组
+        delIndex = -1, // 删除数据的当前下标
+        selectGoods = this.data.selectGoods, // 批量隐藏数组id
+        selectGoodsIndexArr = this.data.selectGoodsIndexArr, // 批量隐藏数组索引
+        total = this.data.total, // 管理商品总数
+        isHasGoods = false // 是否已有这个商品
       switch (type) {
+        // 带货和优惠券开关操作
+        case "goodsSwitch":
+          if (!marketInfo) {
+            this.triggerEvent("closePopup")
+          }
+          break;
         case 'goodsConfList':
           // 如果已经加载完了，可以拼接数据
-          if (this.data.finished) this.formatData(marketInfo);
-          // 管理商品需要增加
-          // jer todo 添加批量显隐的总数逻辑
-          // this.data.marketResource.courseList[0].total += marketInfo.length
+          // 由于看不出为何触发了两次，做id过滤
+          if (this.data.finished) {
+            marketInfo.map((item) => {
+              for (let index = 0; index < goodsInfo.length; index++) {
+                if (item.id === goodsInfo[index].id) {
+                  isHasGoods = true;
+                  break
+                }
+              }
+              if (!isHasGoods) {
+                // 管理商品需要增加
+                total += marketInfo.length
+                this.formatData([item]);
+              }
+              isHasGoods = false;
+            })
+          }
           break
         case 'goodsUpdateList':
         case 'goodsBatchSwitchList':
@@ -222,6 +247,7 @@ Component({
               }
             }
           })
+          this.formatData(goodsInfo, true);
           break
         case 'goodsDelList':
           marketInfo.map((id) => {
@@ -240,28 +266,30 @@ Component({
             // 重置删除下标
             delIndex = -1
 
-            // jer todo 此处处理批量显隐的，删掉了，需要把选择的也删掉
-            // if (selectGoodsIndexArr.length > 0) {
-            //   for (let index = 0; index < selectGoodsIndexArr.length; index++) {
-            //     if (id === selectGoodsIndexArr[index]) {
-            //       // 删除操作，获取下标
-            //       selectGoodsIndexArr.splice(index, 1)
-            //       selectGoods.splice(index, 1)
-            //       index--
-            //     }
-            //   }
-            // }
+            // 此处处理批量显隐的，删掉了，需要把选择的也删掉
+            if (selectGoodsIndexArr.length > 0) {
+              for (let index = 0; index < selectGoodsIndexArr.length; index++) {
+                if (id === selectGoodsIndexArr[index]) {
+                  console.log("jer==========???删了几次？", id, selectGoodsIndexArr[index]);
+                  // 删除操作，获取下标
+                  selectGoodsIndexArr.splice(index, 1)
+                  selectGoods.splice(index, 1)
+                  index--
+                  // 管理商品需要减少
+                  total--
+                }
+              }
+            }
           })
-          // jer todo 管理商品需要减少
-          // this.data.marketResource.courseList[0].total -= marketInfo.length
+          this.formatData(goodsInfo, true);
           break
         default:
           break
       }
       this.setData({
-        goodsInfo,
-        // selectGoodsIndexArr,
-        // selectGoods,
+        total,
+        selectGoods,
+        selectGoodsIndexArr,
       })
     },
     // 管理商品多选