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

Merged
longbot merged 9 commits from zksu/WEB:main into main 2025-10-14 06:54:24 +00:00
4 changed files with 52 additions and 38 deletions
Showing only changes of commit 972e127dc2 - Show all commits

2
.gitignore vendored
View File

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

View File

@ -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 },

View File

@ -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",

View File

@ -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',
@ -771,7 +774,8 @@ 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="联系电话" span={3} <ProDescriptions.Item label="联系电话" span={3}
render={(_, record) => { return ( render={(_, record) => {
return (
<div> <div>
<span> <span>
{record?.shipping?.phone || record?.billing?.phone || '-'} {record?.shipping?.phone || record?.billing?.phone || '-'}
@ -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;