From 9c5caa1aea469c3853d98a5e85ac08d1644335b0 Mon Sep 17 00:00:00 2001 From: tikkhun Date: Tue, 25 Nov 2025 11:09:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E8=AE=A2=E5=8D=95):=20=E6=B8=85?= =?UTF-8?q?=E7=90=86=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除合并冲突标记和重复代码，统一使用相对路径导入组件 简化订单详情逻辑，直接复用OrderDetailDrawer组件 --- .../Subscription/Orders/RelatedOrders.tsx | 18 --- src/pages/Subscription/Orders/index.tsx | 141 ------------------ 2 files changed, 159 deletions(-) diff --git a/src/pages/Subscription/Orders/RelatedOrders.tsx b/src/pages/Subscription/Orders/RelatedOrders.tsx index a0c06b1..57470ab 100644 --- a/src/pages/Subscription/Orders/RelatedOrders.tsx +++ b/src/pages/Subscription/Orders/RelatedOrders.tsx @@ -7,18 +7,8 @@ dayjs.extend(relativeTime); /** * RelatedOrders 表格组件 -<<<<<<< HEAD -<<<<<<< HEAD * 用于展示订单详情中的关联数据(订阅/订单)，按统一表格样式渲染 * 中文注释:本组件将订阅与订单统一归一化为五列展示，便于快速浏览 -======= - * 用于展示订单详情中的关联数据（订阅/订单），按统一表格样式渲染 - * 中文注释：本组件将订阅与订单统一归一化为五列展示，便于快速浏览 ->>>>>>> d98e843 (refactor(订单): 重构订单详情抽屉组件并移动相关文件) -======= - * 用于展示订单详情中的关联数据(订阅/订单)，按统一表格样式渲染 - * 中文注释:本组件将订阅与订单统一归一化为五列展示，便于快速浏览 ->>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式) */ const RelatedOrders: React.FC<{ data?: any[] }> = ({ data = [] }) => { const rows = (Array.isArray(data) ? data : []).map((it: any) => { @@ -39,15 +29,7 @@ const RelatedOrders: React.FC<{ data?: any[] }> = ({ data = [] }) => { return (
-<<<<<<< HEAD -<<<<<<< HEAD {/* 表头(英文文案，符合国际化默认英文的要求) */} -======= - {/* 表头（英文文案，符合国际化默认英文的要求） */} ->>>>>>> d98e843 (refactor(订单): 重构订单详情抽屉组件并移动相关文件) -======= - {/* 表头(英文文案，符合国际化默认英文的要求) */} ->>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式)
订单编号
关系
diff --git a/src/pages/Subscription/Orders/index.tsx b/src/pages/Subscription/Orders/index.tsx index 488b9de..bc4a9bb 100644 --- a/src/pages/Subscription/Orders/index.tsx +++ b/src/pages/Subscription/Orders/index.tsx @@ -2,30 +2,11 @@ import React, { useRef, useState } from 'react'; import { PageContainer } from '@ant-design/pro-layout'; import type { ProColumns, ActionType, ProTableProps } from '@ant-design/pro-components'; import { ProTable } from '@ant-design/pro-components'; -<<<<<<< HEAD -<<<<<<< HEAD import { App, Tag, Button } from 'antd'; import dayjs from 'dayjs'; import { ordercontrollerGetorders } from '@/servers/api/order'; import OrderDetailDrawer from './OrderDetailDrawer'; -<<<<<<< HEAD import { sitecontrollerAll } from '@/servers/api/site'; -======= -import { App, Tag, Button, Drawer, List } from 'antd'; -======= -import { App, Tag, Button } from 'antd'; ->>>>>>> 1f4128f (refactor(订单): 抽离订单详情抽屉为独立组件并复用) -import dayjs from 'dayjs'; -import { ordercontrollerGetorders } from '@/servers/api/order'; -import OrderDetailDrawer from '@/pages/Order/List/OrderDetailDrawer'; -======= ->>>>>>> 502cd0c (refactor(Subscription/Orders): 使用相对路径导入OrderDetailDrawer组件) -import { sitecontrollerAll } from '@/servers/api/site'; -<<<<<<< HEAD -import { request } from 'umi'; ->>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面) -======= ->>>>>>> 43be89b (feat(订单列表): 添加关联订单组件并优化订阅显示) interface OrderItemRow { id: number; @@ -41,31 +22,11 @@ interface OrderItemRow { const OrdersPage: React.FC = () => { const actionRef = useRef(); const { message } = App.useApp(); -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD // 抽屉状态:改为复用订单详情抽屉组件 -======= - // 抽屉状态：改为复用订单详情抽屉组件 ->>>>>>> 1f4128f (refactor(订单): 抽离订单详情抽屉为独立组件并复用) -======= - // 抽屉状态:改为复用订单详情抽屉组件 ->>>>>>> 3ac2724 (style: 统一中文标点符号为英文格式) const [detailOpen, setDetailOpen] = useState(false); const [detailRecord, setDetailRecord] = useState(null); const [detailOrderId, setDetailOrderId] = useState(null); const Noop: React.FC = () => null; -<<<<<<< HEAD -======= - // 抽屉状态：用于展示与订阅相关的订单详情（含行项目meta） - const [drawerOpen, setDrawerOpen] = useState(false); - const [drawerTitle, setDrawerTitle] = useState('订阅关联'); - const [drawerItems, setDrawerItems] = useState([]); - const [drawerMeta, setDrawerMeta] = useState([]); - const [isSubscription, setIsSubscription] = useState(false); ->>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面) -======= ->>>>>>> 1f4128f (refactor(订单): 抽离订单详情抽屉为独立组件并复用) const columns: ProColumns[] = [ { @@ -123,54 +84,10 @@ const OrdersPage: React.FC = () => { render: (_, row) => (
} - dataSource={drawerItems} - renderItem={(item: any) => ( - - -
- {(Array.isArray(item?.meta_data) ? item.meta_data : []).map((m: any) => ( - {`${m?.key}: ${m?.value}`} - ))} -
- - )} - /> - {/* 订单级元数据 */} - 订单元数据
} - dataSource={drawerMeta} - renderItem={(m: any) => ( - - {`${m?.key}: ${m?.value}`} - - )} - /> - ->>>>>>> 90ea0f5 (feat(订单): 添加关联订单显示功能并创建订单商品和订阅订单页面) -======= - /> - )} ->>>>>>> 1f4128f (refactor(订单): 抽离订单详情抽屉为独立组件并复用) ); };