|
@@ -27,7 +27,7 @@ const mockLogisticsData = computed(() => {
|
|
|
trackingNumber: `${expressTypeText[props.data.expressType || '']} ${props.data.expressNo || ''}`,
|
|
trackingNumber: `${expressTypeText[props.data.expressType || '']} ${props.data.expressNo || ''}`,
|
|
|
recipientName: props.data.liaison || '',
|
|
recipientName: props.data.liaison || '',
|
|
|
recipientPhone: props.data.phone || '',
|
|
recipientPhone: props.data.phone || '',
|
|
|
- recipientAddress: props.data.provinceName + ' ' + props.data.cityName + ' ' + props.data.areaName + ' ' + props.data.detailAddress
|
|
|
|
|
|
|
+ recipientAddress: props.data.provinceName + ' ' + (props.data.cityName !== null ? props.data.cityName + ' ' : '') + (props.data.areaName !== null ? props.data.areaName + ' ' : '') + props.data.detailAddress !== null ? props.data.detailAddress : ''
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
const expressTypeText: Record<string, string> = {
|
|
const expressTypeText: Record<string, string> = {
|
|
@@ -138,7 +138,7 @@ const sellTypeText: Record<string, string> = {
|
|
|
</vxe-column>
|
|
</vxe-column>
|
|
|
<vxe-column field="realAmount" title="分账金额" align="center">
|
|
<vxe-column field="realAmount" title="分账金额" align="center">
|
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
|
- {{ row.realAmount }}元
|
|
|
|
|
|
|
+ {{ row.realAmount ?? 0 }}元
|
|
|
</template>
|
|
</template>
|
|
|
</vxe-column>
|
|
</vxe-column>
|
|
|
</vxe-table>
|
|
</vxe-table>
|
|
@@ -157,8 +157,8 @@ const sellTypeText: Record<string, string> = {
|
|
|
<div class="logistics-recipient">
|
|
<div class="logistics-recipient">
|
|
|
<span class="receive-icon">收</span>
|
|
<span class="receive-icon">收</span>
|
|
|
<span class="recipient-info">
|
|
<span class="recipient-info">
|
|
|
- {{ mockLogisticsData.recipientName
|
|
|
|
|
- || '' }}, {{ mockLogisticsData.recipientPhone || '' }}, {{
|
|
|
|
|
|
|
+ {{ mockLogisticsData.recipientName
|
|
|
|
|
+ || '' }} {{ mockLogisticsData.recipientPhone || '' }} {{
|
|
|
mockLogisticsData.recipientAddress || '' }}
|
|
mockLogisticsData.recipientAddress || '' }}
|
|
|
</span>
|
|
</span>
|
|
|
</div>
|
|
</div>
|