diff --git a/.umirc.ts b/.umirc.ts index e98fa55..a04289d 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -73,7 +73,7 @@ export default defineConfig({ component: './Site/List', }, { - name: '店铺页面', + name: '店铺管理', path: '/site/shop', component: './Site/Shop/Layout', routes: [ diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 0614757..ee048db 100644 --- a/src/pages/Order/List/index.tsx +++ b/src/pages/Order/List/index.tsx @@ -1721,8 +1721,11 @@ const Shipping: React.FC<{ ]} /> - {({ details: { packaging_type } }) => { - if (packaging_type === 'package') { + {({ details }) => { + // 根据包装类型决定渲染内容 + const selectedPackagingType = details?.packaging_type; + // 判断是否为纸箱 + if (selectedPackagingType === 'package') { return ( ); } - if (packaging_type === 'courier-pak') { + // 判断是否为文件袋 + if (selectedPackagingType === 'courier-pak') { return ( { title: '操作', valueType: 'option', width: 160, + fixed: 'right', render: (_, record) => ( handleDelete(record.id)} okText="确定" cancelText="取消" > - ), @@ -187,7 +192,7 @@ const MediaPage: React.FC = () => { toolBarRender={() => [ } />} + trigger={} width={500} onFinish={async (values) => { if (!siteId) return false; @@ -252,7 +257,9 @@ const MediaPage: React.FC = () => { message.error(res.message || '导出失败'); } }} - />, + > + 批量导出 + , { danger icon={} disabled={!selectedRowKeys.length} - /> + > + 批量删除 + + , + ]} /> diff --git a/src/pages/Site/Shop/Orders/index.tsx b/src/pages/Site/Shop/Orders/index.tsx index adc0be4..3f94fe6 100644 --- a/src/pages/Site/Shop/Orders/index.tsx +++ b/src/pages/Site/Shop/Orders/index.tsx @@ -78,14 +78,10 @@ const OrdersPage: React.FC = () => { const columns: ProColumns[] = [ { - title: 'ID', + title: '订单号', dataIndex: 'id', hideInSearch: true, }, - { - title: '订单号', - dataIndex: 'number', - }, { title: '状态', dataIndex: 'status', @@ -151,7 +147,7 @@ const OrdersPage: React.FC = () => { render: (_, record) => { return ( <> - { { toolBarRender={() => [ , ,