dolphin-weex-bc 0.0.30 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-bc",
-  "version": "0.0.30",
+  "version": "0.0.33",
   "description": "",
   "main": "index.js",
   "directories": {

package/packages/material-event/index.js

@@ -544,6 +544,8 @@ const MaterialEvent = {
 
   productCodeList: [], //存储的商品code
 
+  insufficientArr: [], //不足的耗材
+
   sort: 'hierarchical',
 
   //批量查询耗材的情况
@@ -553,8 +555,9 @@ const MaterialEvent = {
     this.needBackground = options.needBackground
     this.needOptimize = options.needOptimize
     this.deviceMaterialList = []
+    this.insufficientArr = []
     this.sort = options.sort
-    isColmo = params.appId == 12017
+    if (!isColmo) isColmo = params.appId == 12017
     return new Promise(async (resolve, reject) => {
       try {
         let homeGroupId = ''
@@ -584,7 +587,7 @@ const MaterialEvent = {
     this.needBackground = options.needBackground
     this.deviceMaterialList = []
     this.sort = options.sort
-    isColmo = params.appId == 12017
+    if (!isColmo) isColmo = params.appId == 12017
     return new Promise(async (resolve, reject) => {
       try {
         let deviceList = []
@@ -803,6 +806,7 @@ const MaterialEvent = {
       }
       for (const it of item.consumables) {
         console.log('consumables===it:1' + JSON.stringify(it))
+        if (it.model === 'null' || it.model === '/') it.model = '' //兜底某些数据返回异常字符串
         if (isColmo) {
           it.chartData = this.setChartDataColmo(it)
           continue
@@ -839,7 +843,7 @@ const MaterialEvent = {
     if (this.sort === 'hierarchical') {
       this.deviceMaterialList = this.sortHierarchical(JSON.parse(JSON.stringify(this.deviceMaterialList)))
     }
-    if (isColmo) return this.handleMaterialSeviceType()
+    if (isColmo) return this.handleMaterialSeviceTypeColmo()
 
     this.productCodeList = [...new Set(tmpcodeList)]
 
@@ -860,29 +864,46 @@ const MaterialEvent = {
     }
 
     let skuinfolist = []
+    // if (codeList && codeList.length > 20) {
+    //   let groupNum = Math.ceil(codeList.length / 20)
+    //   for (let index = 0; index < groupNum; index++) {
+    //     try {
+    //       const shopList = await this.getUpkeepShopInfo(codeList.slice(index * 20, (index + 1) * 20))
+    //       skuinfolist = skuinfolist.concat(shopList)
+    //     } catch (error) {
+    //       continue
+    //     }
+    //   }
+    // } else {
+    //   try {
+    //     skuinfolist = await this.getUpkeepShopInfo(codeList)
+    //   } catch (error) {}
+    // }
+
     if (codeList && codeList.length > 20) {
       let groupNum = Math.ceil(codeList.length / 20)
       for (let index = 0; index < groupNum; index++) {
         try {
-          const shopList = await this.getUpkeepShopInfo(codeList.slice(index * 20, (index + 1) * 20))
-          skuinfolist = skuinfolist.concat(shopList)
+          const resSuccessMap = await this.querySkuIdByItemCodes(codeList.slice(index * 20, (index + 1) * 20))
+          this.handleSkuinfolist(skuinfolist, resSuccessMap, codeList)
         } catch (error) {
           continue
         }
       }
     } else {
       try {
-        skuinfolist = await this.getUpkeepShopInfo(codeList)
+        const resSuccessMap = await this.querySkuIdByItemCodes(codeList)
+        this.handleSkuinfolist(skuinfolist, resSuccessMap, codeList)
       } catch (error) {}
     }
 
     console.log('获取到的商品信息：' + JSON.stringify(skuinfolist))
 
     if (skuinfolist.length > 0) {
-      try {
-        //通过商城编码查询新商品skuId
-        await this.handleGoodsInfoNewSkuId(skuinfolist)
-      } catch (error) {}
+      // try {
+      //   //通过商城编码查询新商品skuId
+      //   await this.handleGoodsInfoNewSkuId(skuinfolist)
+      // } catch (error) {}
       return this.setMaterialGoodInfo(skuinfolist)
     } else {
       //此时如果有活动链接就取活动链接
@@ -890,15 +911,40 @@ const MaterialEvent = {
     }
   },
 
+  //处理商品信息
+  handleSkuinfolist(skuinfolist, resSuccessMap, codeList) {
+    if (resSuccessMap.code == '000000') {
+      codeList.forEach(item => {
+        if (resSuccessMap.data && resSuccessMap.data.successMap) {
+          if (resSuccessMap.data.successMap[item] && resSuccessMap.data.successMap[item].skuId) {
+            console.log('获取到的图片信息：' + JSON.stringify(resSuccessMap.data.successMap[item].mainPicList))
+            if (
+              resSuccessMap.data.successMap[item].mainPicList &&
+              resSuccessMap.data.successMap[item].mainPicList.length > 0
+            ) {
+              resSuccessMap.data.successMap[item].mainPicList.forEach(item1 => {
+                console.log('获取到的图片信息：' + JSON.stringify(item1))
+                if (item1.imageSort == 1) {
+                  resSuccessMap.data.successMap[item].picInfo = item1.imageUrl
+                }
+              })
+            }
+            skuinfolist.push(resSuccessMap.data.successMap[item])
+          }
+        }
+      })
+    }
+  },
+
   //给商品信息增加新sku
   async handleGoodsInfoNewSkuId(skuinfolist) {
-    let itemCodeList = skuinfolist.map(item => item.itemcode)
+    let itemCodeList = skuinfolist.map(item => item.itemCode)
     try {
       const res = await this.querySkuIdByItemCodes(itemCodeList)
       if (res.code == '000000') {
         skuinfolist.forEach(item => {
           if (res.data && res.data.successMap) {
-            item.skuId = res.data.successMap[item.itemcode] ? res.data.successMap[item.itemcode].skuId : ''
+            item.skuId = res.data.successMap[item.itemCode] ? res.data.successMap[item.itemCode].skuId : ''
           }
         })
       }
@@ -976,14 +1022,14 @@ const MaterialEvent = {
       console.log(`商品item==${index}==1` + JSON.stringify(item))
       this.deviceMaterialList.forEach((it, i) => {
         it.consumables.forEach((itt, index) => {
-          if (itt.productCode == item.itemcode) {
+          if (itt.productCode == item.itemCode) {
             itt.goodsInfo = item
           }
           //对于清洗服务里面的productCode单独处理
           if (
             itt.serviceSupport &&
             itt.serviceSupport.washingService &&
-            itt.serviceSupport.washingService.productCode == item.itemcode
+            itt.serviceSupport.washingService.productCode == item.itemCode
           ) {
             console.log('清洗的哦哦：1' + i + '---' + index)
             itt.washingServiceGoodsInfo = item
@@ -1040,6 +1086,24 @@ const MaterialEvent = {
     }
   },
 
+  // COLMO按钮类型 2保养换芯 3售后维修 4清洗服务
+  handleMaterialSeviceTypeColmo() {
+    this.deviceMaterialList.forEach((item, index) => {
+      item.consumables.forEach(it => {
+        if (it.serviceSupport) {
+          if (it.serviceSupport && it.serviceSupport.bookingService && it.serviceSupport.bookingService.enable) {
+            it.btnType = 2
+            if (it.serviceSupport.bookingService && it.serviceSupport.bookingService.serviceType == 2) {
+              it.btnType = 3
+            }
+          } else if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable) {
+            it.btnType = 4
+          }
+        }
+      })
+    })
+  },
+
   // 对每一种设备按照consumables中余量从最少到多排列
   // 排序函数 - 处理 remainingValueType=4的情况
   sortByRemainingValue(a, b) {
@@ -1307,6 +1371,8 @@ const MaterialEvent = {
       ...categorizedDeviceMaterialList.sufficient
     ]
 
+    this.insufficientArr = categorizedDeviceMaterialList.insufficient
+
     //记录每一种情况下的设备数量
     this.deviceTotal = [
       categorizedDeviceMaterialList.insufficient.length,