jufubao-third 1.0.10-beta5 → 1.0.10-beta7
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,13 +76,13 @@
|
|
|
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
|
|
|
70
|
-
<view class="pay_section">
|
|
85
|
+
<view v-if="!isPlusSite" class="pay_section">
|
|
71
86
|
<view class="column-item">
|
|
72
87
|
<view class="column_label">
|
|
73
88
|
仍需支付
|
|
@@ -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"
|
|
@@ -121,6 +137,7 @@
|
|
|
121
137
|
<view
|
|
122
138
|
class="ticket_list"
|
|
123
139
|
:key="renderChecked"
|
|
140
|
+
v-if="!isPlusSite"
|
|
124
141
|
>
|
|
125
142
|
<view
|
|
126
143
|
class="ticket_item"
|
|
@@ -172,7 +189,21 @@
|
|
|
172
189
|
</view>
|
|
173
190
|
</view>
|
|
174
191
|
</view>
|
|
192
|
+
<view v-if="isPlusSite" class="bottom_btn plus_btm" :style="{bottom: layoutInfo.bottom+'rpx'}">
|
|
193
|
+
<view class="flex_l">实付：
|
|
194
|
+
<xd-unit
|
|
195
|
+
:isShowIcon="isShowIcon"
|
|
196
|
+
:price="showOldPay ? needPayPrice :orderNeedPayPrice"
|
|
197
|
+
:isOld="false"
|
|
198
|
+
:font-size="40"
|
|
199
|
+
:icon-size="0.3"
|
|
200
|
+
></xd-unit></view>
|
|
201
|
+
<view>
|
|
202
|
+
<xd-button type="primary" @click="doAllPay">支付</xd-button>
|
|
203
|
+
</view>
|
|
204
|
+
</view>
|
|
175
205
|
<view
|
|
206
|
+
v-else
|
|
176
207
|
class="bottom_btn"
|
|
177
208
|
:style="{bottom: layoutInfo.bottom+'rpx'}"
|
|
178
209
|
>
|
|
@@ -348,6 +379,7 @@
|
|
|
348
379
|
|
|
349
380
|
product_total_price: "",
|
|
350
381
|
total_price: "",
|
|
382
|
+
origin_total_price: "",
|
|
351
383
|
servicePrice: "",
|
|
352
384
|
logisticsPrice: "",
|
|
353
385
|
|
|
@@ -381,8 +413,16 @@
|
|
|
381
413
|
},
|
|
382
414
|
computed: {
|
|
383
415
|
...mapState({
|
|
384
|
-
brandInfo: state => state.brandInfo
|
|
416
|
+
brandInfo: state => state.brandInfo,
|
|
417
|
+
siteInfo: state => state.siteInfo,
|
|
385
418
|
}),
|
|
419
|
+
isShowIcon() {
|
|
420
|
+
if(this.$configProject['isPreview']) return true;
|
|
421
|
+
return this.siteInfo.mapping.is_show_coin_icon==='Y'
|
|
422
|
+
},
|
|
423
|
+
isPlusSite(){
|
|
424
|
+
return this.projectAttr.headers['X-Site-Group']==="vip";
|
|
425
|
+
},
|
|
386
426
|
//是否展示vip减免
|
|
387
427
|
isShowPlusSaveMoney(){
|
|
388
428
|
if(this.show_vip_card === 'Y') return this.vip_card_id;
|
|
@@ -497,8 +537,8 @@
|
|
|
497
537
|
return;
|
|
498
538
|
}
|
|
499
539
|
this.p_getPayMethod(res.pay_methods);
|
|
500
|
-
|
|
501
|
-
this.total_price = this.$xdUniHelper.multiplyFloatNumber(res.
|
|
540
|
+
this.origin_total_price = res.total_price;
|
|
541
|
+
this.total_price = this.$xdUniHelper.multiplyFloatNumber(res.real_pay_price, 1);
|
|
502
542
|
this.needPayPrice = this.total_price;
|
|
503
543
|
this.servicePrice = this.$xdUniHelper.multiplyFloatNumber(res.service_fee, 1);
|
|
504
544
|
this.logisticsPrice = this.$xdUniHelper.multiplyFloatNumber(res.logistics_amount, 1);
|
|
@@ -560,7 +600,9 @@
|
|
|
560
600
|
if(!submitCardList.length){
|
|
561
601
|
//支持补差, 提示是否使用补差
|
|
562
602
|
if(this.payThird){
|
|
563
|
-
|
|
603
|
+
if(!this.isPlusSite){
|
|
604
|
+
await this.handleConfirmAllWxPay();
|
|
605
|
+
}
|
|
564
606
|
}else{
|
|
565
607
|
//不支持补差，仅提示
|
|
566
608
|
return this.$xdAlert({content: "请选择兑换方式"})
|
|
@@ -990,6 +1032,19 @@
|
|
|
990
1032
|
padding: 24rpx 0;
|
|
991
1033
|
background: #FFFFFF;
|
|
992
1034
|
box-shadow: 0 0 0px 1px rgba(0, 0, 0, 0.1);
|
|
1035
|
+
box-sizing: border-box;
|
|
1036
|
+
&.plus_btm{
|
|
1037
|
+
display: flex;
|
|
1038
|
+
align-items: center;
|
|
1039
|
+
justify-content: space-between;
|
|
1040
|
+
padding-left:40rpx;
|
|
1041
|
+
padding-right: 40rpx;
|
|
1042
|
+
.flex_l{
|
|
1043
|
+
color: #FF5A39;
|
|
1044
|
+
display: flex;
|
|
1045
|
+
align-items: center;
|
|
1046
|
+
}
|
|
1047
|
+
}
|
|
993
1048
|
}
|
|
994
1049
|
}
|
|
995
1050
|
}
|