|
@@ -75,11 +75,15 @@
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
<div>
|
|
<div>
|
|
<div>{{ row?.order?.promotionSite?.name }}</div>
|
|
<div>{{ row?.order?.promotionSite?.name }}</div>
|
|
- <div style="color: #a8abb2">[ {{ row.order.promotionSite.sn }} ]</div>
|
|
|
|
|
|
+ <div style="color: #a8abb2">[ {{ row.order?.promotionSite?.sn }} ]</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="promotionGoods" :formatter="v => v.order.promotionGoods.memberCardName" label="订单商品名称" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ prop="promotionGoods"
|
|
|
|
+ :formatter="v => v.order.promotionGoods?.memberCardName"
|
|
|
|
+ label="订单商品名称"
|
|
|
|
+ />
|
|
<el-table-column prop="promotionGoods" label="实付金额">
|
|
<el-table-column prop="promotionGoods" label="实付金额">
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
<div>
|
|
<div>
|
|
@@ -87,7 +91,7 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="status" :formatter="v => v.order.promotionGoods.memberCardName" label="订单状态">
|
|
|
|
|
|
+ <el-table-column prop="status" :formatter="v => v.order.promotionGoods?.memberCardName" label="订单状态">
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
<div :class="orderStatusList[row.order.status - 1]?.color">
|
|
<div :class="orderStatusList[row.order.status - 1]?.color">
|
|
{{ orderStatusList[row.order.status - 1]?.label }}
|
|
{{ orderStatusList[row.order.status - 1]?.label }}
|
|
@@ -102,9 +106,8 @@
|
|
{{ row.order.paymentType === 1 ? "平台" : row?.order.agency?.nickname }}
|
|
{{ row.order.paymentType === 1 ? "平台" : row?.order.agency?.nickname }}
|
|
</div>
|
|
</div>
|
|
<div style="color: #a8abb2">
|
|
<div style="color: #a8abb2">
|
|
- [ 收款ID:{{ row.order.mchId }}]
|
|
|
|
|
|
+ [ 收款ID:{{ row.order?.mchId }}]
|
|
<br />
|
|
<br />
|
|
- <!-- [账号ID: {{ row.order.agencyId }}] -->
|
|
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|