Compare commits
No commits in common. "26ac358b18941e7ce3125f558bf14ee3d43e3902" and "ce8a1f8bd7661b0e937e69e38b703e6486a35550" have entirely different histories.
26ac358b18
...
ce8a1f8bd7
|
|
@ -105,16 +105,4 @@ export const ORDER_STATUS_ENUM: ProSchemaValueEnumObj = {
|
||||||
text: '待退款',
|
text: '待退款',
|
||||||
status: 'warning',
|
status: 'warning',
|
||||||
},
|
},
|
||||||
refund_requested: {
|
|
||||||
text: '已申请退款',
|
|
||||||
status: 'refund_approved',
|
|
||||||
},
|
|
||||||
refund_approved: {
|
|
||||||
text: '退款申请已通过',
|
|
||||||
status: 'refund_approved',
|
|
||||||
},
|
|
||||||
refund_cancelled: {
|
|
||||||
text: '已取消退款',
|
|
||||||
status: 'refund_cancelled',
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -122,18 +122,6 @@ const ListPage: React.FC = () => {
|
||||||
key: 'pending_reshipment',
|
key: 'pending_reshipment',
|
||||||
label: '待补发',
|
label: '待补发',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: 'refund_requested',
|
|
||||||
label: '已申请退款',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'refund_approved',
|
|
||||||
label: '退款申请已通过',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'refund_cancelled',
|
|
||||||
label: '已取消退款',
|
|
||||||
},
|
|
||||||
// {
|
// {
|
||||||
// key: 'pending_refund',
|
// key: 'pending_refund',
|
||||||
// label: '待退款',
|
// label: '待退款',
|
||||||
|
|
@ -200,10 +188,6 @@ const ListPage: React.FC = () => {
|
||||||
dataIndex: 'total',
|
dataIndex: 'total',
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '支付方式',
|
|
||||||
dataIndex: 'payment_method',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: '总订单数',
|
title: '总订单数',
|
||||||
dataIndex: 'order_count',
|
dataIndex: 'order_count',
|
||||||
|
|
@ -218,12 +202,6 @@ const ListPage: React.FC = () => {
|
||||||
title: '客户邮箱',
|
title: '客户邮箱',
|
||||||
dataIndex: 'customer_email',
|
dataIndex: 'customer_email',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '联系电话',
|
|
||||||
dataIndex: 'billing_phone',
|
|
||||||
render: (_, record) => record.shipping?.phone || record.billing?.phone,
|
|
||||||
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: '州',
|
title: '州',
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
|
|
@ -765,7 +743,6 @@ const Detail: React.FC<{
|
||||||
/>
|
/>
|
||||||
<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="联系电话" dataIndex="billing_phone" />
|
|
||||||
<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" />
|
||||||
|
|
@ -2077,7 +2054,6 @@ const CreateOrder: React.FC<{
|
||||||
{
|
{
|
||||||
...data,
|
...data,
|
||||||
customer_email: data?.billing?.email,
|
customer_email: data?.billing?.email,
|
||||||
billing_phone: data?.billing?.phone,
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
if (!success) throw new Error(errMsg);
|
if (!success) throw new Error(errMsg);
|
||||||
|
|
|
||||||
|
|
@ -26,19 +26,6 @@ const ListPage: React.FC = () => {
|
||||||
dataIndex: 'productSku',
|
dataIndex: 'productSku',
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '出入库',
|
|
||||||
dataIndex: 'operationType',
|
|
||||||
valueType: 'select',
|
|
||||||
valueEnum: {
|
|
||||||
'in': {
|
|
||||||
text: '入库'
|
|
||||||
},
|
|
||||||
"out": {
|
|
||||||
text: '出库'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: '库存',
|
title: '库存',
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
|
|
@ -65,18 +52,6 @@ const ListPage: React.FC = () => {
|
||||||
valueType: 'dateTime',
|
valueType: 'dateTime',
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '起始日期',
|
|
||||||
dataIndex: 'startDate',
|
|
||||||
valueType: 'date',
|
|
||||||
hideInTable: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '结束日期',
|
|
||||||
dataIndex: 'endDate',
|
|
||||||
valueType: 'date',
|
|
||||||
hideInTable: true,
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
|
|
@ -235,7 +235,6 @@ declare namespace API {
|
||||||
total_tax?: number;
|
total_tax?: number;
|
||||||
customer_id?: number;
|
customer_id?: number;
|
||||||
customer_email?: string;
|
customer_email?: string;
|
||||||
billing_phone?: string;
|
|
||||||
order_key?: string;
|
order_key?: string;
|
||||||
billing?: OrderAddress;
|
billing?: OrderAddress;
|
||||||
shipping?: OrderAddress;
|
shipping?: OrderAddress;
|
||||||
|
|
@ -319,7 +318,6 @@ declare namespace API {
|
||||||
externalOrderId?: string;
|
externalOrderId?: string;
|
||||||
siteId?: string;
|
siteId?: string;
|
||||||
customer_email?: string;
|
customer_email?: string;
|
||||||
billing_phone?: string;
|
|
||||||
keyword?: string;
|
keyword?: string;
|
||||||
startDate?: string;
|
startDate?: string;
|
||||||
endDate?: string;
|
endDate?: string;
|
||||||
|
|
@ -332,11 +330,7 @@ declare namespace API {
|
||||||
| 'failed'
|
| 'failed'
|
||||||
| 'after_sale_pending'
|
| 'after_sale_pending'
|
||||||
| 'pending_reshipment'
|
| 'pending_reshipment'
|
||||||
| 'pending_refund'
|
| 'pending_refund';
|
||||||
| 'refund_requested'
|
|
||||||
| 'refund_approved'
|
|
||||||
| 'refund_cancelled';
|
|
||||||
payment_method?: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type ordercontrollerRefundorderParams = {
|
type ordercontrollerRefundorderParams = {
|
||||||
|
|
@ -377,7 +371,6 @@ declare namespace API {
|
||||||
total_tax?: number;
|
total_tax?: number;
|
||||||
customer_id?: number;
|
customer_id?: number;
|
||||||
customer_email?: string;
|
customer_email?: string;
|
||||||
billing_phone?: string;
|
|
||||||
order_key?: string;
|
order_key?: string;
|
||||||
billing?: OrderAddress;
|
billing?: OrderAddress;
|
||||||
shipping?: OrderAddress;
|
shipping?: OrderAddress;
|
||||||
|
|
@ -847,7 +840,6 @@ declare namespace API {
|
||||||
externalOrderId?: string;
|
externalOrderId?: string;
|
||||||
siteId?: string;
|
siteId?: string;
|
||||||
customer_email?: string;
|
customer_email?: string;
|
||||||
billing_phone?: string;
|
|
||||||
keyword?: string;
|
keyword?: string;
|
||||||
startDate?: string;
|
startDate?: string;
|
||||||
endDate?: string;
|
endDate?: string;
|
||||||
|
|
@ -860,11 +852,7 @@ declare namespace API {
|
||||||
| 'failed'
|
| 'failed'
|
||||||
| 'after_sale_pending'
|
| 'after_sale_pending'
|
||||||
| 'pending_reshipment'
|
| 'pending_reshipment'
|
||||||
| 'pending_refund'
|
| 'pending_refund';
|
||||||
| 'refund_requested'
|
|
||||||
| 'refund_approved'
|
|
||||||
| 'refund_cancelled';
|
|
||||||
payment_method?: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type QueryOrderSalesDTO = {
|
type QueryOrderSalesDTO = {
|
||||||
|
|
@ -932,9 +920,6 @@ declare namespace API {
|
||||||
stockPointId?: number;
|
stockPointId?: number;
|
||||||
productSku?: string;
|
productSku?: string;
|
||||||
productName?: string;
|
productName?: string;
|
||||||
operationType?: string;
|
|
||||||
startDate?: string;
|
|
||||||
endDate?: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type QueryStrengthDTO = {
|
type QueryStrengthDTO = {
|
||||||
|
|
@ -1152,9 +1137,6 @@ declare namespace API {
|
||||||
stockPointId?: number;
|
stockPointId?: number;
|
||||||
productSku?: string;
|
productSku?: string;
|
||||||
productName?: string;
|
productName?: string;
|
||||||
operationType?: string;
|
|
||||||
startDate?: string;
|
|
||||||
endDate?: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type stockcontrollerGetstocksParams = {
|
type stockcontrollerGetstocksParams = {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue