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 +52 -38
4 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -14,3 +14,5 @@
/package-lock.json
/yarn.lock
*.yaml
#
/docs

8
.umirc.ts
View File

@ -4,6 +4,7 @@ const isDev = process.env.NODE_ENV === 'development';
const UMI_APP_API_URL = isDev
? 'http://localhost:7001'
: 'https://api.yoone.ca';
import { codeInspectorPlugin } from 'code-inspector-plugin';
export default defineConfig({
hash: true,
@ -18,6 +19,13 @@ export default defineConfig({
define: {
UMI_APP_API_URL,
},
chainWebpack(config) {
config.plugin('code-inspector-plugin').use(
codeInspectorPlugin({
bundler: 'webpack',
})
);
},
routes: [
{ path: '/', redirect: '/home' },
{ name: '追踪', path: '/track', component: './Track', layout: false },

1
package.json
View File

@ -32,6 +32,7 @@
"devDependencies": {
"@types/react": "^18.0.33",
"@types/react-dom": "^18.0.11",
"code-inspector-plugin": "^1.2.10",
"husky": "^9",
"lint-staged": "^13.2.0",
"prettier": "^2.8.7",

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

@ -128,12 +128,15 @@ const ListPage: React.FC = () => {
label: '已申请退款',
},
{
key: 'refund_approved',
label: '退款申请已通过',
label: "已退款",
// label: '退款申请已通过',
},
{
key: 'refund_cancelled',
label: '已取消退款',
label: "已完成"
// label: '已取消退款',
},
// {
// key: 'pending_refund',
@ -295,7 +298,7 @@ const ListPage: React.FC = () => {
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" />
</>
) : (
@ -425,7 +428,7 @@ const ListPage: React.FC = () => {
actionRef={actionRef}
rowKey="id"
rowClassName={(record) => {
return record.id === activeLine ? styles['selected-line-order-protable']: '';
return record.id === activeLine ? styles['selected-line-order-protable'] : '';
}}
toolBarRender={() => [
<CreateOrder tableRef={actionRef} />,
@ -769,16 +772,17 @@ const Detail: React.FC<{
valueEnum={ORDER_STATUS_ENUM}
/>
<ProDescriptions.Item label="金额" dataIndex="total" />
<ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" />
<ProDescriptions.Item label="联系电话" span={3}
render={(_, record) => { return (
<div>
<span>
{record?.shipping?.phone || record?.billing?.phone || '-'}
</span>
</div>
);
}} />
<ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" />
<ProDescriptions.Item label="联系电话" span={3}
render={(_, record) => {
return (
<div>
<span>
{record?.shipping?.phone || record?.billing?.phone || '-'}
</span>
</div>
);
}} />
<ProDescriptions.Item label="交易Id" dataIndex="transaction_id" />
<ProDescriptions.Item label="IP" dataIndex="customer_id_address" />
<ProDescriptions.Item label="设备" dataIndex="device_type" />
@ -911,7 +915,7 @@ const Detail: React.FC<{
);
}}
/>
<ProDescriptions.Item
<ProDescriptions.Item
label="换货"
span={3}
render={(_, record) => {
@ -1395,16 +1399,16 @@ const Shipping: React.FC<{
<ProFormList
label="发货产品"
name="sales"
// rules={[
// {
// required: true,
// message: '至少需要一个商品',
// validator: (_, value) =>
// value && value.length > 0
// ? Promise.resolve()
// : Promise.reject('至少需要一个商品'),
// },
// ]}
// rules={[
// {
// required: true,
// message: '至少需要一个商品',
// validator: (_, value) =>
// value && value.length > 0
// ? Promise.resolve()
// : Promise.reject('至少需要一个商品'),
// },
// ]}
>
<ProForm.Group>
<ProFormSelect
@ -1976,14 +1980,14 @@ const SalesChange: React.FC<{
});
if (!success || !data) return {};
data.sales = data.sales?.reduce((acc: API.OrderSale[], cur: API.OrderSale) => {
let idx = acc.findIndex((v: any) => v.productId === cur.productId);
if (idx === -1) {
acc.push(cur);
} else {
acc[idx].quantity += cur.quantity;
}
return acc;
},
let idx = acc.findIndex((v: any) => v.productId === cur.productId);
if (idx === -1) {
acc.push(cur);
} else {
acc[idx].quantity += cur.quantity;
}
return acc;
},
[],
);
@ -1997,13 +2001,12 @@ const SalesChange: React.FC<{
return { ...data};
}}
onFinish={async (formData: any) => {
const { sales,items } = formData;
const data ={sales,items }
const res = await ordercontrollerUpdateorderitems({orderId:id}, data);
const { sales } = formData;
const res = await ordercontrollerUpdateorderitems({ orderId: id }, sales);
if (!res.success) {
message.error(`更新货物信息失败: ${res.message}`);
return false;
}
}
message.success('更新成功')
detailRef?.current?.reload();
return true;
@ -2067,7 +2070,7 @@ const SalesChange: React.FC<{
<ProFormSelect
params={{ }}
params={{}}
request={async ({ keyWords }) => {
try {
const { data } = await productcontrollerSearchproducts({