jufubao-mall 2.0.27-beta7 → 2.0.27-beta8
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
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
</view>
|
|
76
76
|
<!-- 配送信息 -->
|
|
77
77
|
<view v-if="shop.support_delivery_method_options.length" class="delivery">
|
|
78
|
-
<xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom size="large">
|
|
78
|
+
<xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom size="large" class="xd-my-list-item">
|
|
79
79
|
<picker @change="e => bindPickerChange(e, shopIndex)"
|
|
80
80
|
range-key="label" :range="shop.support_delivery_method_options"
|
|
81
81
|
:value="shop.support_delivery_method_options.findIndex(ll => ll.value == shop.deliveryPickValue)"
|
|
@@ -84,22 +84,22 @@
|
|
|
84
84
|
</picker>
|
|
85
85
|
</xd-list-item>
|
|
86
86
|
<template>
|
|
87
|
-
<xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom paddingLR="48rpx" paddingTB="24rpx">
|
|
87
|
+
<xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom paddingLR="48rpx" paddingTB="24rpx" class="xd-my-list-item">
|
|
88
88
|
<xd-unit :price="shop.user_logistics_amount_origin" :fontSize="28" :isOld="false"></xd-unit>
|
|
89
89
|
</xd-list-item>
|
|
90
|
-
<xd-list-item v-if="shop.deliveryPickValue === 'samecity'"
|
|
90
|
+
<xd-list-item v-if="shop.deliveryPickValue === 'samecity'" class="xd-my-list-item"
|
|
91
91
|
:label="shop.time_label" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom
|
|
92
92
|
@click="toSetSelectTime(shopIndex,shop)">
|
|
93
93
|
{{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
|
|
94
94
|
</xd-list-item>
|
|
95
95
|
<template v-if="shop.deliveryPickValue === 'takeout'" >
|
|
96
96
|
<!-- 配送方式:到店自提 -->
|
|
97
|
-
<xd-list-item label="选择门店" show-right paddingLR="48rpx" paddingTB="24rpx" showBottom @click="toSetSelectShop(shopIndex)">
|
|
97
|
+
<xd-list-item label="选择门店" show-right paddingLR="48rpx" paddingTB="24rpx" showBottom @click="toSetSelectShop(shopIndex)" class="xd-my-list-item">
|
|
98
98
|
<view style="text-overflow: ellipsis;overflow: hidden;white-space: nowrap;width: 460rpx;text-align: right;">
|
|
99
99
|
{{shop.choseShop ? shop.choseShop.resource_shop_name : "请选择"}}
|
|
100
100
|
</view>
|
|
101
101
|
</xd-list-item>
|
|
102
|
-
<xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="48rpx" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)">
|
|
102
|
+
<xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="48rpx" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)" class="xd-my-list-item">
|
|
103
103
|
<view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
|
|
104
104
|
</xd-list-item>
|
|
105
105
|
</template>
|
|
@@ -375,6 +375,9 @@
|
|
|
375
375
|
import CusPrice from '@/components/CusPrice/CusPrice'
|
|
376
376
|
import CusVipList from "@/components/CusVipList/CusVipList"
|
|
377
377
|
export default {
|
|
378
|
+
// #ifdef MP-WEIXIN
|
|
379
|
+
options: { styleIsolation: 'shared' },
|
|
380
|
+
// #endif
|
|
378
381
|
name: "JfbMallConfirm",
|
|
379
382
|
components: {
|
|
380
383
|
XdFontIcon,
|
|
@@ -1594,16 +1597,8 @@
|
|
|
1594
1597
|
}
|
|
1595
1598
|
.order_fee{
|
|
1596
1599
|
overflow: hidden;
|
|
1597
|
-
// padding: var(--order-line-height) 0;
|
|
1598
1600
|
::v-deep .xd-my-list-item{
|
|
1599
|
-
|
|
1600
|
-
// padding-top: var(--order-line-height) !important;
|
|
1601
|
-
// padding-top: 0 !important;
|
|
1602
|
-
// padding-bottom: 0 !important;
|
|
1603
|
-
|
|
1604
|
-
&.logistics_discount{
|
|
1605
|
-
// padding-top: var(--order-line-height) !important;
|
|
1606
|
-
}
|
|
1601
|
+
&.logistics_discount{}
|
|
1607
1602
|
}
|
|
1608
1603
|
|
|
1609
1604
|
.money_box{
|
|
@@ -1612,7 +1607,6 @@
|
|
|
1612
1607
|
&:last-child{
|
|
1613
1608
|
margin-bottom: 0;
|
|
1614
1609
|
}
|
|
1615
|
-
// padding: var(--order-line-height) 0;
|
|
1616
1610
|
}
|
|
1617
1611
|
}
|
|
1618
1612
|
.shipping-address{
|
|
@@ -1684,9 +1678,18 @@
|
|
|
1684
1678
|
font-size: 24rpx;
|
|
1685
1679
|
}
|
|
1686
1680
|
.delivery{
|
|
1681
|
+
// #ifdef H5
|
|
1687
1682
|
::v-deep .xd-my-list-item:last-child{
|
|
1688
1683
|
border-bottom: none !important;
|
|
1689
1684
|
}
|
|
1685
|
+
// #endif
|
|
1686
|
+
// #ifdef MP-WEIXIN
|
|
1687
|
+
.xd-my-list-item:last-child{
|
|
1688
|
+
::v-deep .xd-my-list-item{
|
|
1689
|
+
border-bottom: none !important;
|
|
1690
|
+
}
|
|
1691
|
+
}
|
|
1692
|
+
// #endif
|
|
1690
1693
|
}
|
|
1691
1694
|
.shop_name{
|
|
1692
1695
|
padding: 24rpx 48rpx;
|
|
@@ -1705,7 +1708,6 @@
|
|
|
1705
1708
|
width: 180rpx;
|
|
1706
1709
|
height: 180rpx;
|
|
1707
1710
|
margin-right: 24rpx;
|
|
1708
|
-
background: #DDD;
|
|
1709
1711
|
image{
|
|
1710
1712
|
width: 100%;
|
|
1711
1713
|
height: 100%;
|