diff --git a/apps/web-antd/src/api/mall/trade/order/index.ts b/apps/web-antd/src/api/mall/trade/order/index.ts index 617ea2b66..999a33f85 100644 --- a/apps/web-antd/src/api/mall/trade/order/index.ts +++ b/apps/web-antd/src/api/mall/trade/order/index.ts @@ -49,6 +49,7 @@ export namespace MallOrderApi { afterSaleStatus?: null | number; /** 属性数组 */ properties?: ProductProperty[]; + price?: number; } /** 订单日志 */ diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts index dcaf53899..cdcf071f4 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts @@ -111,12 +111,8 @@ export function useGridColumns(): VxeGridPropTypes.Columns { { field: 'spuName', title: '商品信息', - minWidth: 100, - formatter: ({ row }) => { - if (row.items.length > 1) { - return row.items.map((item: any) => item.spuName).join(','); - } - }, + minWidth: 300, + slots: { default: 'spuName' }, }, { field: 'payPrice', @@ -134,9 +130,10 @@ export function useGridColumns(): VxeGridPropTypes.Columns { title: '核销门店', minWidth: 160, formatter: ({ row }) => { - return pickUpStoreList.value.find( - (item) => item.id === row.pickUpStoreId, - )?.name; + return ( + pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId) + ?.name || '' + ); }, }, { diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue index d08771a0b..e679f20c1 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue @@ -9,7 +9,7 @@ import { DeliveryTypeEnum } from '@vben/constants'; import { $t } from '@vben/locales'; import { fenToYuan } from '@vben/utils'; -import { Card, Input, message } from 'ant-design-vue'; +import { Card, Image, Input, message, Tag } from 'ant-design-vue'; import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { @@ -156,6 +156,9 @@ const [Grid, gridApi] = useVbenVxeGrid({ schema: useGridFormSchema(), }, gridOptions: { + cellConfig: { + height: 100, + }, columns: useGridColumns(), height: 'auto', keepSource: true, @@ -226,8 +229,43 @@ const [Grid, gridApi] = useVbenVxeGrid({ /> - + +