jufubao-base 1.0.181 → 1.0.183
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
|
@@ -566,7 +566,7 @@
|
|
|
566
566
|
></xd-font-icon>
|
|
567
567
|
</view>
|
|
568
568
|
<view class="jfb-base-order-detail__body-show" v-else>
|
|
569
|
-
|
|
569
|
+
<text>使用{{ info.pay_info.cards.length }}张票券 收起</text>
|
|
570
570
|
<xd-font-icon
|
|
571
571
|
style="margin-left: 8rpx"
|
|
572
572
|
@click="showPayCard = false"
|
|
@@ -582,7 +582,7 @@
|
|
|
582
582
|
:key="index"
|
|
583
583
|
>
|
|
584
584
|
<view>票券：{{ item.card_type_name }}</view>
|
|
585
|
-
<view>
|
|
585
|
+
<view class="list-item">
|
|
586
586
|
<view>编号：{{ item.card_number }}</view>
|
|
587
587
|
<xd-unit
|
|
588
588
|
:fontSize="28"
|
|
@@ -590,6 +590,7 @@
|
|
|
590
590
|
:price="item.card_use_point"
|
|
591
591
|
:unit="item['card_unit']"
|
|
592
592
|
></xd-unit>
|
|
593
|
+
<view v-if="item['card_discount_use_point'] > 0" class="discount">已优惠:{{item['card_discount_use_point']}}</view>
|
|
593
594
|
</view>
|
|
594
595
|
</view>
|
|
595
596
|
</view>
|
|
@@ -616,6 +617,35 @@
|
|
|
616
617
|
</view>
|
|
617
618
|
</view>
|
|
618
619
|
</view>
|
|
620
|
+
<!--旅游模块-->
|
|
621
|
+
<view
|
|
622
|
+
v-if="info.extras &&
|
|
623
|
+
info.extras.travel_booking_info &&
|
|
624
|
+
info.extras.travel_booking_info['travelers'] &&
|
|
625
|
+
info.extras.travel_booking_info['travelers'].length > 0"
|
|
626
|
+
:style="{
|
|
627
|
+
background: backgroundColor,
|
|
628
|
+
border: borderBox,
|
|
629
|
+
borderRadius: radius + 'rpx',
|
|
630
|
+
boxShadow: shadowBox,
|
|
631
|
+
marginBottom: padding + 'rpx',
|
|
632
|
+
}"
|
|
633
|
+
class="jfb-base-order-detail__body-card jfb-base-order-detail__body-booking"
|
|
634
|
+
>
|
|
635
|
+
<view class="jfb-base-order-detail__body-delivery-bottom-title">预订信息</view>
|
|
636
|
+
<view class="jfb-base-order-detail__body-line"></view>
|
|
637
|
+
<view class="jfb-base-order-detail__body-booking-list">
|
|
638
|
+
<view v-for="(item,index) in info.extras.travel_booking_info.travelers" :key="index" class="jfb-base-order-detail__body-booking-list-item">
|
|
639
|
+
<view :style="{color:mainColor,background:bgColor}" class="jfb-base-order-detail__body-booking-list-item-num">游客{{index+1}}</view>
|
|
640
|
+
<view class="jfb-base-order-detail__body-booking-list-item-info">
|
|
641
|
+
<view class="jfb-base-order-detail__body-booking-list-item-info-name">{{item.name}}</view>
|
|
642
|
+
<view v-if="item.id_card_no" class="jfb-base-order-detail__body-booking-list-item-info-item">身份证：{{item.id_card_no}}</view>
|
|
643
|
+
<view v-if="item.mobile" class="jfb-base-order-detail__body-booking-list-item-info-item">手机号：{{item.mobile}}</view>
|
|
644
|
+
</view>
|
|
645
|
+
</view>
|
|
646
|
+
</view>
|
|
647
|
+
</view>
|
|
648
|
+
<!--旅游模块-->
|
|
619
649
|
<view
|
|
620
650
|
v-if="info.productDetail"
|
|
621
651
|
class="jfb-base-order-detail__body-card jfb-base-order-detail__body-shop"
|
|
@@ -896,6 +926,17 @@ export default {
|
|
|
896
926
|
.then((res) => {
|
|
897
927
|
this.biz_code = res.biz_code;
|
|
898
928
|
this.is_not_show_price = res.is_not_show_price;
|
|
929
|
+
|
|
930
|
+
//旅游模块
|
|
931
|
+
if(res.extras && res.extras.travel_booking_info) {
|
|
932
|
+
try{
|
|
933
|
+
res.extras.travel_booking_info = JSON.parse(res.extras.travel_booking_info)
|
|
934
|
+
}catch(e){
|
|
935
|
+
res.extras.travel_booking_info = {}
|
|
936
|
+
}
|
|
937
|
+
}
|
|
938
|
+
|
|
939
|
+
//预览模块
|
|
899
940
|
if (this.isPreview) {
|
|
900
941
|
switch (this.viewStatus) {
|
|
901
942
|
case "mall":
|
|
@@ -960,6 +1001,12 @@ export default {
|
|
|
960
1001
|
item.card_use_point,
|
|
961
1002
|
100
|
|
962
1003
|
);
|
|
1004
|
+
if(item['card_discount_use_point'] !== undefined && item['card_discount_use_point'] > 0) {
|
|
1005
|
+
item.card_discount_use_point = this.$xdUniHelper.divisionFloatNumber(
|
|
1006
|
+
item.card_discount_use_point,
|
|
1007
|
+
100
|
|
1008
|
+
);
|
|
1009
|
+
}
|
|
963
1010
|
return item;
|
|
964
1011
|
});
|
|
965
1012
|
res.codes =
|
|
@@ -1659,6 +1706,37 @@ export default {
|
|
|
1659
1706
|
}
|
|
1660
1707
|
}
|
|
1661
1708
|
|
|
1709
|
+
&-booking {
|
|
1710
|
+
&-list {
|
|
1711
|
+
&-item {
|
|
1712
|
+
display: flex;
|
|
1713
|
+
align-items: baseline;
|
|
1714
|
+
margin-bottom: 40rpx;
|
|
1715
|
+
&-num {
|
|
1716
|
+
font-size: 24rpx;
|
|
1717
|
+
margin-right: 24rpx;
|
|
1718
|
+
width: 120rpx;
|
|
1719
|
+
height: 50rpx;
|
|
1720
|
+
text-align: center;
|
|
1721
|
+
line-height: 50rpx;
|
|
1722
|
+
border-radius: 16rpx;
|
|
1723
|
+
}
|
|
1724
|
+
&-info {
|
|
1725
|
+
flex: 1;
|
|
1726
|
+
&-name {
|
|
1727
|
+
font-size: 32rpx;
|
|
1728
|
+
margin-bottom: 20rpx;
|
|
1729
|
+
}
|
|
1730
|
+
&-item {
|
|
1731
|
+
font-size: 24rpx;
|
|
1732
|
+
color: #666;
|
|
1733
|
+
margin-bottom: 16rpx;
|
|
1734
|
+
}
|
|
1735
|
+
}
|
|
1736
|
+
}
|
|
1737
|
+
}
|
|
1738
|
+
}
|
|
1739
|
+
|
|
1662
1740
|
&-line {
|
|
1663
1741
|
border-bottom: unit(2, rpx) solid #f2f2f2;
|
|
1664
1742
|
margin-bottom: unit(40, rpx);
|
|
@@ -1704,5 +1782,22 @@ export default {
|
|
|
1704
1782
|
border-radius: unit(12, rpx);
|
|
1705
1783
|
padding: unit(14, rpx) unit(28, rpx);
|
|
1706
1784
|
}
|
|
1785
|
+
|
|
1786
|
+
.list-item {
|
|
1787
|
+
position: relative;
|
|
1788
|
+
|
|
1789
|
+
& > .discount {
|
|
1790
|
+
position: absolute;
|
|
1791
|
+
left:0;
|
|
1792
|
+
right:0;
|
|
1793
|
+
bottom:-20rpx;
|
|
1794
|
+
height: 20rpx;
|
|
1795
|
+
font-size: 20rpx;
|
|
1796
|
+
line-height: 20rpx;
|
|
1797
|
+
color: #aaa;
|
|
1798
|
+
text-align: right;
|
|
1799
|
+
}
|
|
1800
|
+
|
|
1801
|
+
}
|
|
1707
1802
|
}
|
|
1708
1803
|
</style>
|
|
@@ -17,6 +17,11 @@ module.exports = {
|
|
|
17
17
|
"loading": false,
|
|
18
18
|
"loading_timeout": -1
|
|
19
19
|
},
|
|
20
|
+
"extras": {
|
|
21
|
+
"first_logistics_package_id": "",
|
|
22
|
+
"logistics_count": 0,
|
|
23
|
+
"travel_booking_info": "{\"travelers\":[{\"name\":\"\\u6d4b\\u8bd5\",\"mobile\":\"18888888889\",\"id_card_no\":\"130102198304285898\",\"id_card_type\":\"1\"}]}"
|
|
24
|
+
},
|
|
20
25
|
"film_show": {
|
|
21
26
|
"name": "聚福宝-万里归途",
|
|
22
27
|
"thumb": "https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E",
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
<view class="remain_pay" v-if="payInfo.channel_amount > 0">
|
|
101
101
|
<view style="border-bottom: 2rpx solid #eee;" class="column-group">
|
|
102
102
|
<view class="column-item" style="padding: 30rpx 60rpx">
|
|
103
|
-
<view class="column_label"
|
|
103
|
+
<view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</text></view>
|
|
104
104
|
<view class="column_value text-primary">
|
|
105
105
|
<xd-unit
|
|
106
106
|
:price="payInfo.channel_amount"
|
|
@@ -112,9 +112,9 @@
|
|
|
112
112
|
</view>
|
|
113
113
|
</view>
|
|
114
114
|
<view class="remain_header">
|
|
115
|
-
<view
|
|
115
|
+
<view>选择以下补差方式</view>
|
|
116
116
|
<view class="flex align-center text-primary">
|
|
117
|
-
<view class="margin-right"
|
|
117
|
+
<view class="margin-right">继续补差</view>
|
|
118
118
|
<xd-unit
|
|
119
119
|
:price="payInfo.channel_amount"
|
|
120
120
|
:is-show-icon="false"
|
|
@@ -150,7 +150,7 @@
|
|
|
150
150
|
type="primary"
|
|
151
151
|
radius="50rpx"
|
|
152
152
|
@click="doThirdPay"
|
|
153
|
-
|
|
153
|
+
>确认</xd-button>
|
|
154
154
|
</view>
|
|
155
155
|
</view>
|
|
156
156
|
</view>
|