dolphin-weex-bc 0.0.27 → 0.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/index.native.js +19 -1
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +19 -1
- package/dist/index.web.js.map +1 -1
- package/package.json +1 -1
- package/packages/material-event/index.js +19 -2
package/CHANGELOG.md
CHANGED
package/dist/index.native.js
CHANGED
|
@@ -3390,6 +3390,7 @@ var MaterialEvent = {
|
|
|
3390
3390
|
var it = _step.value;
|
|
3391
3391
|
|
|
3392
3392
|
console.log('consumables===it:1' + JSON.stringify(it));
|
|
3393
|
+
if (it.model === 'null' || it.model === '/') it.model = ''; //兜底某些数据返回异常字符串
|
|
3393
3394
|
if (isColmo) {
|
|
3394
3395
|
it.chartData = _this15.setChartDataColmo(it);
|
|
3395
3396
|
continue;
|
|
@@ -3443,7 +3444,7 @@ var MaterialEvent = {
|
|
|
3443
3444
|
break;
|
|
3444
3445
|
}
|
|
3445
3446
|
|
|
3446
|
-
return _context13.abrupt('return', _this15.
|
|
3447
|
+
return _context13.abrupt('return', _this15.handleMaterialSeviceTypeColmo());
|
|
3447
3448
|
|
|
3448
3449
|
case 5:
|
|
3449
3450
|
|
|
@@ -3818,6 +3819,23 @@ var MaterialEvent = {
|
|
|
3818
3819
|
}
|
|
3819
3820
|
},
|
|
3820
3821
|
|
|
3822
|
+
// COLMO按钮类型 2保养换芯 3售后维修 4清洗服务
|
|
3823
|
+
handleMaterialSeviceTypeColmo: function handleMaterialSeviceTypeColmo() {
|
|
3824
|
+
this.deviceMaterialList.forEach(function (item, index) {
|
|
3825
|
+
item.consumables.forEach(function (it) {
|
|
3826
|
+
if (it.serviceSupport) {
|
|
3827
|
+
if (it.serviceSupport && it.serviceSupport.bookingService && it.serviceSupport.bookingService.enable) {
|
|
3828
|
+
it.btnType = 2;
|
|
3829
|
+
if (it.serviceSupport.bookingService && it.serviceSupport.bookingService.serviceType == 2) {
|
|
3830
|
+
it.btnType = 3;
|
|
3831
|
+
}
|
|
3832
|
+
} else if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable) {
|
|
3833
|
+
it.btnType = 4;
|
|
3834
|
+
}
|
|
3835
|
+
}
|
|
3836
|
+
});
|
|
3837
|
+
});
|
|
3838
|
+
},
|
|
3821
3839
|
|
|
3822
3840
|
// 对每一种设备按照consumables中余量从最少到多排列
|
|
3823
3841
|
// 排序函数 - 处理 remainingValueType=4的情况
|