build: 添加 code-inspector-plugin 依赖及配置
添加 code-inspector-plugin 作为开发依赖,并在 webpack 配置中启用该插件以增强代码检查能力 refactor(Order/List): 更新退款相关状态标签为更简洁的表达 refund_approved 已退款 refund_cancelled 已完成 chore: 在.gitignore中添加docs目录 忽略生成的文档目录以避免将其提交到版本控制
This commit is contained in:
parent
e5794c3d25
commit
972e127dc2
|
|
@ -14,3 +14,5 @@
|
||||||
/package-lock.json
|
/package-lock.json
|
||||||
/yarn.lock
|
/yarn.lock
|
||||||
*.yaml
|
*.yaml
|
||||||
|
#
|
||||||
|
/docs
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ const isDev = process.env.NODE_ENV === 'development';
|
||||||
const UMI_APP_API_URL = isDev
|
const UMI_APP_API_URL = isDev
|
||||||
? 'http://localhost:7001'
|
? 'http://localhost:7001'
|
||||||
: 'https://api.yoone.ca';
|
: 'https://api.yoone.ca';
|
||||||
|
import { codeInspectorPlugin } from 'code-inspector-plugin';
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
hash: true,
|
hash: true,
|
||||||
|
|
@ -18,6 +19,13 @@ export default defineConfig({
|
||||||
define: {
|
define: {
|
||||||
UMI_APP_API_URL,
|
UMI_APP_API_URL,
|
||||||
},
|
},
|
||||||
|
chainWebpack(config) {
|
||||||
|
config.plugin('code-inspector-plugin').use(
|
||||||
|
codeInspectorPlugin({
|
||||||
|
bundler: 'webpack',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
},
|
||||||
routes: [
|
routes: [
|
||||||
{ path: '/', redirect: '/home' },
|
{ path: '/', redirect: '/home' },
|
||||||
{ name: '追踪', path: '/track', component: './Track', layout: false },
|
{ name: '追踪', path: '/track', component: './Track', layout: false },
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "^18.0.33",
|
"@types/react": "^18.0.33",
|
||||||
"@types/react-dom": "^18.0.11",
|
"@types/react-dom": "^18.0.11",
|
||||||
|
"code-inspector-plugin": "^1.2.10",
|
||||||
"husky": "^9",
|
"husky": "^9",
|
||||||
"lint-staged": "^13.2.0",
|
"lint-staged": "^13.2.0",
|
||||||
"prettier": "^2.8.7",
|
"prettier": "^2.8.7",
|
||||||
|
|
|
||||||
|
|
@ -128,12 +128,15 @@ const ListPage: React.FC = () => {
|
||||||
label: '已申请退款',
|
label: '已申请退款',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
||||||
key: 'refund_approved',
|
key: 'refund_approved',
|
||||||
label: '退款申请已通过',
|
label: "已退款",
|
||||||
|
// label: '退款申请已通过',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'refund_cancelled',
|
key: 'refund_cancelled',
|
||||||
label: '已取消退款',
|
label: "已完成"
|
||||||
|
// label: '已取消退款',
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// key: 'pending_refund',
|
// key: 'pending_refund',
|
||||||
|
|
@ -295,7 +298,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" />
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
|
|
@ -425,7 +428,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} />,
|
||||||
|
|
@ -769,16 +772,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" />
|
||||||
|
|
@ -1395,16 +1399,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
|
||||||
|
|
@ -1976,14 +1980,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;
|
||||||
},
|
},
|
||||||
[],
|
[],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -1997,9 +2001,8 @@ const SalesChange: React.FC<{
|
||||||
return { ...data};
|
return { ...data};
|
||||||
}}
|
}}
|
||||||
onFinish={async (formData: any) => {
|
onFinish={async (formData: any) => {
|
||||||
const { sales,items } = formData;
|
const { sales } = formData;
|
||||||
const data ={sales,items }
|
const res = await ordercontrollerUpdateorderitems({ orderId: id }, sales);
|
||||||
const res = await ordercontrollerUpdateorderitems({orderId:id}, data);
|
|
||||||
if (!res.success) {
|
if (!res.success) {
|
||||||
message.error(`更新货物信息失败: ${res.message}`);
|
message.error(`更新货物信息失败: ${res.message}`);
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -2067,7 +2070,7 @@ const SalesChange: React.FC<{
|
||||||
|
|
||||||
|
|
||||||
<ProFormSelect
|
<ProFormSelect
|
||||||
params={{ }}
|
params={{}}
|
||||||
request={async ({ keyWords }) => {
|
request={async ({ keyWords }) => {
|
||||||
try {
|
try {
|
||||||
const { data } = await productcontrollerSearchproducts({
|
const { data } = await productcontrollerSearchproducts({
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue