dolphin-weex-bc 0.0.48 → 0.0.49
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 +5 -0
- package/dist/index.native.js +3020 -2781
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +44796 -45273
- package/dist/index.web.js.map +1 -1
- package/package.json +1 -1
- package/packages/dof-bc-consumables/index.vue +2 -2
- package/packages/dof-material-add-card/index.vue +22 -9
package/package.json
CHANGED
|
@@ -776,10 +776,10 @@ export default {
|
|
|
776
776
|
newInsufficientProductCodeJson[item.skuId] = insufficientProductCodeJson[item.itemCode]
|
|
777
777
|
}
|
|
778
778
|
})
|
|
779
|
-
// newInsufficientProductCodeJson
|
|
779
|
+
// newInsufficientProductCodeJson中不存在且为true则为true
|
|
780
780
|
Object.keys(insufficientSkuIdListJson).forEach(item => {
|
|
781
781
|
if(!newInsufficientProductCodeJson[item]){
|
|
782
|
-
newInsufficientProductCodeJson[item] =
|
|
782
|
+
newInsufficientProductCodeJson[item] = insufficientSkuIdListJson[item]
|
|
783
783
|
}
|
|
784
784
|
})
|
|
785
785
|
console.log('耗材不足的商品的数量集合：'+ JSON.stringify(newInsufficientProductCodeJson))
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
<div class="label-box" v-if="item.labelList && item.labelList.length > 0">
|
|
43
43
|
<text v-for="item3 in item.labelList" class="label-name">{{ item3.labelName }}</text>
|
|
44
44
|
</div>
|
|
45
|
+
<div :class="['empty-ine',isDiablo && 'empty-ine-isDiablo']"></div>
|
|
45
46
|
<div class="price-box" v-if="item.showPrice">
|
|
46
47
|
<text :class="['rmb-1', isDiablo && 'rmb-1-isDiablo']">￥</text><text :class="['pblic-price', isDiablo && 'pblic-price-isDiablo']">{{ item.showPrice }}</text>
|
|
47
48
|
<template v-if="item.actPrice">
|
|
@@ -469,7 +470,7 @@ export default {
|
|
|
469
470
|
flex-direction: row;
|
|
470
471
|
background: #f6f7f9;
|
|
471
472
|
border-radius: 32px;
|
|
472
|
-
align-items:
|
|
473
|
+
align-items: flex-start;
|
|
473
474
|
}
|
|
474
475
|
.img-shop {
|
|
475
476
|
width: 144px;
|
|
@@ -514,24 +515,31 @@ export default {
|
|
|
514
515
|
margin-top: 22px;
|
|
515
516
|
}
|
|
516
517
|
|
|
518
|
+
.empty-ine{
|
|
519
|
+
width: 326px;
|
|
520
|
+
height: 1px;
|
|
521
|
+
background: #E5E5E8;
|
|
522
|
+
margin-top: 17px;
|
|
523
|
+
margin-bottom: 19px;
|
|
524
|
+
}
|
|
525
|
+
|
|
517
526
|
.label-name{
|
|
518
|
-
|
|
519
|
-
border-radius:
|
|
520
|
-
font-size:
|
|
521
|
-
color: #
|
|
527
|
+
border: 2.7px solid #00BDB2;
|
|
528
|
+
border-radius: 3.5px;
|
|
529
|
+
font-size: 20px;
|
|
530
|
+
color: #00BDB2;
|
|
522
531
|
text-align: center;
|
|
523
|
-
height:
|
|
524
|
-
line-height:
|
|
532
|
+
height: 44px;
|
|
533
|
+
line-height: 44px;
|
|
525
534
|
font-weight: 400;
|
|
526
535
|
margin-right: 10px;
|
|
527
536
|
margin-bottom: 10px;
|
|
528
|
-
padding: 0
|
|
537
|
+
padding: 0 5.5px;
|
|
529
538
|
}
|
|
530
539
|
|
|
531
540
|
.price-box{
|
|
532
541
|
flex-direction: row;
|
|
533
542
|
align-items: center;
|
|
534
|
-
margin-top: 20px;
|
|
535
543
|
}
|
|
536
544
|
.rmb-1{
|
|
537
545
|
font-size: 20px;
|
|
@@ -616,6 +624,11 @@ export default {
|
|
|
616
624
|
|
|
617
625
|
} */
|
|
618
626
|
|
|
627
|
+
.empty-ine-isDiablo{
|
|
628
|
+
opacity: 0.1;
|
|
629
|
+
background: #E5E5E8;
|
|
630
|
+
}
|
|
631
|
+
|
|
619
632
|
.rmb-1-isDiablo {
|
|
620
633
|
color: #cfcfd0;
|
|
621
634
|
}
|