dolphin-weex-bc 0.0.26 → 0.0.27
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 +4 -0
- package/dist/index.native.js +22 -20
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +22 -20
- package/dist/index.web.js.map +1 -1
- package/package.json +1 -1
- package/packages/dof-consumables/index.vue +15 -15
- package/packages/material-event/index.js +4 -0
package/CHANGELOG.md
CHANGED
package/dist/index.native.js
CHANGED
|
@@ -3414,6 +3414,10 @@ var MaterialEvent = {
|
|
|
3414
3414
|
tmpcodeList.push(it.serviceSupport.washingService.productCode);
|
|
3415
3415
|
}
|
|
3416
3416
|
it.chartData = _this15.setChartData(it);
|
|
3417
|
+
it.btnType = 0;
|
|
3418
|
+
it.btnText = '';
|
|
3419
|
+
it.goodsInfo = {};
|
|
3420
|
+
it.washingServiceGoodsInfo = {};
|
|
3417
3421
|
}
|
|
3418
3422
|
} catch (err) {
|
|
3419
3423
|
_didIteratorError = true;
|
|
@@ -65701,6 +65705,7 @@ exports.default = {
|
|
|
65701
65705
|
var _this = this;
|
|
65702
65706
|
|
|
65703
65707
|
console.log('传入的耗材' + JSON.stringify(val));
|
|
65708
|
+
|
|
65704
65709
|
if (val.length > 0) {
|
|
65705
65710
|
this.handleChartData(val);
|
|
65706
65711
|
setTimeout(function () {
|
|
@@ -65844,19 +65849,17 @@ exports.default = {
|
|
|
65844
65849
|
}))();
|
|
65845
65850
|
},
|
|
65846
65851
|
handleChartData: function handleChartData(val) {
|
|
65847
|
-
|
|
65848
|
-
|
|
65849
|
-
|
|
65850
|
-
|
|
65851
|
-
|
|
65852
|
-
|
|
65853
|
-
|
|
65854
|
-
|
|
65855
|
-
|
|
65856
|
-
|
|
65857
|
-
|
|
65858
|
-
});
|
|
65859
|
-
this.deviceMaterialList = tempVal;
|
|
65852
|
+
// let tempVal = JSON.parse(JSON.stringify(val))
|
|
65853
|
+
// tempVal.forEach(item => {
|
|
65854
|
+
// item.consumables.forEach(it => {
|
|
65855
|
+
// it.chartData = MaterialEvent.setChartData(it, {
|
|
65856
|
+
// isDiablo: this.isDiablo,
|
|
65857
|
+
// isScale: this.isScale,
|
|
65858
|
+
// needBackground: this.needBackground
|
|
65859
|
+
// })
|
|
65860
|
+
// })
|
|
65861
|
+
// })
|
|
65862
|
+
this.deviceMaterialList = val;
|
|
65860
65863
|
},
|
|
65861
65864
|
setWavePercent: function setWavePercent(item) {
|
|
65862
65865
|
return _index2.default.setWavePercent(item, this.isDiablo, this.needBackground);
|
|
@@ -65881,7 +65884,8 @@ exports.default = {
|
|
|
65881
65884
|
_utils2.default.setItem('previous_materialDetail', item);
|
|
65882
65885
|
_utils2.default.setItem('previous_deviceInfo', device.deviceInfo);
|
|
65883
65886
|
//如果是没有展示耗材不足等情况下跳转为该设备下所有耗材,如果区分了则跳转当前耗材
|
|
65884
|
-
|
|
65887
|
+
// let consumables = this.isFilterShow ? [item] : device.consumables
|
|
65888
|
+
var consumables = [item];
|
|
65885
65889
|
_utils2.default.setItem('previous_consumables', consumables);
|
|
65886
65890
|
// applianceCode: device.applianceCode,
|
|
65887
65891
|
// consumablesCode: item.consumablesCode,
|
|
@@ -65891,9 +65895,7 @@ exports.default = {
|
|
|
65891
65895
|
type: 'jumpWeex',
|
|
65892
65896
|
param: {
|
|
65893
65897
|
url: url,
|
|
65894
|
-
viewTag: 'maintenance'
|
|
65895
|
-
bgColor: this.isColmo ? '#000000' : '#ffffff',
|
|
65896
|
-
pageBackgroundColor: this.isColmo ? '#000000' : '#ffffff'
|
|
65898
|
+
viewTag: 'maintenance'
|
|
65897
65899
|
}
|
|
65898
65900
|
};
|
|
65899
65901
|
console.log('跳转前的参数:' + JSON.stringify(params));
|
|
@@ -66014,11 +66016,11 @@ exports.default = {
|
|
|
66014
66016
|
}
|
|
66015
66017
|
},
|
|
66016
66018
|
handleRenderEnd: function handleRenderEnd() {
|
|
66017
|
-
var
|
|
66019
|
+
var _this5 = this;
|
|
66018
66020
|
|
|
66019
66021
|
setTimeout(function () {
|
|
66020
|
-
dom.getComponentRect(
|
|
66021
|
-
|
|
66022
|
+
dom.getComponentRect(_this5.$refs.materialBox, function (data) {
|
|
66023
|
+
_this5.$emit('renderEnd', data.size.height);
|
|
66022
66024
|
});
|
|
66023
66025
|
}, 200);
|
|
66024
66026
|
}
|