修改流程
This commit is contained in:
@@ -117,6 +117,23 @@ const orderStatus = computed(() => {
|
||||
return ''
|
||||
})
|
||||
|
||||
/** 税费及其他费用:按订单维度展示,非承载订单 deliveryFee/tip 为 0 */
|
||||
const taxesAndOtherFeesTotal = computed(() => {
|
||||
const d = orderDetail.value
|
||||
return (
|
||||
(Number(d?.tax) || 0) +
|
||||
(Number(d?.tip) || 0) +
|
||||
(Number(d?.deliveryFee) || 0)
|
||||
).toFixed(2)
|
||||
})
|
||||
|
||||
const orderDeliveryDateLabel = computed(() => {
|
||||
const date = String((orderDetail.value as any)?.deliveryDate ?? '').trim()
|
||||
if (!date) return ''
|
||||
const d = dayjs(date)
|
||||
return d.isValid() ? d.format('MM/DD/YYYY') : date
|
||||
})
|
||||
|
||||
// ====== 为设计稿准备的数据结构(商品缩略卡/总件数/总价等)======
|
||||
const orderDishList = computed(() => {
|
||||
const list = orderDetail.value?.merchantOrderDishVoList as unknown as Array<any> | null | undefined
|
||||
@@ -571,6 +588,12 @@ async function onVoucherImageUploaded(urls: unknown) {
|
||||
|
||||
<view v-if="orderDetail?.receiveMethod === 1" class="pt-36rpx bg-white">
|
||||
<view class="text-36rpx lh-36rpx text-#333 font-500 pl-30rpx mb-4rpx">{{ t('pages-store.order.deliveryAddress') }}</view>
|
||||
<view
|
||||
v-if="orderDeliveryDateLabel"
|
||||
class="text-28rpx lh-28rpx text-#6D6D6D pl-30rpx mb-16rpx"
|
||||
>
|
||||
{{ t('pages-store.order.deliveryDate') }}: {{ orderDeliveryDateLabel }}
|
||||
</view>
|
||||
|
||||
<!-- 收货地址 -->
|
||||
<view class="flex items-center border-bottom py-36rpx px-30rpx">
|
||||
@@ -698,7 +721,7 @@ async function onVoucherImageUploaded(urls: unknown) {
|
||||
/>
|
||||
</view>
|
||||
<view>
|
||||
<text>${{ (Number(orderDetail?.tax) + Number(orderDetail?.tip) + Number(orderDetail?.deliveryFee)).toFixed(2) }}</text>
|
||||
<text>${{ taxesAndOtherFeesTotal }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-center-sb">
|
||||
|
||||
Reference in New Issue
Block a user