dolphin-weex-bc 0.0.42 → 0.0.44
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 +10 -0
- package/dist/index.native.js +24 -10
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +27 -13
- package/dist/index.web.js.map +1 -1
- package/package.json +1 -1
- package/packages/dof-bc-consumables/index.vue +18 -10
- package/packages/dof-material-add-card/index.vue +1 -1
- package/packages/material-event/index.js +6 -0
package/CHANGELOG.md
CHANGED
package/dist/index.native.js
CHANGED
|
@@ -4075,6 +4075,11 @@ var MaterialEvent = {
|
|
|
4075
4075
|
var textColorList = isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2'];
|
|
4076
4076
|
var frontColorList = isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5'];
|
|
4077
4077
|
var backColorList = isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7'];
|
|
4078
|
+
var waveCoverType = 0;
|
|
4079
|
+
var showWaveCoverTypeArr = [3, 3, 2];
|
|
4080
|
+
if (isDiablo) {
|
|
4081
|
+
waveCoverType = showWaveCoverTypeArr[type];
|
|
4082
|
+
}
|
|
4078
4083
|
return {
|
|
4079
4084
|
frontWaveColor: frontColorList[type], //已完成后的颜色默认#FFFFFF
|
|
4080
4085
|
backWaveColor: backColorList[type],
|
|
@@ -4082,6 +4087,7 @@ var MaterialEvent = {
|
|
|
4082
4087
|
backgroundColor: isDiablo ? '#1E2326' : needBackground ? '#F6F7F9' : '#FFFFFF', //背景色 默认为#000000
|
|
4083
4088
|
progress: percent, // 进度 [0 ... 1]
|
|
4084
4089
|
showWaveCover: true,
|
|
4090
|
+
waveCoverType: waveCoverType,
|
|
4085
4091
|
textFont: this.isScale ? 11 : 12, //字体大小,默认为14
|
|
4086
4092
|
text: percentTxt, //文本 默认为空
|
|
4087
4093
|
textColor: textColorList[type], //文本颜色,默认#FFFFFF
|
|
@@ -65761,16 +65767,16 @@ exports.default = {
|
|
|
65761
65767
|
var type = item.remainingStatus;
|
|
65762
65768
|
var percentTxt = item.percent;
|
|
65763
65769
|
var textColorList = ['#F56428', '#FFAA10', '#ffffff'];
|
|
65764
|
-
var frontColorList = ['#
|
|
65765
|
-
var backColorList = ['#
|
|
65770
|
+
var frontColorList = ['#f78353', '#ffbb40', '#33b6f5'];
|
|
65771
|
+
var backColorList = ['#fbc1a9', '#ffdd9f', '#99dbfa'];
|
|
65766
65772
|
|
|
65767
65773
|
// 判断显示类型
|
|
65768
65774
|
if (item.remainingValueType == 4) {
|
|
65769
65775
|
percent = item.remainingStatus == 2 ? 0.6 : 0.1;
|
|
65770
65776
|
percentTxt = type == 2 ? '充足' : '不足';
|
|
65771
65777
|
textColorList = ['#FF6A4C', '#FF6A4C', '#ffffff'];
|
|
65772
|
-
frontColorList = ['#
|
|
65773
|
-
backColorList = ['#
|
|
65778
|
+
frontColorList = ['#f78353', '#f78353', '#33b6f5'];
|
|
65779
|
+
backColorList = ['#fbc1a9', '#fbc1a9', '#99dbfa'];
|
|
65774
65780
|
}
|
|
65775
65781
|
|
|
65776
65782
|
// if( percent > 0.2 && percent <= 0.5 ){
|
|
@@ -65784,6 +65790,7 @@ exports.default = {
|
|
|
65784
65790
|
backgroundColor: '#00000000', //背景色 默认为#000000
|
|
65785
65791
|
progress: percent < 0.01 && percent != 0 ? 0.01 : percent, //s 进度 [0 ... 1]
|
|
65786
65792
|
showWaveCover: true,
|
|
65793
|
+
waveCoverType: 0,
|
|
65787
65794
|
textFont: 12, //字体大小,默认为14
|
|
65788
65795
|
text: percentTxt, //文本 默认为空
|
|
65789
65796
|
textColor: textColorList[type], //文本颜色,默认#FFFFFF
|
|
@@ -65795,15 +65802,26 @@ exports.default = {
|
|
|
65795
65802
|
};
|
|
65796
65803
|
} else {
|
|
65797
65804
|
return {
|
|
65798
|
-
backgroundColor: '#e9f1ff', //背景色 默认为#000000
|
|
65799
65805
|
frontWaveColor: '#e9f1ff', //已完成后的颜色默认#FFFFFF
|
|
65800
65806
|
backWaveColor: '#e9f1ff',
|
|
65807
|
+
backgroundColor: '#00000000', //背景色 默认为#000000
|
|
65801
65808
|
progress: 0,
|
|
65802
65809
|
animate: false,
|
|
65803
65810
|
text: '' //文本 默认为空
|
|
65804
65811
|
};
|
|
65805
65812
|
}
|
|
65806
65813
|
},
|
|
65814
|
+
showBgco: function showBgco(it) {
|
|
65815
|
+
var bgcoArr = [this.bgcoOne, this.bgcoTwo, this.bgcoThree];
|
|
65816
|
+
if (this.dealDeviceMaterialList[0].deviceInfo.isOnline == 1) {
|
|
65817
|
+
if (it.remainingValueType == 4) {
|
|
65818
|
+
bgcoArr = [this.bgcoOne, this.bgcoOne, this.bgcoThree];
|
|
65819
|
+
}
|
|
65820
|
+
return bgcoArr[it.remainingStatus];
|
|
65821
|
+
} else {
|
|
65822
|
+
return bgcoArr[2];
|
|
65823
|
+
}
|
|
65824
|
+
},
|
|
65807
65825
|
showGoodsList: function showGoodsList() {
|
|
65808
65826
|
this.showAddCartPopup = true;
|
|
65809
65827
|
var trackParam = {
|
|
@@ -66094,10 +66112,6 @@ exports.default = {
|
|
|
66094
66112
|
};
|
|
66095
66113
|
this.$bridge.trackEvent(trackParam);
|
|
66096
66114
|
},
|
|
66097
|
-
showBgco: function showBgco(item) {
|
|
66098
|
-
var bgcoArr = [this.bgcoOne, this.bgcoTwo, this.bgcoThree];
|
|
66099
|
-
return bgcoArr[item.remainingStatus];
|
|
66100
|
-
},
|
|
66101
66115
|
scrollEvent1: function scrollEvent1(e) {
|
|
66102
66116
|
// console.log('scrollEvent===' + JSON.stringify(e))
|
|
66103
66117
|
console.log('偏移量' + (this.recommendSliderWidth - (686 + -e.contentOffset.x)));
|
|
@@ -80511,7 +80525,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
|
|
|
80511
80525
|
return _c('dof-popup', {
|
|
80512
80526
|
attrs: {
|
|
80513
80527
|
"show": _vm.showAddCartInsidePopup,
|
|
80514
|
-
"height":
|
|
80528
|
+
"height": 880,
|
|
80515
80529
|
"pos": "bottom",
|
|
80516
80530
|
"popupColor": _vm.isDiablo ? '#1e2326' : ''
|
|
80517
80531
|
},
|