dolphin-weex-bc 0.0.23 → 0.0.25
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 +9 -0
- package/dist/index.native.js +30 -4
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +43 -9
- package/dist/index.web.js.map +1 -1
- package/package.json +1 -1
- package/packages/dof-consumables-colmo/assets/css/index.css +1 -0
- package/packages/dof-consumables-colmo/index.vue +6 -0
- package/packages/material-event/index.js +3 -3
package/CHANGELOG.md
CHANGED
package/dist/index.native.js
CHANGED
|
@@ -3396,9 +3396,9 @@ var MaterialEvent = {
|
|
|
3396
3396
|
}
|
|
3397
3397
|
//这里需要对有skuid的耗材进行处理
|
|
3398
3398
|
var purchaseInfoPurchaseEnable = it.purchaseInfo && it.purchaseInfo.purchaseEnable;
|
|
3399
|
-
if (purchaseInfoPurchaseEnable && it.purchaseInfo.
|
|
3399
|
+
if (purchaseInfoPurchaseEnable && it.purchaseInfo.skuId) {}
|
|
3400
3400
|
|
|
3401
|
-
if (purchaseInfoPurchaseEnable && it.purchaseInfo.
|
|
3401
|
+
if (purchaseInfoPurchaseEnable && it.purchaseInfo.searchLinkUrl) {
|
|
3402
3402
|
//去掉有搜索列表的(优先级最高)
|
|
3403
3403
|
} else if (it.productCode && it.productCode != 0) {
|
|
3404
3404
|
tmpcodeList.push(it.productCode);
|
|
@@ -3941,7 +3941,7 @@ var MaterialEvent = {
|
|
|
3941
3941
|
animate: true,
|
|
3942
3942
|
backgroundColor: '#43464D', //背景色 默认为#000000
|
|
3943
3943
|
progress: percent, // 进度 [0 ... 1]
|
|
3944
|
-
|
|
3944
|
+
textFont: this.isScale ? 11 : 12,
|
|
3945
3945
|
text: percentTxt, //文本 默认为空
|
|
3946
3946
|
textColor: '#ccffffff', //文本颜色,默认#FFFFFF
|
|
3947
3947
|
duration: 1000
|
|
@@ -64953,6 +64953,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
64953
64953
|
//
|
|
64954
64954
|
//
|
|
64955
64955
|
//
|
|
64956
|
+
//
|
|
64957
|
+
//
|
|
64958
|
+
//
|
|
64959
|
+
//
|
|
64960
|
+
//
|
|
64961
|
+
//
|
|
64956
64962
|
|
|
64957
64963
|
var routerModule = weex.requireModule('routerModule');
|
|
64958
64964
|
var dom = weex.requireModule('dom');
|
|
@@ -71777,7 +71783,8 @@ module.exports = {
|
|
|
71777
71783
|
},
|
|
71778
71784
|
"title-icon-noData1": {
|
|
71779
71785
|
"width": "88",
|
|
71780
|
-
"height": "88"
|
|
71786
|
+
"height": "88",
|
|
71787
|
+
"borderRadius": 50
|
|
71781
71788
|
},
|
|
71782
71789
|
"item-right": {
|
|
71783
71790
|
"flex": 1,
|
|
@@ -78277,6 +78284,9 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
|
|
|
78277
78284
|
on: {
|
|
78278
78285
|
"click": function($event) {
|
|
78279
78286
|
_vm.goDetailThrottle(it, item)
|
|
78287
|
+
},
|
|
78288
|
+
"progresscycleTap": function($event) {
|
|
78289
|
+
_vm.goDetailThrottle(it, item)
|
|
78280
78290
|
}
|
|
78281
78291
|
}
|
|
78282
78292
|
})], 1)] : [_c('div', {
|
|
@@ -78285,6 +78295,14 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
|
|
|
78285
78295
|
class: ['progresscycle', _vm.isScale && 'progresscycle-scale'],
|
|
78286
78296
|
attrs: {
|
|
78287
78297
|
"data": _vm.chartData
|
|
78298
|
+
},
|
|
78299
|
+
on: {
|
|
78300
|
+
"click": function($event) {
|
|
78301
|
+
_vm.goDetailThrottle(it, item)
|
|
78302
|
+
},
|
|
78303
|
+
"progresscycleTap": function($event) {
|
|
78304
|
+
_vm.goDetailThrottle(it, item)
|
|
78305
|
+
}
|
|
78288
78306
|
}
|
|
78289
78307
|
})], 1)]] : (it.remainingValueType == 5 && it.icons && it.icons.icon1) ? [_c('div', {
|
|
78290
78308
|
class: ['circle-noData', _vm.isScale && 'circle-noData-scale']
|
|
@@ -78299,6 +78317,14 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
|
|
|
78299
78317
|
class: ['progresscycle', _vm.isScale && 'progresscycle-scale'],
|
|
78300
78318
|
attrs: {
|
|
78301
78319
|
"data": _vm.chartData
|
|
78320
|
+
},
|
|
78321
|
+
on: {
|
|
78322
|
+
"click": function($event) {
|
|
78323
|
+
_vm.goDetailThrottle(it, item)
|
|
78324
|
+
},
|
|
78325
|
+
"progresscycleTap": function($event) {
|
|
78326
|
+
_vm.goDetailThrottle(it, item)
|
|
78327
|
+
}
|
|
78302
78328
|
}
|
|
78303
78329
|
})], 1)]], 2), _c('div', {
|
|
78304
78330
|
staticClass: ["item-right"]
|