|
@@ -23,6 +23,7 @@
|
|
</template>
|
|
</template>
|
|
<template #spuName="{ item }">
|
|
<template #spuName="{ item }">
|
|
<span class="color-primary cursor-pointer" @click="handleToGoodsDetail(item)">{{ item.spuName }}</span>
|
|
<span class="color-primary cursor-pointer" @click="handleToGoodsDetail(item)">{{ item.spuName }}</span>
|
|
|
|
+ <p v-if="order.lottery && order.lottery.length" class="color-999">赠品:{{ order.lottery.map(e => e.prize.name).join('、') }}</p>
|
|
</template>
|
|
</template>
|
|
<template #actions="{ item }">
|
|
<template #actions="{ item }">
|
|
<div v-if="[10, 20, 30].includes(order.status) && item.extend && item.extend.fileUrls && item.extend.fileUrls.length > 0">
|
|
<div v-if="[10, 20, 30].includes(order.status) && item.extend && item.extend.fileUrls && item.extend.fileUrls.length > 0">
|
|
@@ -57,7 +58,7 @@
|
|
<h3>物流信息</h3>
|
|
<h3>物流信息</h3>
|
|
<v-divider class="my-3"></v-divider>
|
|
<v-divider class="my-3"></v-divider>
|
|
<div class="font-size-15 color-666">
|
|
<div class="font-size-15 color-666">
|
|
- <p>收货地址:{{ order.receiverName }},{{ order.receiverMobile }},{{ order.receiverAreaName }} {{ order.receiverDetailAddress }}</p>
|
|
|
|
|
|
+ <p>收货地址:<span v-if="order.receiverName && order.receiverMobile">{{ order.receiverName }},{{ order.receiverMobile }},{{ order.receiverAreaName }} {{ order.receiverDetailAddress }}</span></p>
|
|
<p class="my-3">物流公司:{{ order.logisticsName }}</p>
|
|
<p class="my-3">物流公司:{{ order.logisticsName }}</p>
|
|
<p>运单号:{{ order.logisticsNo }}</p>
|
|
<p>运单号:{{ order.logisticsNo }}</p>
|
|
</div>
|
|
</div>
|
|
@@ -77,6 +78,7 @@ import Snackbar from '@/plugins/snackbar'
|
|
import { timesTampChange } from '@/utils/date'
|
|
import { timesTampChange } from '@/utils/date'
|
|
import { fen2yuan, formatOrderStatusDescription } from '@/hooks/web/useGoods'
|
|
import { fen2yuan, formatOrderStatusDescription } from '@/hooks/web/useGoods'
|
|
import { getBlob, saveAs, previewFile } from '@/utils'
|
|
import { getBlob, saveAs, previewFile } from '@/utils'
|
|
|
|
+import { getLuckLotteryRecordByOrderId } from '@/api/mall/prize'
|
|
|
|
|
|
const router = useRouter()
|
|
const router = useRouter()
|
|
const { id } = router.currentRoute.value.params
|
|
const { id } = router.currentRoute.value.params
|
|
@@ -93,6 +95,7 @@ const headers = [
|
|
|
|
|
|
onMounted(async () =>{
|
|
onMounted(async () =>{
|
|
const data = await getMallOrderDetail(id)
|
|
const data = await getMallOrderDetail(id)
|
|
|
|
+ const result = await getLuckLotteryRecordByOrderId(id)
|
|
if (!data) {
|
|
if (!data) {
|
|
Snackbar.warning('订单不存在')
|
|
Snackbar.warning('订单不存在')
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
@@ -101,6 +104,7 @@ onMounted(async () =>{
|
|
return
|
|
return
|
|
}
|
|
}
|
|
order.value = data
|
|
order.value = data
|
|
|
|
+ order.value.lottery = result // 赠品信息
|
|
})
|
|
})
|
|
|
|
|
|
const showBanner = computed(() => (order) => {
|
|
const showBanner = computed(() => (order) => {
|