jufubao-third 1.0.10-beta4 → 1.0.10-beta6
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/package.json
CHANGED
|
@@ -22,29 +22,44 @@
|
|
|
22
22
|
<view class="column-item noBorder">
|
|
23
23
|
<view v-if="product_total_price" class="column_label text_gray">商品总额</view>
|
|
24
24
|
<view class="column_value text-gray">
|
|
25
|
-
<xd-unit
|
|
25
|
+
<xd-unit
|
|
26
|
+
:isShowIcon="isShowIcon"
|
|
27
|
+
:colorNew="isShowIcon ? '': '#999'"
|
|
28
|
+
:price="product_total_price"
|
|
29
|
+
:isOld="false"
|
|
30
|
+
:font-size="24"
|
|
31
|
+
:icon-size="0.3"
|
|
32
|
+
></xd-unit>
|
|
26
33
|
</view>
|
|
27
34
|
</view>
|
|
28
35
|
<view v-if="servicePrice" class="column-item noBorder">
|
|
29
36
|
<view class="column_label text_gray">平台服务费总额</view>
|
|
30
37
|
<view class="column_value text-gray">
|
|
31
|
-
<xd-unit
|
|
38
|
+
<xd-unit
|
|
39
|
+
:isShowIcon="isShowIcon"
|
|
40
|
+
:colorNew="isShowIcon ? '': '#999'"
|
|
41
|
+
:price="servicePrice" :isOld="false" :font-size="24" :icon-size="0.3"></xd-unit>
|
|
32
42
|
</view>
|
|
33
43
|
</view>
|
|
34
44
|
<view v-if="logisticsPrice" class="column-item noBorder">
|
|
35
45
|
<view class="column_label text_gray">运费</view>
|
|
36
46
|
<view class="column_value text-gray">
|
|
37
|
-
<xd-unit
|
|
47
|
+
<xd-unit
|
|
48
|
+
:isShowIcon="isShowIcon"
|
|
49
|
+
:colorNew="isShowIcon ? '': '#999'"
|
|
50
|
+
:price="logisticsPrice" :isOld="false" :font-size="24" :icon-size="0.3"></xd-unit>
|
|
38
51
|
</view>
|
|
39
52
|
</view>
|
|
40
53
|
</view>
|
|
41
54
|
<view class="column-item">
|
|
42
|
-
<view class="column_label">
|
|
55
|
+
<view class="column_label text_gray">
|
|
43
56
|
订单总额
|
|
44
57
|
</view>
|
|
45
58
|
<view class="column_value text-gray">
|
|
46
59
|
<xd-unit
|
|
47
|
-
:
|
|
60
|
+
:isShowIcon="isShowIcon"
|
|
61
|
+
:colorNew="isShowIcon ? '': '#999'"
|
|
62
|
+
:price="origin_total_price"
|
|
48
63
|
:isOld="false"
|
|
49
64
|
:font-size="24"
|
|
50
65
|
:icon-size="0.3"
|
|
@@ -61,9 +76,9 @@
|
|
|
61
76
|
</view>
|
|
62
77
|
<view v-if="isShowPlusSaveMoney" class="pay_section">
|
|
63
78
|
<xd-list-item label="PLUS专项立减" size="small" paddingLR="40rpx" >
|
|
64
|
-
<view slot="label" style="color: #86541E;">PLUS
|
|
79
|
+
<view slot="label" style="color: #86541E;">PLUS专享立减</view>
|
|
65
80
|
<!-- <view style="color: #FF7070;">-5.00</view> -->
|
|
66
|
-
<xd-unit :price="plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
|
|
81
|
+
<xd-unit :isShowIcon="isShowIcon" :price="plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
|
|
67
82
|
</xd-list-item>
|
|
68
83
|
</view>
|
|
69
84
|
|
|
@@ -75,6 +90,7 @@
|
|
|
75
90
|
</view>
|
|
76
91
|
<view class="column_value text-primary">
|
|
77
92
|
<xd-unit
|
|
93
|
+
:isShowIcon="isShowIcon"
|
|
78
94
|
:price="showOldPay ? needPayPrice :orderNeedPayPrice"
|
|
79
95
|
:isOld="false"
|
|
80
96
|
:font-size="24"
|
|
@@ -348,6 +364,7 @@
|
|
|
348
364
|
|
|
349
365
|
product_total_price: "",
|
|
350
366
|
total_price: "",
|
|
367
|
+
origin_total_price: "",
|
|
351
368
|
servicePrice: "",
|
|
352
369
|
logisticsPrice: "",
|
|
353
370
|
|
|
@@ -381,8 +398,13 @@
|
|
|
381
398
|
},
|
|
382
399
|
computed: {
|
|
383
400
|
...mapState({
|
|
384
|
-
brandInfo: state => state.brandInfo
|
|
401
|
+
brandInfo: state => state.brandInfo,
|
|
402
|
+
siteInfo: state => state.siteInfo,
|
|
385
403
|
}),
|
|
404
|
+
isShowIcon() {
|
|
405
|
+
if(this.$configProject['isPreview']) return true;
|
|
406
|
+
return this.siteInfo.mapping.is_show_coin_icon==='Y'
|
|
407
|
+
},
|
|
386
408
|
//是否展示vip减免
|
|
387
409
|
isShowPlusSaveMoney(){
|
|
388
410
|
if(this.show_vip_card === 'Y') return this.vip_card_id;
|
|
@@ -497,8 +519,8 @@
|
|
|
497
519
|
return;
|
|
498
520
|
}
|
|
499
521
|
this.p_getPayMethod(res.pay_methods);
|
|
500
|
-
|
|
501
|
-
this.total_price = this.$xdUniHelper.multiplyFloatNumber(res.
|
|
522
|
+
this.origin_total_price = res.total_price;
|
|
523
|
+
this.total_price = this.$xdUniHelper.multiplyFloatNumber(res.real_pay_price, 1);
|
|
502
524
|
this.needPayPrice = this.total_price;
|
|
503
525
|
this.servicePrice = this.$xdUniHelper.multiplyFloatNumber(res.service_fee, 1);
|
|
504
526
|
this.logisticsPrice = this.$xdUniHelper.multiplyFloatNumber(res.logistics_amount, 1);
|