jufubao-base 1.0.280 → 1.0.281
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
|
@@ -160,7 +160,8 @@
|
|
|
160
160
|
<view>{{ Ditem.value }}</view>
|
|
161
161
|
</view>
|
|
162
162
|
</view>
|
|
163
|
-
|
|
163
|
+
<!--mall code sub orders info-->
|
|
164
|
+
<view v-if="['none'].includes(code_location) && info.sub_orders && info.sub_orders.length > 0">
|
|
164
165
|
<view
|
|
165
166
|
:style="{
|
|
166
167
|
background: backgroundColor,
|
|
@@ -249,6 +250,7 @@
|
|
|
249
250
|
</view>
|
|
250
251
|
</view>
|
|
251
252
|
</view>
|
|
253
|
+
<!--mall code orders info-->
|
|
252
254
|
<view
|
|
253
255
|
v-if="info.settle_tag_info"
|
|
254
256
|
class="jfb-base-order-detail__body-card jfb-base-order-detail__body-settle"
|
|
@@ -494,6 +496,7 @@
|
|
|
494
496
|
</view>
|
|
495
497
|
</view>
|
|
496
498
|
</view>
|
|
499
|
+
<!--shop-->
|
|
497
500
|
<view v-if="info.support_shops && is_show_support_shop === 'Y'">
|
|
498
501
|
<view
|
|
499
502
|
class="jfb-base-order-detail__body-card jfb-base-order-detail__body-jump"
|
|
@@ -528,13 +531,114 @@
|
|
|
528
531
|
marginBottom: padding + 'rpx',
|
|
529
532
|
}"
|
|
530
533
|
>
|
|
531
|
-
<view class="jfb-base-order-detail__body-shop-title">
|
|
534
|
+
<view class="jfb-base-order-detail__body-shop-title" v-if="['none'].includes(code_location)">
|
|
532
535
|
<view :style="{ background: mainColor }"></view>
|
|
533
536
|
<view>{{ info.shop.layer_name }}</view>
|
|
534
537
|
</view>
|
|
535
|
-
<view class="
|
|
536
|
-
|
|
538
|
+
<view class="order-shop">
|
|
539
|
+
<view>
|
|
540
|
+
<view :class="{top: ['top'].includes(code_location)}" class="jfb-base-order-detail__body-shop-name">{{ info.shop.shop_name }}</view>
|
|
541
|
+
<view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
|
|
542
|
+
</view>
|
|
543
|
+
<view
|
|
544
|
+
@click="handleLocation(info.shop)"
|
|
545
|
+
v-if="['top'].includes(code_location)"
|
|
546
|
+
><xd-font-icon icon="iconfabu" :color="mainColor" size="30"></xd-font-icon></view>
|
|
547
|
+
</view>
|
|
548
|
+
|
|
549
|
+
</view>
|
|
550
|
+
<!--shop-->
|
|
551
|
+
<!--food sub orders info-->
|
|
552
|
+
<view v-if="['top'].includes(code_location) && info.sub_orders && info.sub_orders.length > 0">
|
|
553
|
+
<view
|
|
554
|
+
:style="{
|
|
555
|
+
background: backgroundColor,
|
|
556
|
+
border: borderBox,
|
|
557
|
+
borderRadius: radius + 'rpx',
|
|
558
|
+
boxShadow: shadowBox,
|
|
559
|
+
marginBottom: padding + 'rpx',
|
|
560
|
+
}"
|
|
561
|
+
v-for="(item, index) in info.sub_orders"
|
|
562
|
+
:key="index"
|
|
563
|
+
class="jfb-base-order-detail__body-card jfb-base-order-detail__body-delivery"
|
|
564
|
+
>
|
|
565
|
+
<view class="jfb-base-order-detail__body-delivery-title">
|
|
566
|
+
<view>子订单号：{{ item.sub_order_id }}</view>
|
|
567
|
+
<view :style="{ color: mainColor }">{{item.status.status_name}}</view>
|
|
568
|
+
</view>
|
|
569
|
+
<view
|
|
570
|
+
style="border-bottom: 1px solid #eeeeee"
|
|
571
|
+
v-for="(Sitem, Sindex) in item.products"
|
|
572
|
+
:key="Sindex"
|
|
573
|
+
>
|
|
574
|
+
<view class="jfb-base-order-detail__body-delivery-content">
|
|
575
|
+
<xd-jfb-image
|
|
576
|
+
width="200"
|
|
577
|
+
height="200"
|
|
578
|
+
bgc="#f8f8f8"
|
|
579
|
+
radius="10"
|
|
580
|
+
shadow="10"
|
|
581
|
+
mode="scaleToFill"
|
|
582
|
+
:src="Sitem.product_thumb"
|
|
583
|
+
></xd-jfb-image>
|
|
584
|
+
<view class="jfb-base-order-detail__body-delivery-content-info">
|
|
585
|
+
<view class="jfb-base-order-detail__body-delivery-content-info-name">{{ Sitem.product_name }}</view>
|
|
586
|
+
<view v-if="Sitem.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
|
|
587
|
+
<view
|
|
588
|
+
v-if="Sitem.product_sku_name"
|
|
589
|
+
class="jfb-base-order-detail__body-delivery-content-info-sku"
|
|
590
|
+
>规格：{{ Sitem.product_sku_name }}</view>
|
|
591
|
+
<view class="jfb-base-order-detail__body-delivery-content-info-price">
|
|
592
|
+
<view :style="{ fontSize: '32rpx', color: mainColor }">
|
|
593
|
+
<xd-unit
|
|
594
|
+
:price="Sitem.sale_price"
|
|
595
|
+
:color="mainColor"
|
|
596
|
+
:fontSize="32"
|
|
597
|
+
v-if="biz_code !== 'gift' || info.is_show_gift_price"
|
|
598
|
+
></xd-unit>
|
|
599
|
+
</view>
|
|
600
|
+
<view style="
|
|
601
|
+
font-size: 28rpx;
|
|
602
|
+
color: #999999;
|
|
603
|
+
display: flex;
|
|
604
|
+
align-items: center;
|
|
605
|
+
">x {{ Sitem.product_num }}</view>
|
|
606
|
+
</view>
|
|
607
|
+
</view>
|
|
608
|
+
</view>
|
|
609
|
+
<view
|
|
610
|
+
class="jfb-base-order-detail__body-delivery-content-info-form"
|
|
611
|
+
v-for="(Fitem, Findex) in Sitem.product_form_data"
|
|
612
|
+
:key="Findex"
|
|
613
|
+
:style="{backgroundColor:noticeBgc,color: warningColor,borderRadius: radius + 'rpx',}"
|
|
614
|
+
>
|
|
615
|
+
<view> {{ Fitem.label }}： </view>
|
|
616
|
+
<view> {{ Fitem.value }} </view>
|
|
617
|
+
</view>
|
|
618
|
+
</view>
|
|
619
|
+
<view
|
|
620
|
+
class="jfb-base-order-detail__body-delivery-bottom"
|
|
621
|
+
v-if="item.info && item.info.length > 0"
|
|
622
|
+
>
|
|
623
|
+
<view class="jfb-base-order-detail__body-delivery-bottom-title">{{item.service_name}}</view>
|
|
624
|
+
<view
|
|
625
|
+
v-for="(Ditem, Dindex) in item.info"
|
|
626
|
+
:key="Dindex"
|
|
627
|
+
class="jfb-base-order-detail__body-delivery-bottom-item"
|
|
628
|
+
:style="{
|
|
629
|
+
marginBottom: lineHeight + 'rpx'
|
|
630
|
+
}"
|
|
631
|
+
>
|
|
632
|
+
<view style="width: 130rpx;display: flex;">
|
|
633
|
+
<view v-html="Ditem.label"></view>
|
|
634
|
+
<text v-if="Ditem.label">:</text>
|
|
635
|
+
</view>
|
|
636
|
+
<view v-html="Ditem.value"></view>
|
|
637
|
+
</view>
|
|
638
|
+
</view>
|
|
639
|
+
</view>
|
|
537
640
|
</view>
|
|
641
|
+
<!--food sub orders info-->
|
|
538
642
|
<view
|
|
539
643
|
:style="{
|
|
540
644
|
background: backgroundColor,
|
|
@@ -962,6 +1066,8 @@ export default {
|
|
|
962
1066
|
showSupplement: false,
|
|
963
1067
|
supplementList: [],
|
|
964
1068
|
supplementTitle: "",
|
|
1069
|
+
|
|
1070
|
+
code_location:'none',
|
|
965
1071
|
};
|
|
966
1072
|
},
|
|
967
1073
|
watch: {
|
|
@@ -1033,6 +1139,15 @@ export default {
|
|
|
1033
1139
|
this.getOrderDetail();
|
|
1034
1140
|
},
|
|
1035
1141
|
|
|
1142
|
+
handleLocation({shop_address,shop_name,shop_latitude,shop_longitude,...shop}){
|
|
1143
|
+
this.handleOpenLocation({
|
|
1144
|
+
address: shop_address,
|
|
1145
|
+
name: shop_name,
|
|
1146
|
+
latitude: shop_latitude,
|
|
1147
|
+
longitude: shop_longitude
|
|
1148
|
+
},()=>{})
|
|
1149
|
+
},
|
|
1150
|
+
|
|
1036
1151
|
getAmount(price) {
|
|
1037
1152
|
return this.$xdUniHelper.divisionFloatNumber(price,100)
|
|
1038
1153
|
},
|
|
@@ -1075,6 +1190,9 @@ export default {
|
|
|
1075
1190
|
return;
|
|
1076
1191
|
}
|
|
1077
1192
|
|
|
1193
|
+
//餐饮电子码
|
|
1194
|
+
if(res['code_location']) this.code_location = res['code_location']
|
|
1195
|
+
|
|
1078
1196
|
this.biz_code = res.biz_code;
|
|
1079
1197
|
this.is_not_show_price = res.is_not_show_price;
|
|
1080
1198
|
|
|
@@ -1558,6 +1676,32 @@ export default {
|
|
|
1558
1676
|
line-height: 32rpx;
|
|
1559
1677
|
}
|
|
1560
1678
|
|
|
1679
|
+
.order-shop {
|
|
1680
|
+
display: flex;
|
|
1681
|
+
justify-content: flex-start;
|
|
1682
|
+
align-items: center;
|
|
1683
|
+
|
|
1684
|
+
& .top {
|
|
1685
|
+
margin-top: 0!important;
|
|
1686
|
+
margin-bottom: 10rpx!important;
|
|
1687
|
+
}
|
|
1688
|
+
|
|
1689
|
+
& > view {
|
|
1690
|
+
&:nth-child(1) {
|
|
1691
|
+
flex: 1;
|
|
1692
|
+
}
|
|
1693
|
+
&:nth-child(2) {
|
|
1694
|
+
flex-shrink: 0;
|
|
1695
|
+
width: 80rpx;
|
|
1696
|
+
height: 80rpx;
|
|
1697
|
+
display: flex;
|
|
1698
|
+
justify-content: flex-end;
|
|
1699
|
+
align-items: center;
|
|
1700
|
+
}
|
|
1701
|
+
}
|
|
1702
|
+
}
|
|
1703
|
+
|
|
1704
|
+
|
|
1561
1705
|
color: #333;
|
|
1562
1706
|
.logo-icon {
|
|
1563
1707
|
width: unit(80, rpx) !important;
|
|
@@ -1831,7 +1975,7 @@ export default {
|
|
|
1831
1975
|
}
|
|
1832
1976
|
}
|
|
1833
1977
|
}
|
|
1834
|
-
|
|
1978
|
+
|
|
1835
1979
|
}
|
|
1836
1980
|
|
|
1837
1981
|
|
|
@@ -1885,6 +2029,8 @@ export default {
|
|
|
1885
2029
|
}
|
|
1886
2030
|
|
|
1887
2031
|
&-shop {
|
|
2032
|
+
padding-top: 20rpx;
|
|
2033
|
+
padding-bottom: 20rpx;
|
|
1888
2034
|
&-title {
|
|
1889
2035
|
display: flex;
|
|
1890
2036
|
align-items: center;
|
|
@@ -1906,7 +2052,7 @@ export default {
|
|
|
1906
2052
|
|
|
1907
2053
|
&-name {
|
|
1908
2054
|
color: #333333;
|
|
1909
|
-
font-size: unit(
|
|
2055
|
+
font-size: unit(32, rpx);
|
|
1910
2056
|
margin-top: unit(24, rpx);
|
|
1911
2057
|
margin-bottom: unit(24, rpx);
|
|
1912
2058
|
}
|
|
@@ -1957,7 +2103,7 @@ export default {
|
|
|
1957
2103
|
color: #737373;
|
|
1958
2104
|
}
|
|
1959
2105
|
}
|
|
1960
|
-
|
|
2106
|
+
|
|
1961
2107
|
&-order {
|
|
1962
2108
|
display: flex;
|
|
1963
2109
|
align-items: center;
|