diff --git a/apps/src/router/routes/modules/operate.ts b/apps/src/router/routes/modules/operate.ts index 10152d9..a3ba18b 100644 --- a/apps/src/router/routes/modules/operate.ts +++ b/apps/src/router/routes/modules/operate.ts @@ -71,12 +71,6 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/operate/order-abnormal.vue'), meta: { title: '异常订单' }, }, - { - name: 'OperateOrderDetails', - path: 'order/details', - component: () => import('#/views/operate/order-details.vue'), - meta: { title: '订单详情' }, - }, { name: 'OperateReimburse', path: 'reimburse', diff --git a/apps/src/router/routes/modules/payment.ts b/apps/src/router/routes/modules/payment.ts index 43517bc..e9a8992 100644 --- a/apps/src/router/routes/modules/payment.ts +++ b/apps/src/router/routes/modules/payment.ts @@ -9,8 +9,15 @@ const routes: RouteRecordRaw[] = [ }, name: 'PaymentManager', path: '/payment/manager', - redirect: '/payment/manager/country', + redirect: '/payment/manager/order/list', children: [ + { + name: 'PaymentOrderList', + path: 'order/list', + alias: '/operate/manager/order/details', + component: () => import('#/views/operate/order-details.vue'), + meta: { title: '订单列表' }, + }, { name: 'PayCountry', path: 'country', diff --git a/apps/src/views/operate/order-details.vue b/apps/src/views/operate/order-details.vue index 8039b15..d068d08 100644 --- a/apps/src/views/operate/order-details.vue +++ b/apps/src/views/operate/order-details.vue @@ -39,7 +39,7 @@ import { import OrderDetailsDrawer from './components/order-details-drawer.vue'; import UserProfileLink from './components/user-profile-link.vue'; -defineOptions({ name: 'OperateOrderDetails' }); +defineOptions({ name: 'PaymentOrderList' }); const router = useRouter(); const accessStore = useAccessStore(); @@ -89,16 +89,6 @@ const columns = [ { dataIndex: 'actions', key: 'actions', title: '操作', width: 100, fixed: 'right' as const }, ]; -watch( - sysOriginOptions, - (options) => { - if (sysOrigins.value.length === 0 && options.length > 0) { - sysOrigins.value = [String(options[0]?.value || '')]; - } - }, - { immediate: true }, -); - watch( rangeDate, (value) => { @@ -112,7 +102,7 @@ function getEffectiveSysOrigin() { if (sysOrigins.value.length > 0) { return sysOrigins.value.join(','); } - return sysOriginOptions.value.map((item) => String(item.value)).join(','); + return ''; } async function loadRegions() { @@ -125,7 +115,7 @@ async function loadData(reset = false) { query.lastId = ''; notMore.value = false; } - query.sysOrigins = getEffectiveSysOrigin(); + const params = buildQueryParams(); if (reset) { loading.value = true; } else { @@ -133,8 +123,8 @@ async function loadData(reset = false) { } try { const [result, amountResult] = await Promise.all([ - listInAppPurchase({ ...query }), - getOrderAmount({ ...query }), + listInAppPurchase(params), + getOrderAmount(params), ]); const current = result || []; list.value = reset ? current : [...list.value, ...current]; @@ -147,6 +137,18 @@ async function loadData(reset = false) { } } +function buildQueryParams() { + query.sysOrigins = getEffectiveSysOrigin(); + return Object.fromEntries( + Object.entries({ ...query }).filter(([, value]) => { + if (Array.isArray(value)) { + return value.length > 0; + } + return value !== '' && value !== undefined && value !== null; + }), + ); +} + function handleSearch() { void loadData(true); } @@ -170,7 +172,7 @@ void loadData(true);