dolphin-weex-bc 0.0.30 → 0.0.33

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # 升级日志
 
+## 0.0.33
+
+- [ ! ] colmo耗材组件,恢复0.0.28版本的方法
+- [ ! ] date: 2026/01/28
+
+## 0.0.32
+
+- [ ! ] 修复耗材组件商品更换新接口参数不一致问题
+- [ ! ] date: 2026/01/27
+
+## 0.0.31
+
+- [ ! ] 耗材组件增加耗材不足的耗材判断
+- [ ! ] date: 2026/01/26
+
 ## 0.0.30
 
 - [ ! ] 耗材组件getAllMaterialList(),getMaterialList()增加识别是否colmo

package/dist/index.native.js

@@ -2759,6 +2759,8 @@ var MaterialEvent = {
 
   productCodeList: [], //存储的商品code
 
+  insufficientArr: [], //不足的耗材
+
   sort: 'hierarchical',
 
   //批量查询耗材的情况
@@ -2776,8 +2778,9 @@ var MaterialEvent = {
               _this6.needBackground = options.needBackground;
               _this6.needOptimize = options.needOptimize;
               _this6.deviceMaterialList = [];
+              _this6.insufficientArr = [];
               _this6.sort = options.sort;
-              isColmo = params.appId == 12017;
+              if (!isColmo) isColmo = params.appId == 12017;
               return _context2.abrupt('return', new Promise(function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve, reject) {
                   var homeGroupId, deviceList;
@@ -2827,7 +2830,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 8:
+            case 9:
             case 'end':
               return _context2.stop();
           }
@@ -2849,7 +2852,7 @@ var MaterialEvent = {
               _this7.needBackground = options.needBackground;
               _this7.deviceMaterialList = [];
               _this7.sort = options.sort;
-              isColmo = params.appId == 12017;
+              if (!isColmo) isColmo = params.appId == 12017;
               return _context4.abrupt('return', new Promise(function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(resolve, reject) {
                   var deviceList, res;
@@ -3405,6 +3408,7 @@ var MaterialEvent = {
                     var it = _step.value;
 
                     console.log('consumables===it:1' + JSON.stringify(it));
+                    if (it.model === 'null' || it.model === '/') it.model = ''; //兜底某些数据返回异常字符串
                     if (isColmo) {
                       it.chartData = _this15.setChartDataColmo(it);
                       continue;
@@ -3458,7 +3462,7 @@ var MaterialEvent = {
                 break;
               }
 
-              return _context13.abrupt('return', _this15.handleMaterialSeviceType());
+              return _context13.abrupt('return', _this15.handleMaterialSeviceTypeColmo());
 
             case 5:
 
@@ -3487,7 +3491,8 @@ var MaterialEvent = {
     var _this16 = this;
 
     return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
-      var codeList, skuinfolist, groupNum, index, shopList;
+      var codeList, skuinfolist, groupNum, index, resSuccessMap, _resSuccessMap;
+
       return regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
           switch (_context14.prev = _context14.next) {
@@ -3505,6 +3510,21 @@ var MaterialEvent = {
 
             case 4:
               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)) {
                 _context14.next = 24;
@@ -3522,12 +3542,12 @@ var MaterialEvent = {
 
               _context14.prev = 9;
               _context14.next = 12;
-              return _this16.getUpkeepShopInfo(codeList.slice(index * 20, (index + 1) * 20));
+              return _this16.querySkuIdByItemCodes(codeList.slice(index * 20, (index + 1) * 20));
 
             case 12:
-              shopList = _context14.sent;
+              resSuccessMap = _context14.sent;
 
-              skuinfolist = skuinfolist.concat(shopList);
+              _this16.handleSkuinfolist(skuinfolist, resSuccessMap, codeList);
               _context14.next = 19;
               break;
 
@@ -3542,60 +3562,72 @@ var MaterialEvent = {
               break;
 
             case 22:
-              _context14.next = 32;
+              _context14.next = 33;
               break;
 
             case 24:
               _context14.prev = 24;
               _context14.next = 27;
-              return _this16.getUpkeepShopInfo(codeList);
+              return _this16.querySkuIdByItemCodes(codeList);
 
             case 27:
-              skuinfolist = _context14.sent;
-              _context14.next = 32;
+              _resSuccessMap = _context14.sent;
+
+              _this16.handleSkuinfolist(skuinfolist, _resSuccessMap, codeList);
+              _context14.next = 33;
               break;
 
-            case 30:
-              _context14.prev = 30;
+            case 31:
+              _context14.prev = 31;
               _context14.t1 = _context14['catch'](24);
 
-            case 32:
+            case 33:
 
               console.log('获取到的商品信息：' + JSON.stringify(skuinfolist));
 
               if (!(skuinfolist.length > 0)) {
-                _context14.next = 44;
+                _context14.next = 38;
                 break;
               }
 
-              _context14.prev = 34;
-              _context14.next = 37;
-              return _this16.handleGoodsInfoNewSkuId(skuinfolist);
-
-            case 37:
-              _context14.next = 41;
-              break;
-
-            case 39:
-              _context14.prev = 39;
-              _context14.t2 = _context14['catch'](34);
-
-            case 41:
               return _context14.abrupt('return', _this16.setMaterialGoodInfo(skuinfolist));
 
-            case 44:
+            case 38:
               return _context14.abrupt('return', _this16.handleMaterialSeviceType());
 
-            case 45:
+            case 39:
             case 'end':
               return _context14.stop();
           }
         }
-      }, _callee14, _this16, [[9, 16], [24, 30], [34, 39]]);
+      }, _callee14, _this16, [[9, 16], [24, 31]]);
     }))();
   },
 
 
+  //处理商品信息
+  handleSkuinfolist: function handleSkuinfolist(skuinfolist, resSuccessMap, codeList) {
+    if (resSuccessMap.code == '000000') {
+      codeList.forEach(function (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(function (item1) {
+                console.log('获取到的图片信息：' + JSON.stringify(item1));
+                if (item1.imageSort == 1) {
+                  resSuccessMap.data.successMap[item].picInfo = item1.imageUrl;
+                }
+              });
+            }
+            skuinfolist.push(resSuccessMap.data.successMap[item]);
+          }
+        }
+      });
+    }
+  },
+
+
   //给商品信息增加新sku
   handleGoodsInfoNewSkuId: function handleGoodsInfoNewSkuId(skuinfolist) {
     var _this17 = this;
@@ -3607,7 +3639,7 @@ var MaterialEvent = {
           switch (_context15.prev = _context15.next) {
             case 0:
               itemCodeList = skuinfolist.map(function (item) {
-                return item.itemcode;
+                return item.itemCode;
               });
               _context15.prev = 1;
               _context15.next = 4;
@@ -3619,7 +3651,7 @@ var MaterialEvent = {
               if (res.code == '000000') {
                 skuinfolist.forEach(function (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 : '';
                   }
                 });
               }
@@ -3782,11 +3814,11 @@ var MaterialEvent = {
       console.log('\u5546\u54C1item==' + index + '==1' + JSON.stringify(item));
       _this20.deviceMaterialList.forEach(function (it, i) {
         it.consumables.forEach(function (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) {
+          if (itt.serviceSupport && itt.serviceSupport.washingService && itt.serviceSupport.washingService.productCode == item.itemCode) {
             console.log('清洗的哦哦：1' + i + '---' + index);
             itt.washingServiceGoodsInfo = item;
           }
@@ -3834,6 +3866,25 @@ var MaterialEvent = {
   },
 
 
+  // COLMO按钮类型 2保养换芯 3售后维修 4清洗服务
+  handleMaterialSeviceTypeColmo: function handleMaterialSeviceTypeColmo() {
+    this.deviceMaterialList.forEach(function (item, index) {
+      item.consumables.forEach(function (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: function sortByRemainingValue(a, b) {
@@ -4094,6 +4145,8 @@ var MaterialEvent = {
     // 合并三个数组
     var sortedDeviceMaterialList = [].concat(_toConsumableArray(categorizedDeviceMaterialList.insufficient), _toConsumableArray(categorizedDeviceMaterialList.unknown), _toConsumableArray(categorizedDeviceMaterialList.sufficient));
 
+    this.insufficientArr = categorizedDeviceMaterialList.insufficient;
+
     //记录每一种情况下的设备数量
     this.deviceTotal = [categorizedDeviceMaterialList.insufficient.length, categorizedDeviceMaterialList.unknown.length, categorizedDeviceMaterialList.sufficient.length];
     //记录每一种情况下的耗材数量