dolphin-weex-bc 0.0.13 → 0.0.14

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 
 # 升级日志
 
+## 0.0.14
+
+- [ ! ] 耗材业务组件修复bug
+- [ ! ] date: 2025/10/28
+
+
 ## 0.0.13
 
 - [ ! ] 耗材业务组件修改暗黑模式样式

package/dist/index.native.js

@@ -2793,10 +2793,10 @@ var MaterialEvent = {
       var shouldSortD = [2, '2'].includes(b.remainingStatus) && b.remainingValue !== null;
 
       if (shouldSortA && shouldSortB) {
-        return Number(a.remainingValueType == 4 ? 100 : a.remainingValue) / Number(a.remainingValueType == 4 ? 100 : a.total) - Number(b.remainingValueType == 4 ? 100 : b.remainingValue) / Number(b.remainingValueType == 4 ? 100 : b.total);
+        return Number(a.remainingValueType == 4 ? 100 : a.percent) / Number(a.remainingValueType == 4 ? 100 : 100) - Number(b.remainingValueType == 4 ? 100 : b.percent) / Number(b.remainingValueType == 4 ? 100 : 100);
       }
       if (shouldSortC && shouldSortD) {
-        return Number(a.remainingValueType == 4 ? 111 : a.remainingValue) / Number(a.remainingValueType == 4 ? 100 : a.total) - Number(b.remainingValueType == 4 ? 111 : b.remainingValue) / Number(b.remainingValueType == 4 ? 100 : b.total);
+        return Number(a.remainingValueType == 4 ? 111 : a.percent) / Number(a.remainingValueType == 4 ? 100 : 100) - Number(b.remainingValueType == 4 ? 111 : b.percent) / Number(b.remainingValueType == 4 ? 100 : 100);
       }
       // 都不符合条件保持原顺序
       return 0;
@@ -2810,6 +2810,10 @@ var MaterialEvent = {
 
   isCurrentHome: false,
 
+  needBackground: false,
+
+  isScale: false,
+
   //批量查询耗材的情况
   getAllMaterialList: function getAllMaterialList(params, options) {
     var _this6 = this;
@@ -2819,7 +2823,10 @@ var MaterialEvent = {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (options.isDiablo) _this6.isDiablo = options.isDiablo;
+              _this6.isDiablo = options.isDiablo;
+              _this6.isScale = options.isScale;
+              _this6.needBackground = options.needBackground;
+              _this6.deviceMaterialList = [];
               return _context2.abrupt('return', new Promise(function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve, reject) {
                   var homeGroupId, deviceList;
@@ -2828,42 +2835,40 @@ var MaterialEvent = {
                       switch (_context.prev = _context.next) {
                         case 0:
                           _context.prev = 0;
-
-                          console.log('进来这里啦' + JSON.stringify(params));
                           homeGroupId = '';
 
                           if (params.homeGroupInfoList.length == 1) {
                             //只有一个家庭
                             homeGroupId = params.homeGroupInfoList[0].homegroupId;
                           }
-                          _context.next = 6;
+                          _context.next = 5;
                           return _this6.getDeviceList(homeGroupId);
 
-                        case 6:
+                        case 5:
                           deviceList = _context.sent;
-                          _context.next = 9;
+                          _context.next = 8;
                           return _this6.queryBatchMaterial(deviceList, params);
 
-                        case 9:
+                        case 8:
                           console.log('最终的deviceMaterialList：' + JSON.stringify(_this6.deviceMaterialList));
                           resolve(_this6.deviceMaterialList);
-                          _context.next = 18;
+                          _context.next = 17;
                           break;
 
-                        case 13:
-                          _context.prev = 13;
+                        case 12:
+                          _context.prev = 12;
                           _context.t0 = _context['catch'](0);
 
                           console.log('打印了错误：' + _context.t0);
                           reject(_context.t0);
                           throw _context.t0;
 
-                        case 18:
+                        case 17:
                         case 'end':
                           return _context.stop();
                       }
                     }
-                  }, _callee, _this6, [[0, 13]]);
+                  }, _callee, _this6, [[0, 12]]);
                 }));
 
                 return function (_x11, _x12) {
@@ -2871,7 +2876,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 2:
+            case 5:
             case 'end':
               return _context2.stop();
           }
@@ -2887,8 +2892,11 @@ var MaterialEvent = {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              if (options.isDiablo) _this7.isDiablo = options.isDiablo;
-              if (options.isCurrentHome) _this7.isCurrentHome = options.isCurrentHome;
+              _this7.isDiablo = options.isDiablo;
+              _this7.isScale = options.isScale;
+              _this7.isCurrentHome = options.isCurrentHome;
+              _this7.needBackground = options.needBackground;
+              _this7.deviceMaterialList = [];
               return _context4.abrupt('return', new Promise(function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(resolve, reject) {
                   var deviceList, res;
@@ -2897,56 +2905,54 @@ var MaterialEvent = {
                       switch (_context3.prev = _context3.next) {
                         case 0:
                           _context3.prev = 0;
-
-                          console.log('进来这里啦11' + JSON.stringify(params));
                           deviceList = [];
 
                           if (!options.isCurrentHome) {
-                            _context3.next = 10;
+                            _context3.next = 9;
                             break;
                           }
 
-                          _context3.next = 6;
+                          _context3.next = 5;
                           return _this7.getCurrentHomeInfo();
 
-                        case 6:
+                        case 5:
                           res = _context3.sent;
 
                           deviceList = res.deviceList;
-                          _context3.next = 13;
+                          _context3.next = 12;
                           break;
 
-                        case 10:
-                          _context3.next = 12;
+                        case 9:
+                          _context3.next = 11;
                           return _this7.getDeviceList(params.homegroupId);
 
-                        case 12:
+                        case 11:
                           deviceList = _context3.sent;
 
-                        case 13:
-                          _context3.next = 15;
+                        case 12:
+                          _context3.next = 14;
                           return _this7.queryBatchMaterialSingle(deviceList, params);
 
-                        case 15:
+                        case 14:
                           console.log('最终的deviceMaterialList：' + JSON.stringify(_this7.deviceMaterialList));
                           resolve(_this7.deviceMaterialList);
-                          _context3.next = 24;
+                          _context3.next = 23;
                           break;
 
-                        case 19:
-                          _context3.prev = 19;
+                        case 18:
+                          _context3.prev = 18;
                           _context3.t0 = _context3['catch'](0);
 
                           console.log('打印了错误：' + _context3.t0);
                           reject(_context3.t0);
                           throw _context3.t0;
 
-                        case 24:
+                        case 23:
                         case 'end':
                           return _context3.stop();
                       }
                     }
-                  }, _callee3, _this7, [[0, 19]]);
+                  }, _callee3, _this7, [[0, 18]]);
                 }));
 
                 return function (_x13, _x14) {
@@ -2954,7 +2960,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 3:
+            case 6:
             case 'end':
               return _context4.stop();
           }
@@ -3078,8 +3084,7 @@ var MaterialEvent = {
               return _context6.abrupt('return', result);
 
             case 13:
-
-              _this9.deviceMaterialList = result;
+              _this9.handleNullRemainingForOfferLine(params, result);
               _context6.next = 16;
               return _this9.handleMaterialRes(deviceList);
 
@@ -3129,7 +3134,7 @@ var MaterialEvent = {
             case 6:
               allData = res.data;
 
-              _this10.deviceMaterialList = allData;
+              _this10.handleNullRemainingForOfferLine(params, allData);
               _context7.next = 10;
               return _this10.handleMaterialRes(deviceList);
 
@@ -3150,6 +3155,20 @@ var MaterialEvent = {
       }, _callee7, _this10, [[0, 12]]);
     }))();
   },
+  handleNullRemainingForOfferLine: function handleNullRemainingForOfferLine(params, data) {
+    //如果用户传了returnNullRemaining=false则需要手动排除设备离线的数据
+    var newData = [];
+    if (params.hasOwnProperty('returnNullRemaining') && !params.returnNullRemaining) {
+      data.forEach(function (item) {
+        if (item.onlineStatus != 0) {
+          newData.push(item);
+        }
+      });
+      this.deviceMaterialList = newData;
+    } else {
+      this.deviceMaterialList = data;
+    }
+  },
 
 
   //处理接口返回数据
@@ -3187,16 +3206,15 @@ var MaterialEvent = {
                   if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable && it.serviceSupport.washingService.productCode) {
                     tmpcodeList.push(it.serviceSupport.washingService.productCode);
                   }
-                  var percent = it.percent ? it.percent : Math.ceil(_this11.floatMul(_this11.floatDiv(it.remainingValue, it.total), 100));
-
-                  chartData.incompletedColor = _this11.isDiablo ? '#2b2f32' : '#ffffff';
+                  var percent = it.percent;
+                  chartData.incompletedColor = _this11.isDiablo ? '#2b2f32' : _this11.needBackground ? '#F6F7F9' : '#ffffff';
                   it.chartData = _extends({}, chartData, {
-                    progressCounter: percent,
+                    progressCounter: percent < 1 && percent != 0 ? 1 : percent,
                     completedColor: circleColorList[it.remainingStatus],
                     textColor: circleColorList[it.remainingStatus]
                   }, {
                     text: percent + '%',
-                    textSize: 12,
+                    textSize: _this11.isScale ? 11 : 12,
                     cornerRadius: isIos ? 44 : 88,
                     thickness: isIos ? 3 : 6
                   });
@@ -3538,7 +3556,7 @@ var MaterialEvent = {
               }
             } else if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable && (it.serviceSupport.washingService.serviceUrl || it.washingServiceGoodsInfo && (it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId))) {
               it.btnType = 4;
-              it.btnText = it.classification == 3 ? '清洗' : '清洁';
+              it.btnText = '清洗';
             }
           }
         }
@@ -62603,6 +62621,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
 
 var globalEvent = weex.requireModule('globalEvent');
 var animation = weex.requireModule('animation');
@@ -62650,6 +62669,10 @@ exports.default = {
       type: Boolean,
       default: false
     },
+    needErrorTip: {
+      type: Boolean,
+      default: false
+    },
     isFilterShow: {
       type: Boolean,
       default: true // 是否是分层模式
@@ -62676,7 +62699,7 @@ exports.default = {
         if (val.length > 0) {
           this.deviceMaterialList = val;
           setTimeout(function () {
-            _this.getInnerHeight();
+            _this.handleRenderEnd();
           }, 200);
         }
       },
@@ -62712,6 +62735,9 @@ exports.default = {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              console.log('版本号是3');
+
+            case 1:
             case 'end':
               return _context.stop();
           }
@@ -62732,31 +62758,38 @@ exports.default = {
                 _context2.prev = 0;
                 _context2.next = 3;
                 return _index2.default.getAllMaterialList(_this3.materialParams, {
-                  isDiablo: _this3.isDiablo
+                  isDiablo: _this3.isDiablo,
+                  isScale: _this3.isScale,
+                  needBackground: _this3.needBackground
                 });
 
               case 3:
                 _this3.deviceMaterialList = _context2.sent;
 
                 console.log('新的耗材数据' + JSON.stringify(_this3.deviceMaterialList));
-                _this3.getInnerHeight();
-                _context2.next = 11;
+                _context2.next = 10;
                 break;
 
-              case 8:
-                _context2.prev = 8;
+              case 7:
+                _context2.prev = 7;
                 _context2.t0 = _context2['catch'](0);
 
-                if (_context2.t0.msg) {
+                if (_context2.t0.msg && _this3.needErrorTip) {
                   _this3.$bridge.showToast(_context2.t0.msg);
                 }
 
-              case 11:
+              case 10:
+                _context2.prev = 10;
+
+                _this3.handleRenderEnd();
+                return _context2.finish(10);
+
+              case 13:
               case 'end':
                 return _context2.stop();
             }
           }
-        }, _callee2, _this3, [[0, 8]]);
+        }, _callee2, _this3, [[0, 7, 10, 13]]);
       }))();
     },
     getMaterialList: function getMaterialList() {
@@ -62771,31 +62804,38 @@ exports.default = {
                 _context3.next = 3;
                 return _index2.default.getMaterialList(_this4.materialParams, {
                   isDiablo: _this4.isDiablo,
-                  isCurrentHome: _this4.isCurrentHome
+                  isCurrentHome: _this4.isCurrentHome,
+                  isScale: _this4.isScale,
+                  needBackground: _this4.needBackground
                 });
 
               case 3:
                 _this4.deviceMaterialList = _context3.sent;
 
                 console.log('新的耗材数据' + JSON.stringify(_this4.deviceMaterialList));
-                _this4.getInnerHeight();
-                _context3.next = 11;
+                _context3.next = 10;
                 break;
 
-              case 8:
-                _context3.prev = 8;
+              case 7:
+                _context3.prev = 7;
                 _context3.t0 = _context3['catch'](0);
 
-                if (_context3.t0.msg) {
+                if (_context3.t0.msg && _this4.needErrorTip) {
                   _this4.$bridge.showToast(_context3.t0.msg);
                 }
 
-              case 11:
+              case 10:
+                _context3.prev = 10;
+
+                _this4.handleRenderEnd();
+                return _context3.finish(10);
+
+              case 13:
               case 'end':
                 return _context3.stop();
             }
           }
-        }, _callee3, _this4, [[0, 8]]);
+        }, _callee3, _this4, [[0, 7, 10, 13]]);
       }))();
     },
     setWavePercent: function setWavePercent(item) {
@@ -62942,10 +62982,11 @@ exports.default = {
         }
       }
     },
-    getInnerHeight: function getInnerHeight() {
+    handleRenderEnd: function handleRenderEnd() {
       var _this5 = this;
 
       setTimeout(function () {
+        _this5.$emit('consumablesInfo', { deviceMaterialList: deviceMaterialList });
         dom.getComponentRect(_this5.$refs.materialBox, function (data) {
           _this5.$emit('renderEnd', data.size.height);
         });
@@ -68077,8 +68118,14 @@ module.exports = {
     "backgroundImage": "linear-gradient(to bottom, #64747E, #171C1F)",
     "borderBottom": "1px solid #23282b"
   },
+  "material-title-isScale": {
+    "paddingTop": 0,
+    "paddingRight": "29",
+    "paddingBottom": 0,
+    "paddingLeft": "33"
+  },
   "title-txt2-o1": {
-    "maxWidth": "360",
+    "maxWidth": "340",
     "overflow": "hidden",
     "lines": 1,
     "textOverflow": "ellipsis",
@@ -68086,7 +68133,7 @@ module.exports = {
     "color": "#797C7E"
   },
   "title-txt2-o2": {
-    "maxWidth": "360",
+    "maxWidth": "340",
     "overflow": "hidden",
     "lines": 1,
     "textOverflow": "ellipsis",
@@ -68115,7 +68162,7 @@ module.exports = {
   },
   "title-txt2-user1-1": {
     "fontSize": "22",
-    "color": "#303538"
+    "color": "#3A3E41"
   },
   "title-txt2-user2": {
     "fontSize": "22",
@@ -68127,7 +68174,7 @@ module.exports = {
   },
   "title-txt2-user3-3": {
     "fontSize": "24",
-    "color": "#303538"
+    "color": "#3A3E41"
   },
   "title-txt2-user4": {
     "fontSize": "24",
@@ -68169,7 +68216,11 @@ module.exports = {
     "color": "#D35926"
   },
   "material-item-isScale": {
-    "height": "147"
+    "height": "147",
+    "paddingTop": 0,
+    "paddingRight": "29",
+    "paddingBottom": 0,
+    "paddingLeft": "33"
   },
   "material-item-isDiablo": {
     "backgroundColor": "#171C1F"
@@ -68180,7 +68231,8 @@ module.exports = {
   },
   "progresscycle-wrapper-isScale": {
     "width": "81",
-    "height": "81"
+    "height": "81",
+    "marginRight": "28"
   },
   "progresscycle-wrapper-isDiablo": {
     "backgroundColor": "#171C1F"
@@ -68207,7 +68259,8 @@ module.exports = {
     "backgroundColor": "#1E2326"
   },
   "item-txt1-isScale": {
-    "fontSize": "29"
+    "fontSize": "29",
+    "width": "325"
   },
   "item-txt1-isDiablo": {
     "color": "#CFCFD0"
@@ -68225,11 +68278,7 @@ module.exports = {
     "color": "#797C7E"
   },
   "item-txt5-isScale": {
-    "fontSize": "22",
-    "maxWidth": "280",
-    "overflow": "hidden",
-    "lines": 1,
-    "textOverflow": "ellipsis"
+    "fontSize": "22"
   },
   "item-txt5-isDiablo": {
     "color": "#BE8214"
@@ -74020,7 +74069,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
         'margin-bottom': _vm.isScale ? '15px' : '34px'
       }
     }, [(item.consumables && item.consumables.length > 0) ? [_c('div', {
-      class: ['material-title', _vm.isDiablo && 'material-title-isDiablo']
+      class: ['material-title', _vm.isScale && 'material-title-isScale', _vm.isDiablo && 'material-title-isDiablo']
     }, [_c('image', {
       class: ['title-icon', _vm.isScale && 'title-icon-isScale'],
       attrs: {
@@ -74090,7 +74139,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
             'progresscycle-wrapper',
             _vm.isDiablo && 'progresscycle-wrapper-isDiablo',
             _vm.isScale && 'progresscycle-wrapper-isScale'
-          ]
+          ],
+          style: {
+            'background-color': _vm.isDiablo ? '#171C1F' : _vm.needBackground ? '#fff' : '#F6F7F9'
+          }
         }, [_c('midea-progresscycle-view', {
           class: ['progresscycle', _vm.isScale && 'progresscycle-isScale'],
           attrs: {
@@ -74101,7 +74153,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
             'circle-noData',
             _vm.isScale && 'circle-noData-isScale',
             _vm.isDiablo && 'circle-noData-isDiablo'
-          ]
+          ],
+          style: {
+            'background-color': _vm.isDiablo ? '#1E2326' : _vm.needBackground ? '#F6F7F9' : '#fff'
+          }
         }, [_c('text', {
           class: ['noData-txt', _vm.isDiablo && 'noData-txt-isDiablo']
         }, [_vm._v("- -")])])]] : (it.remainingValueType == 5 && it.icons && it.icons.icon1) ? [_c('div', {
@@ -74109,7 +74164,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
             'circle-noData1',
             _vm.isScale && 'circle-noData1-isScale',
             _vm.isDiablo && 'circle-noData1-isDiablo'
-          ]
+          ],
+          style: {
+            'background-color': _vm.isDiablo ? '#1E2326' : _vm.needBackground ? '#F6F7F9' : '#fff'
+          }
         }, [_c('image', {
           staticClass: ["title-icon-noData1"],
           staticStyle: {
@@ -74124,7 +74182,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
             'circle-noData',
             _vm.isScale && 'circle-noData-isScale',
             _vm.isDiablo && 'circle-noData-isDiablo'
-          ]
+          ],
+          style: {
+            'background-color': _vm.isDiablo ? '#1E2326' : _vm.needBackground ? '#F6F7F9' : '#fff'
+          }
         }, [_c('text', {
           class: ['noData-txt', _vm.isDiablo && 'noData-txt-isDiablo']
         }, [_vm._v("- -")])])]], 2), _c('div', {
@@ -74132,18 +74193,18 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
         }, [_c('div', {
           staticClass: ["item-right-txt"]
         }, [_c('text', {
-          class: ['item-txt1', _vm.isScale && 'item-txt1-isScale', _vm.isDiablo && 'item-txt1-isDiablo'],
-          style: {
-            width: _vm.width / (686 / 350) + 'px'
-          }
+          class: ['item-txt1', _vm.isScale && 'item-txt1-isScale', _vm.isDiablo && 'item-txt1-isDiablo']
         }, [_vm._v(_vm._s(it.name))]), (item.deviceInfo.isOnline == 1 && it.remainingValueType != 5) ? [(it.remainingValue == 0 || it.remainingValue > 0) ? _c('div', {
           staticClass: ["item-txt2-row"]
         }, [(it.remainingStatus == 2) ? _c('text', {
           class: ['item-txt4', _vm.isScale && 'item-txt4-isScale', _vm.isDiablo && 'item-txt4-isDiablo']
         }, [_vm._v(_vm._s(it.classification == 3 ? '洁净度良好，请放心使用' : '余量充足，请放心使用'))]) : (it.remainingStatus == 1 && it.remainingValueType != 4) ? _c('text', {
           class: ['item-txt5', _vm.isScale && 'item-txt5-isScale', _vm.isDiablo && 'item-txt5-isDiablo']
-        }, [_vm._v(_vm._s(it.classification == 3 ? '洁净度下降，建议及时清洗' : '即将用尽，建议及时补充或更换'))]) : _c('text', {
-          class: ['item-txt3', _vm.isScale && 'item-txt3-isScale', _vm.isDiablo && 'item-txt3-isDiablo']
+        }, [_vm._v(_vm._s(it.classification == 3 ? '洁净度下降，请及时清洗' : '即将用尽，请及时补充或更换'))]) : _c('text', {
+          class: ['item-txt3', _vm.isScale && 'item-txt3-isScale', _vm.isDiablo && 'item-txt3-isDiablo'],
+          style: {
+            width: _vm.width == 686 ? '380px' : _vm.width / (686 / 340) + 'px'
+          }
         }, [_vm._v(_vm._s(it.classification == 3 ? '洁净度严重不足，请立即清洗' : '已用尽，请立即补充或更换'))])]) : _c('div', [_c('text', {
           class: ['item-txt4', _vm.isScale && 'item-txt4-isScale', _vm.isDiablo && 'item-txt4-isDiablo']
         }, [_vm._v("未获取到设备耗材数据")])])] : (it.remainingValueType == 5) ? void 0 : [_c('div', [_c('text', {
@@ -74165,7 +74226,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
           class: ['txt-purhase', _vm.isScale && 'txt-purhase-isScale', _vm.isDiablo && 'txt-purhase-isDiablo']
         }, [_vm._v("更换")]) : (it.btnType == 4) ? _c('text', {
           class: ['txt-purhase', _vm.isScale && 'txt-purhase-isScale', _vm.isDiablo && 'txt-purhase-isDiablo']
-        }, [_vm._v(_vm._s(it.classification == 3 ? '清洗' : '清洁'))]) : _vm._e()]) : _vm._e(), (it.remainingValueType != 5) ? _c('image', {
+        }, [_vm._v("清洗")]) : _vm._e()]) : _vm._e(), (it.remainingValueType != 5) ? _c('image', {
           class: ['arrow-icon', _vm.isScale && 'arrow-icon-isScale', _vm.isDiablo && 'arrow-icon-isDiablo'],
           attrs: {
             "resize": "stretch",