yoone
/
WEB
1
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Order/List): 更新退款相关状态标签为更简洁的表达 #26

Merged
longbot merged 9 commits from zksu/WEB:main into main 2025-10-14 06:54:24 +00:00
Conversation 0 Commits 9 Files Changed 4 +39 -36
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87534c4d22 - Show all commits

75
src/pages/Order/List/index.tsx
View File

@ -128,11 +128,13 @@ const ListPage: React.FC = () => {
}, },
{ {
key: 'refund_approved', key: 'refund_approved',
label: '退款申请已通过', label: "已退款",
// label: '退款申请已通过',
}, },
{ {
key: 'refund_cancelled', key: 'refund_cancelled',
label: '已取消退款', label: "已完成"
// label: '已取消退款',
}, },
// { // {
// key: 'pending_refund', // key: 'pending_refund',
@ -289,7 +291,7 @@ const ListPage: React.FC = () => {
record.orderStatus, record.orderStatus,
) ? ( ) ? (
<> <>
<Shipping id={record.id as number} tableRef={actionRef} setActiveLine={setActiveLine}/> <Shipping id={record.id as number} tableRef={actionRef} setActiveLine={setActiveLine} />
<Divider type="vertical" /> <Divider type="vertical" />
</> </>
) : ( ) : (
@ -419,7 +421,7 @@ const ListPage: React.FC = () => {
actionRef={actionRef} actionRef={actionRef}
rowKey="id" rowKey="id"
rowClassName={(record) => { rowClassName={(record) => {
return record.id === activeLine ? styles['selected-line-order-protable']: ''; return record.id === activeLine ? styles['selected-line-order-protable'] : '';
}} }}
toolBarRender={() => [ toolBarRender={() => [
<CreateOrder tableRef={actionRef} />, <CreateOrder tableRef={actionRef} />,
@ -763,16 +765,17 @@ const Detail: React.FC<{
valueEnum={ORDER_STATUS_ENUM} valueEnum={ORDER_STATUS_ENUM}
/> />
<ProDescriptions.Item label="金额" dataIndex="total" /> <ProDescriptions.Item label="金额" dataIndex="total" />
<ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" /> <ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" />
<ProDescriptions.Item label="联系电话" span={3} <ProDescriptions.Item label="联系电话" span={3}
render={(_, record) => { return ( render={(_, record) => {
<div> return (
<span> <div>
{record?.shipping?.phone || record?.billing?.phone || '-'} <span>
</span> {record?.shipping?.phone || record?.billing?.phone || '-'}
</div> </span>
); </div>
}} /> );
}} />
<ProDescriptions.Item label="交易Id" dataIndex="transaction_id" /> <ProDescriptions.Item label="交易Id" dataIndex="transaction_id" />
<ProDescriptions.Item label="IP" dataIndex="customer_id_address" /> <ProDescriptions.Item label="IP" dataIndex="customer_id_address" />
<ProDescriptions.Item label="设备" dataIndex="device_type" /> <ProDescriptions.Item label="设备" dataIndex="device_type" />
@ -905,7 +908,7 @@ const Detail: React.FC<{
); );
}} }}
/> />
<ProDescriptions.Item <ProDescriptions.Item
label="换货" label="换货"
span={3} span={3}
render={(_, record) => { render={(_, record) => {
@ -1389,16 +1392,16 @@ const Shipping: React.FC<{
<ProFormList <ProFormList
label="发货产品" label="发货产品"
name="sales" name="sales"
// rules={[ // rules={[
// { // {
// required: true, // required: true,
// message: '至少需要一个商品', // message: '至少需要一个商品',
// validator: (_, value) => // validator: (_, value) =>
// value && value.length > 0 // value && value.length > 0
// ? Promise.resolve() // ? Promise.resolve()
// : Promise.reject('至少需要一个商品'), // : Promise.reject('至少需要一个商品'),
// }, // },
// ]} // ]}
> >
<ProForm.Group> <ProForm.Group>
<ProFormSelect <ProFormSelect
@ -1970,14 +1973,14 @@ const SalesChange: React.FC<{
}); });
if (!success || !data) return {}; if (!success || !data) return {};
data.sales = data.sales?.reduce((acc: API.OrderSale[], cur: API.OrderSale) => { data.sales = data.sales?.reduce((acc: API.OrderSale[], cur: API.OrderSale) => {
let idx = acc.findIndex((v: any) => v.productId === cur.productId); let idx = acc.findIndex((v: any) => v.productId === cur.productId);
if (idx === -1) { if (idx === -1) {
acc.push(cur); acc.push(cur);
} else { } else {
acc[idx].quantity += cur.quantity; acc[idx].quantity += cur.quantity;
} }
return acc; return acc;
}, },
[], [],
); );
// setOptions( // setOptions(
@ -1990,11 +1993,11 @@ const SalesChange: React.FC<{
}} }}
onFinish={async (formData: any) => { onFinish={async (formData: any) => {
const { sales } = formData; const { sales } = formData;
const res = await ordercontrollerUpdateorderitems({orderId:id}, sales); const res = await ordercontrollerUpdateorderitems({ orderId: id }, sales);
if (!res.success) { if (!res.success) {
message.error(`更新货物信息失败: ${res.message}`); message.error(`更新货物信息失败: ${res.message}`);
return false; return false;
} }
message.success('更新成功') message.success('更新成功')
detailRef?.current?.reload(); detailRef?.current?.reload();
return true; return true;
@ -2006,7 +2009,7 @@ const SalesChange: React.FC<{
> >
<ProForm.Group> <ProForm.Group>
<ProFormSelect <ProFormSelect
params={{ }} params={{}}
request={async ({ keyWords }) => { request={async ({ keyWords }) => {
try { try {
const { data } = await productcontrollerSearchproducts({ const { data } = await productcontrollerSearchproducts({