dolphin-weex-bc 0.0.26 → 0.0.28

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 # 升级日志
+## 0.0.28
+
+- [ ! ] colmo耗材组件,修复服务按钮显示错误问题
+- [ ! ] colmo和美居的耗材组件,将耗材接口的耗材型号字段异常字符串('null','/')，改为空
+- [ ! ] date: 2026/01/22
+
+## 0.0.27
+
+- [ ! ] 耗材业务组件修复渲染多次的问题
+- [ ! ] date: 2026/01/22
 ## 0.0.26
 
 - [ ! ] 耗材业务组件增加搜索列表页跳转逻辑判断

package/dist/index.native.js

@@ -3390,6 +3390,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;
@@ -3414,6 +3415,10 @@ var MaterialEvent = {
                       tmpcodeList.push(it.serviceSupport.washingService.productCode);
                     }
                     it.chartData = _this15.setChartData(it);
+                    it.btnType = 0;
+                    it.btnText = '';
+                    it.goodsInfo = {};
+                    it.washingServiceGoodsInfo = {};
                   }
                 } catch (err) {
                   _didIteratorError = true;
@@ -3439,7 +3444,7 @@ var MaterialEvent = {
                 break;
               }
 
-              return _context13.abrupt('return', _this15.handleMaterialSeviceType());
+              return _context13.abrupt('return', _this15.handleMaterialSeviceTypeColmo());
 
             case 5:
 
@@ -3814,6 +3819,23 @@ 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的情况
@@ -65701,6 +65723,7 @@ exports.default = {
         var _this = this;
 
         console.log('传入的耗材' + JSON.stringify(val));
+
         if (val.length > 0) {
           this.handleChartData(val);
           setTimeout(function () {
@@ -65844,19 +65867,17 @@ exports.default = {
       }))();
     },
     handleChartData: function handleChartData(val) {
-      var _this5 = this;
-
-      var tempVal = JSON.parse(JSON.stringify(val));
-      tempVal.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;
+      // 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;
     },
     setWavePercent: function setWavePercent(item) {
       return _index2.default.setWavePercent(item, this.isDiablo, this.needBackground);
@@ -65881,7 +65902,8 @@ exports.default = {
       _utils2.default.setItem('previous_materialDetail', item);
       _utils2.default.setItem('previous_deviceInfo', device.deviceInfo);
       //如果是没有展示耗材不足等情况下跳转为该设备下所有耗材，如果区分了则跳转当前耗材
-      var consumables = this.isFilterShow ? [item] : device.consumables;
+      // let consumables = this.isFilterShow ? [item] : device.consumables
+      var consumables = [item];
       _utils2.default.setItem('previous_consumables', consumables);
       // applianceCode: device.applianceCode,
       // consumablesCode: item.consumablesCode,
@@ -65891,9 +65913,7 @@ exports.default = {
         type: 'jumpWeex',
         param: {
           url: url,
-          viewTag: 'maintenance',
-          bgColor: this.isColmo ? '#000000' : '#ffffff',
-          pageBackgroundColor: this.isColmo ? '#000000' : '#ffffff'
+          viewTag: 'maintenance'
         }
       };
       console.log('跳转前的参数：' + JSON.stringify(params));
@@ -66014,11 +66034,11 @@ exports.default = {
       }
     },
     handleRenderEnd: function handleRenderEnd() {
-      var _this6 = this;
+      var _this5 = this;
 
       setTimeout(function () {
-        dom.getComponentRect(_this6.$refs.materialBox, function (data) {
-          _this6.$emit('renderEnd', data.size.height);
+        dom.getComponentRect(_this5.$refs.materialBox, function (data) {
+          _this5.$emit('renderEnd', data.size.height);
         });
       }, 200);
     }