dolphin-weex-bc 0.0.12 → 0.0.13

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 
 # 升级日志
 
+## 0.0.13
+
+- [ ! ] 耗材业务组件修改暗黑模式样式
+- [ ! ] date: 2025/10/22
+
 ## 0.0.12
 
 - [ ! ] 耗材业务组件增加定制化传参

package/dist/index.native.js

@@ -2806,8 +2806,12 @@ var MaterialEvent = {
 
   deviceMaterialList: [],
 
+  isDiablo: false,
+
+  isCurrentHome: false,
+
   //批量查询耗材的情况
-  getAllMaterialList: function getAllMaterialList(params) {
+  getAllMaterialList: function getAllMaterialList(params, options) {
     var _this6 = this;
 
     return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
@@ -2815,6 +2819,7 @@ var MaterialEvent = {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              if (options.isDiablo) _this6.isDiablo = options.isDiablo;
               return _context2.abrupt('return', new Promise(function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve, reject) {
                   var homeGroupId, deviceList;
@@ -2866,7 +2871,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 1:
+            case 2:
             case 'end':
               return _context2.stop();
           }
@@ -2874,7 +2879,7 @@ var MaterialEvent = {
       }, _callee2, _this6);
     }))();
   },
-  getMaterialList: function getMaterialList(params, isCurrentHome) {
+  getMaterialList: function getMaterialList(params, options) {
     var _this7 = this;
 
     return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
@@ -2882,6 +2887,8 @@ 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;
               return _context4.abrupt('return', new Promise(function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(resolve, reject) {
                   var deviceList, res;
@@ -2894,7 +2901,7 @@ var MaterialEvent = {
                           console.log('进来这里啦11' + JSON.stringify(params));
                           deviceList = [];
 
-                          if (!isCurrentHome) {
+                          if (!options.isCurrentHome) {
                             _context3.next = 10;
                             break;
                           }
@@ -2947,7 +2954,7 @@ var MaterialEvent = {
                 };
               }()));
 
-            case 1:
+            case 3:
             case 'end':
               return _context4.stop();
           }
@@ -3156,8 +3163,9 @@ var MaterialEvent = {
           switch (_context8.prev = _context8.next) {
             case 0:
               tmpcodeList = [];
-              circleColorList = ['#F56428', '#FFAA10', '#00A4F2'];
+              circleColorList = _this11.isDiablo ? ['#D35936', '#BE8214', '#0490D3'] : ['#F56428', '#FFAA10', '#00A4F2'];
 
+              console.log('颜色集合：' + JSON.stringify(circleColorList));
               _this11.deviceMaterialList.forEach(function (item) {
                 var device = deviceList.findIndex(function (it) {
                   return item.applianceCode == it.deviceId;
@@ -3180,6 +3188,8 @@ var MaterialEvent = {
                     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';
                   it.chartData = _extends({}, chartData, {
                     progressCounter: percent,
                     completedColor: circleColorList[it.remainingStatus],
@@ -3199,7 +3209,7 @@ var MaterialEvent = {
               console.log('codeList9999===1' + JSON.stringify(codeList));
 
               if (codeList.length) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
 
@@ -3207,98 +3217,98 @@ var MaterialEvent = {
               _this11.handleMaterialSeviceType();
               return _context8.abrupt('return');
 
-            case 8:
+            case 9:
               skuinfolist = [];
 
               if (!(codeList && codeList.length > 20)) {
-                _context8.next = 28;
+                _context8.next = 29;
                 break;
               }
 
               groupNum = Math.ceil(codeList.length / 20);
               index = 0;
 
-            case 12:
+            case 13:
               if (!(index < groupNum)) {
-                _context8.next = 26;
+                _context8.next = 27;
                 break;
               }
 
-              _context8.prev = 13;
-              _context8.next = 16;
+              _context8.prev = 14;
+              _context8.next = 17;
               return _this11.getUpkeepShopInfo(codeList.slice(index * 20, (index + 1) * 20));
 
-            case 16:
+            case 17:
               shopList = _context8.sent;
 
               skuinfolist = skuinfolist.concat(shopList);
-              _context8.next = 23;
+              _context8.next = 24;
               break;
 
-            case 20:
-              _context8.prev = 20;
-              _context8.t0 = _context8['catch'](13);
-              return _context8.abrupt('continue', 23);
+            case 21:
+              _context8.prev = 21;
+              _context8.t0 = _context8['catch'](14);
+              return _context8.abrupt('continue', 24);
 
-            case 23:
+            case 24:
               index++;
-              _context8.next = 12;
+              _context8.next = 13;
               break;
 
-            case 26:
-              _context8.next = 36;
+            case 27:
+              _context8.next = 37;
               break;
 
-            case 28:
-              _context8.prev = 28;
-              _context8.next = 31;
+            case 29:
+              _context8.prev = 29;
+              _context8.next = 32;
               return _this11.getUpkeepShopInfo(codeList);
 
-            case 31:
+            case 32:
               skuinfolist = _context8.sent;
-              _context8.next = 36;
+              _context8.next = 37;
               break;
 
-            case 34:
-              _context8.prev = 34;
-              _context8.t1 = _context8['catch'](28);
+            case 35:
+              _context8.prev = 35;
+              _context8.t1 = _context8['catch'](29);
 
-            case 36:
+            case 37:
 
               console.log('获取到的商品信息：' + JSON.stringify(skuinfolist));
 
               if (!(skuinfolist.length > 0)) {
-                _context8.next = 48;
+                _context8.next = 49;
                 break;
               }
 
-              _context8.prev = 38;
-              _context8.next = 41;
+              _context8.prev = 39;
+              _context8.next = 42;
               return _this11.handleGoodsInfoNewSkuId(skuinfolist);
 
-            case 41:
-              _context8.next = 45;
+            case 42:
+              _context8.next = 46;
               break;
 
-            case 43:
-              _context8.prev = 43;
-              _context8.t2 = _context8['catch'](38);
+            case 44:
+              _context8.prev = 44;
+              _context8.t2 = _context8['catch'](39);
 
-            case 45:
+            case 46:
               _this11.setMaterialGoodInfo(skuinfolist);
-              _context8.next = 49;
+              _context8.next = 50;
               break;
 
-            case 48:
+            case 49:
               //此时如果有活动链接就取活动链接
               _this11.handleMaterialSeviceType();
 
-            case 49:
+            case 50:
             case 'end':
               return _context8.stop();
           }
         }
-      }, _callee8, _this11, [[13, 20], [28, 34], [38, 43]]);
+      }, _callee8, _this11, [[14, 21], [29, 35], [39, 44]]);
     }))();
   },
 
@@ -3544,15 +3554,14 @@ var MaterialEvent = {
     var type = item.remainingStatus;
     var percent = type == 2 ? 0.4 : 0.05;
     var percentTxt = type == 2 ? '充足' : '不足';
-    var textColorList = ['#F56428', '#F56428', '#00A4F2'];
-    var frontColorList = ['#F56428', '#F56428', '#9fdaf5'];
-    var backColorList = ['#fc9791', '#fc9791', '#c7e8f7'];
-
+    var textColorList = this.isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2'];
+    var frontColorList = this.isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5'];
+    var backColorList = this.isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7'];
     return {
       frontWaveColor: frontColorList[type], //已完成后的颜色默认#FFFFFF
       backWaveColor: backColorList[type],
       animate: true,
-      backgroundColor: '#FFFFFF', //背景色 默认为#000000
+      backgroundColor: this.isDiablo ? '#1E2326' : '#FFFFFF', //背景色 默认为#000000
       progress: percent, // 进度 [0 ... 1]
       textFont: 11, //字体大小，默认为14
       text: percentTxt, //文本 默认为空
@@ -62575,6 +62584,25 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 var globalEvent = weex.requireModule('globalEvent');
 var animation = weex.requireModule('animation');
@@ -62630,27 +62658,7 @@ exports.default = {
   data: function data() {
     return {
       deviceMaterialList: this.data,
-      isIos: weex.config.env.platform == 'iOS' ? true : false,
-      chartData: {
-        completedColor: '#00a4f2', //环形进度条未完成后的颜色默认#267AFF
-        incompletedColor: '#f9f9f9', //环形进度条未完成后的颜色，默认透明
-        thickness: 3, //环形进度条宽度，默认4
-        cornerRadius: 44, //环形的半径，默认是width/2
-        totalCounter: 100, //环形进度条的最大值，默认是360
-        progressCounter: 80, //设置进度值，默认是从0-360, 默认为0
-        autoProgress: false, //设置是否需要自动执行环形进度，默认false, 如果设置为true，则每秒进度值+1操作
-        clockwise: false, //环形自动执行进度的方向，默认是true，即顺时针方向，false为逆时针方向
-        startingSlice: 360, //环形进度开始的起始位置，当totalCounter为360的时候，0: 0点钟位置起点，90:3点钟位置起点 180:6点钟位置起点
-        pointShow: false, //环形进度中的进度球是否需要显示，默认不显示
-        pointRadius: 8, //默认是环形进度宽度的一半
-        pointColor: '#FFFFFF', //环形进度中的进度球颜色
-        duration: 1000
-      },
-      arrowIcon: _icon2.default.icon_arrow,
-      from: '',
-      homegroupId: '',
-      applianceCode: '',
-      deviceInfo: {}
+      arrowIcon: _icon2.default.icon_arrow
     };
   },
 
@@ -62723,7 +62731,9 @@ exports.default = {
               case 0:
                 _context2.prev = 0;
                 _context2.next = 3;
-                return _index2.default.getAllMaterialList(_this3.materialParams);
+                return _index2.default.getAllMaterialList(_this3.materialParams, {
+                  isDiablo: _this3.isDiablo
+                });
 
               case 3:
                 _this3.deviceMaterialList = _context2.sent;
@@ -62759,7 +62769,10 @@ exports.default = {
               case 0:
                 _context3.prev = 0;
                 _context3.next = 3;
-                return _index2.default.getMaterialList(_this4.materialParams, _this4.isCurrentHome);
+                return _index2.default.getMaterialList(_this4.materialParams, {
+                  isDiablo: _this4.isDiablo,
+                  isCurrentHome: _this4.isCurrentHome
+                });
 
               case 3:
                 _this4.deviceMaterialList = _context3.sent;
@@ -62786,7 +62799,7 @@ exports.default = {
       }))();
     },
     setWavePercent: function setWavePercent(item) {
-      _index2.default.setWavePercent(item);
+      return _index2.default.setWavePercent(item);
     },
 
 
@@ -68096,6 +68109,46 @@ module.exports = {
     "fontSize": "24",
     "color": "#8E969B"
   },
+  "title-txt2-user1": {
+    "fontSize": "22",
+    "color": "#797C7E"
+  },
+  "title-txt2-user1-1": {
+    "fontSize": "22",
+    "color": "#303538"
+  },
+  "title-txt2-user2": {
+    "fontSize": "22",
+    "color": "#8E969B"
+  },
+  "title-txt2-user3": {
+    "fontSize": "24",
+    "color": "#797C7E"
+  },
+  "title-txt2-user3-3": {
+    "fontSize": "24",
+    "color": "#303538"
+  },
+  "title-txt2-user4": {
+    "fontSize": "24",
+    "color": "#8E969B"
+  },
+  "title-txt2-user-n1": {
+    "fontSize": "22",
+    "color": "#D35926"
+  },
+  "title-txt2-user-n2": {
+    "fontSize": "22",
+    "color": "#F56428"
+  },
+  "title-txt2-user-n3": {
+    "fontSize": "24",
+    "color": "#D35926"
+  },
+  "title-txt2-user-n4": {
+    "fontSize": "24",
+    "color": "#F56428"
+  },
   "title-icon-isScale": {
     "width": "81",
     "height": "81"
@@ -68107,9 +68160,7 @@ module.exports = {
     "color": "#CFCFD0"
   },
   "title-txt2-user-isScale": {
-    "fontSize": "22",
-    "maxWidth": "340",
-    "backgroundColor": "#ff0000"
+    "fontSize": "22"
   },
   "title-txt2-user-isDiablo": {
     "color": "#797C7E"
@@ -73965,7 +74016,8 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
       staticClass: ["material-list"],
       style: {
         width: _vm.width + 'px',
-        'background-color': _vm.isDiablo ? '#101315' : _vm.needBackground ? '#fff' : '#F6F7F9'
+        'background-color': _vm.isDiablo ? '#101315' : _vm.needBackground ? '#fff' : '#F6F7F9',
+        'margin-bottom': _vm.isScale ? '15px' : '34px'
       }
     }, [(item.consumables && item.consumables.length > 0) ? [_c('div', {
       class: ['material-title', _vm.isDiablo && 'material-title-isDiablo']
@@ -73988,11 +74040,31 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
       staticClass: ["title-txt2-o3"]
     }, [_vm._v(_vm._s(item.deviceInfo.roomName))]) : (!_vm.isScale && !_vm.isDiablo) ? _c('text', {
       staticClass: ["title-txt2-o4"]
-    }, [_vm._v(_vm._s(item.deviceInfo.roomName))]) : _vm._e(), _c('text', {
-      staticClass: ["title-txt2-user"]
-    }, [_vm._v(" | ")]), _c('text', {
-      class: ['title-txt2-user', item.deviceInfo.isOnline != 1 && 'title-txt3']
-    }, [_vm._v(_vm._s(item.deviceInfo.isOnline == 1 ? '在线' : '离线'))])])])]), _vm._l((item.consumables), function(it) {
+    }, [_vm._v(_vm._s(item.deviceInfo.roomName))]) : _vm._e(), (_vm.isScale && _vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user1-1"]
+    }, [_vm._v(" | ")]) : (_vm.isScale) ? _c('text', {
+      staticClass: ["title-txt2-user2"]
+    }, [_vm._v(" | ")]) : (_vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user3-3"]
+    }, [_vm._v(" | ")]) : (!_vm.isScale && !_vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user4"]
+    }, [_vm._v(" | ")]) : _vm._e(), (item.deviceInfo.isOnline == 1) ? [(_vm.isScale && _vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user1"]
+    }, [_vm._v("在线")]) : (_vm.isScale) ? _c('text', {
+      staticClass: ["title-txt2-user2"]
+    }, [_vm._v("在线")]) : (_vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user3"]
+    }, [_vm._v("在线")]) : (!_vm.isScale && !_vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user4"]
+    }, [_vm._v("在线")]) : _vm._e()] : [(_vm.isScale && _vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user-n1"]
+    }, [_vm._v("离线")]) : (_vm.isScale) ? _c('text', {
+      staticClass: ["title-txt2-user-n2"]
+    }, [_vm._v("离线")]) : (_vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user-n3"]
+    }, [_vm._v("离线")]) : (!_vm.isScale && !_vm.isDiablo) ? _c('text', {
+      staticClass: ["title-txt2-user-n4"]
+    }, [_vm._v("离线")]) : _vm._e()]], 2)])]), _vm._l((item.consumables), function(it) {
       return _c('div', {
         key: it.consumablesCode
       }, [