dolphin-weex-bc 0.0.28 → 0.0.30

package/CHANGELOG.md

@@ -1,4 +1,15 @@
 # 升级日志
+
+## 0.0.30
+
+- [ ! ] 耗材组件getAllMaterialList(),getMaterialList()增加识别是否colmo
+- [ ! ] date: 2026/01/26
+
+## 0.0.29
+
+- [ ! ] 耗材业务组件解决多个家庭时后端返回排序不一致问题（前端兼容根据家庭排序）
+- [ ! ] date: 2026/01/23
+
 ## 0.0.28
 
 - [ ! ] colmo耗材组件,修复服务按钮显示错误问题

package/dist/index.native.js

@@ -2777,6 +2777,7 @@ var MaterialEvent = {
               _this6.needOptimize = options.needOptimize;
               _this6.deviceMaterialList = [];
               _this6.sort = options.sort;
+              isColmo = params.appId == 12017;
               return _context2.abrupt('return', new Promise(function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve, reject) {
                   var homeGroupId, deviceList;
@@ -2826,7 +2827,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 7:
+            case 8:
             case 'end':
               return _context2.stop();
           }
@@ -2848,6 +2849,7 @@ var MaterialEvent = {
               _this7.needBackground = options.needBackground;
               _this7.deviceMaterialList = [];
               _this7.sort = options.sort;
+              isColmo = params.appId == 12017;
               return _context4.abrupt('return', new Promise(function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(resolve, reject) {
                   var deviceList, res;
@@ -2911,7 +2913,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 7:
+            case 8:
             case 'end':
               return _context4.stop();
           }
@@ -3073,16 +3075,29 @@ var MaterialEvent = {
             case 7:
               allData = res.data;
               result = [];
-
-              allData.forEach(function (item1) {
-                console.log('item444=====2' + JSON.stringify(item1.homeGroupId));
-                if (item1.applianceConsumablesList.length > 0) {
-                  item1.applianceConsumablesList.forEach(function (item) {
-                    item.homeGroupId = item1.homeGroupId;
+              // allData.forEach(item1 => {
+              //   console.log('item444=====2' + JSON.stringify(item1.homeGroupId))
+              //   if (item1.applianceConsumablesList.length > 0) {
+              //     item1.applianceConsumablesList.forEach(item => {
+              //       item.homeGroupId = item1.homeGroupId
+              //     })
+              //     result = result.concat(item1.applianceConsumablesList)
+              //   }
+              // })
+              // 因为在多家庭的情况下后端可能对返回数据出现不一样的问题，前端做下兼容，默认跟家庭一致,加一层针对家庭的循环
+
+              if (params.homeGroupInfoList && params.homeGroupInfoList.length >= 1) {
+                params.homeGroupInfoList.forEach(function (item) {
+                  allData.forEach(function (item1) {
+                    if (item.homegroupId == item1.homeGroupId && item1.applianceConsumablesList.length > 0) {
+                      item1.applianceConsumablesList.forEach(function (item2) {
+                        item2.homeGroupId = item1.homeGroupId;
+                      });
+                      result = result.concat(item1.applianceConsumablesList);
+                    }
                   });
-                  result = result.concat(item1.applianceConsumablesList);
-                }
-              });
+                });
+              }
               console.log('合并后数组3333===1' + JSON.stringify(result));
 
               if (!(result && result.length == 0)) {
@@ -3390,7 +3405,6 @@ 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;
@@ -3444,7 +3458,7 @@ var MaterialEvent = {
                 break;
               }
 
-              return _context13.abrupt('return', _this15.handleMaterialSeviceTypeColmo());
+              return _context13.abrupt('return', _this15.handleMaterialSeviceType());
 
             case 5:
 
@@ -3819,23 +3833,6 @@ 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的情况
@@ -65725,7 +65722,8 @@ exports.default = {
         console.log('传入的耗材' + JSON.stringify(val));
 
         if (val.length > 0) {
-          this.handleChartData(val);
+          this.deviceMaterialList = val;
+          // this.handleChartData(val)
           setTimeout(function () {
             _this.handleRenderEnd();
           }, 200);
@@ -65867,17 +65865,19 @@ exports.default = {
       }))();
     },
     handleChartData: function handleChartData(val) {
-      // let tempVal = JSON.parse(JSON.stringify(val))
-      // tempVal.forEach(item => {
-      //   item.consumables.forEach(it => {
-      //     it.chartData = MaterialEvent.setChartData(it, {
-      //       isDiablo: this.isDiablo,
-      //       isScale: this.isScale,
-      //       needBackground: this.needBackground
-      //     })
-      //   })
-      // })
-      this.deviceMaterialList = val;
+      var _this5 = this;
+
+      var tempVal = JSON.parse(JSON.stringify(val));
+      val.forEach(function (item) {
+        item.consumables.forEach(function (it) {
+          it.chartData = _index2.default.setChartData(it, {
+            isDiablo: _this5.isDiablo,
+            isScale: _this5.isScale,
+            needBackground: _this5.needBackground
+          });
+        });
+      });
+      this.deviceMaterialList = tempVal;
     },
     setWavePercent: function setWavePercent(item) {
       return _index2.default.setWavePercent(item, this.isDiablo, this.needBackground);
@@ -66034,11 +66034,11 @@ exports.default = {
       }
     },
     handleRenderEnd: function handleRenderEnd() {
-      var _this5 = this;
+      var _this6 = this;
 
       setTimeout(function () {
-        dom.getComponentRect(_this5.$refs.materialBox, function (data) {
-          _this5.$emit('renderEnd', data.size.height);
+        dom.getComponentRect(_this6.$refs.materialBox, function (data) {
+          _this6.$emit('renderEnd', data.size.height);
         });
       }, 200);
     }