From 8ae1dc51cfc4903400e68311b37bfccf82d4f15c Mon Sep 17 00:00:00 2001
From: "925116093-qq.com" <925116093@qq.com>
Date: Tue, 12 Aug 2025 18:03:14 +0800
Subject: [PATCH] 2025008071805

---
 ...sOrder主订单分组功能完善说明.md |  191 +
 GoodsOrder新增订单功能完善说明.md   |  174 +
 .../GoodsOrder分组显示修改说明.md     |  133 +
 .../GoodsOrder功能改进说明.md           |  246 ++
 UserSecondaryCard功能完善说明.md        |  125 +
 .../controller/UsersPayBeforController.java   |   32 +-
 .../system/controllerUtil/OrderUtil.java      |   42 +
 .../system/controllerUtil/WechatPayUtil.java  |    2 +-
 ruoyi-ui/public/index.html                    |    2 +-
 ruoyi-ui/src/assets/styles/index.scss         |    4 +-
 .../src/components/AddressSelector/index.js   |    3 +
 .../src/components/AddressSelector/index.vue  |  755 ++++
 .../views/system/GoodsOrder/AddEditDialog.vue |  212 ++
 .../system/GoodsOrder/AfterSaleDialog.vue     |  184 +
 .../system/GoodsOrder/ExcelImportDialog.vue   |  139 +
 .../system/GoodsOrder/ImportResultDialog.vue  |  126 +
 .../system/GoodsOrder/PrePaymentDialog.vue    |   94 +
 .../system/GoodsOrder/RefundAmountDialog.vue  |  278 ++
 .../system/GoodsOrder/RejectReasonDialog.vue  |   77 +
 .../system/GoodsOrder/ShipmentDialog.vue      |  360 ++
 .../src/views/system/GoodsOrder/details.vue   | 1148 ++++++
 .../src/views/system/GoodsOrder/index.vue     | 3186 +++--------------
 接单记录显示修复说明.md             |  147 +
 订单处理功能增强说明.md             |  129 +
 订单处理功能实现说明.md             |  117 +
 25 files changed, 5200 insertions(+), 2706 deletions(-)
 create mode 100644 GoodsOrder主订单分组功能完善说明.md
 create mode 100644 GoodsOrder新增订单功能完善说明.md
 create mode 100644 RuoYi-Vue-master/GoodsOrder分组显示修改说明.md
 create mode 100644 RuoYi-Vue-master/GoodsOrder功能改进说明.md
 create mode 100644 UserSecondaryCard功能完善说明.md
 create mode 100644 ruoyi-ui/src/components/AddressSelector/index.js
 create mode 100644 ruoyi-ui/src/components/AddressSelector/index.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/AddEditDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/AfterSaleDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/ExcelImportDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/ImportResultDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/PrePaymentDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/RefundAmountDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/RejectReasonDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/ShipmentDialog.vue
 create mode 100644 ruoyi-ui/src/views/system/GoodsOrder/details.vue
 create mode 100644 接单记录显示修复说明.md
 create mode 100644 订单处理功能增强说明.md
 create mode 100644 订单处理功能实现说明.md

diff --git a/GoodsOrder主订单分组功能完善说明.md b/GoodsOrder主订单分组功能完善说明.md
new file mode 100644
index 0000000..96a64d3
--- /dev/null
+++ b/GoodsOrder主订单分组功能完善说明.md
@@ -0,0 +1,191 @@
+# GoodsOrder主订单分组功能完善说明
+
+## 功能概述
+
+本次更新完善了GoodsOrder页面的主订单分组功能，实现了基于`main_order_id`的分组显示和操作，支持多个商品的主订单管理。**最新优化：通过调用`IGoodsOrderService`的`selectGoodsOrderList`方法来查询主订单下的所有订单，实现更高效的数据处理和展示。** **商品信息优化：通过调用`IServiceGoodsService`来查询`product_id`，获取商品的详细信息，包括商品名称、图片、分类、描述等。**
+
+## 主要改进内容
+
+### 1. 主页面商品列显示优化
+
+- **商品汇总显示**：主订单行显示"主订单 (N个商品)"标签
+- **订单统计**：显示"N个订单号"和"总数量: X"的统计信息
+- **商品预览**：显示前3个商品名称，超出部分显示"+N个"
+- **查看详情按钮**：点击可查看完整的订单详情
+
+### 2. 修改对话框重构
+
+#### 2.1 主订单信息卡片
+- 主订单号、用户信息、收货人、联系电话、收货地址等基本信息
+- 支持编辑和修改
+
+#### 2.2 子订单列表卡片
+- 显示所有子订单的详细信息
+- 支持添加、删除、修改子订单
+- 实时计算小计和汇总数据
+- 每个子订单可独立设置状态
+
+#### 2.3 订单汇总卡片
+- 子订单数量统计
+- 总数量和总金额计算
+- 支付金额和抵扣金额设置
+- 支付时间和备注信息
+
+### 3. 发货对话框增强
+
+#### 3.1 主订单信息展示
+- 显示主订单的基本信息
+- 收货人、联系电话、收货地址等
+
+#### 3.2 发货方式选择
+- **单个发货**：传统的单个订单发货
+- **批量发货**：支持主订单下多个商品同时发货
+
+#### 3.3 批量发货功能
+- 统一的快递公司和发货时间设置
+- 每个商品独立填写快递单号
+- 实时验证快递单号填写状态
+- 支持批量提交发货
+
+### 4. 数据处理逻辑优化
+
+#### 4.1 分组数据处理
+- `processGroupedData()`方法重构，支持异步API调用
+- 通过`getGoodsOrderByMainOrderId()`API获取主订单下的所有子订单
+- 支持主订单行和子订单的关联
+- 自动计算汇总数据（数量、金额等）
+- 包含错误处理和备选方案
+
+#### 4.2 子订单管理
+- `handleAddSubOrder()`：添加新子订单
+- `handleDeleteSubOrder()`：删除子订单
+- `handleSubOrderChange()`：处理子订单数据变化
+- `calculateSubOrdersSummary()`：计算汇总数据
+
+#### 4.3 发货处理
+- `submitSingleShipForm()`：单个发货提交
+- `submitBatchShipForm()`：批量发货提交
+- 支持不同发货模式的验证和处理
+
+### 5. API调用优化 ⭐ **新增**
+
+#### 5.1 新增API方法
+- `getGoodsOrderByMainOrderId(mainOrderId)`：根据主订单ID查询所有子订单
+- 直接调用后端`IGoodsOrderService.selectGoodsOrderList`方法
+- 获取最新、最准确的主订单数据
+
+#### 5.2 异步数据处理
+- `processGroupedData()`：异步获取主订单分组数据
+- `loadMainOrderData()`：异步加载主订单修改数据
+- `handleViewDetails()`：异步获取订单详情数据
+- `handleShip()`：异步获取发货相关数据
+
+#### 5.3 错误处理和备选方案
+- API调用失败时自动降级到原有逻辑
+- 完善的错误提示和日志记录
+- 确保系统稳定性和用户体验
+
+### 6. 商品信息优化 ⭐ **最新新增**
+
+#### 6.1 后端商品信息集成
+- 在`getGoodsOrderByMainOrderId`方法中集成`IServiceGoodsService`
+- 自动为每个订单补充商品详细信息（名称、图片、分类、描述等）
+- 支持批量获取商品信息，提升性能
+
+#### 6.2 新增商品信息API
+- `getProductInfo(productId)`：根据商品ID获取单个商品详细信息
+- `getBatchProductInfo(productIds)`：批量获取多个商品信息
+- 支持商品图片、分类、描述等完整信息的获取
+
+#### 6.3 前端商品信息展示
+- 商品图片显示：通过API获取真实商品图片
+- 商品分类标签：显示商品分类信息
+- 商品描述：显示商品详细描述
+- 商品价格：显示最新商品价格信息
+
+## 技术实现特点
+
+### 1. 响应式设计
+- 支持不同屏幕尺寸的显示
+- 移动端友好的界面布局
+
+### 2. 数据验证
+- 表单验证规则完善
+- 实时数据验证和提示
+
+### 3. 用户体验
+- 直观的卡片式布局
+- 清晰的信息层次结构
+- 友好的操作反馈
+
+### 4. 性能优化
+- **API调用优化**：直接获取主订单下的所有子订单
+- **数据缓存策略**：减少重复API调用
+- **异步处理**：提升页面响应速度
+- **错误降级**：确保功能可用性
+- **批量查询**：支持批量获取商品信息，减少网络请求
+
+### 5. 数据准确性 ⭐ **重要改进**
+- **实时数据获取**：每次操作都获取最新的主订单数据
+- **完整子订单信息**：通过API获取主订单下的所有子订单
+- **数据一致性**：确保显示的数据与数据库保持同步
+- **商品信息完整性**：通过`IServiceGoodsService`获取最新商品信息
+
+## 使用方法
+
+### 1. 查看主订单
+- 主页面按`main_order_id`分组显示
+- 点击"查看详情"按钮查看完整信息
+- **自动获取最新的主订单数据**
+- **显示完整的商品信息（图片、分类、描述等）**
+
+### 2. 修改主订单
+- 点击"修改"按钮进入编辑模式
+- 支持修改主订单信息和子订单列表
+- 实时计算汇总数据
+- **自动同步最新的子订单信息**
+- **显示最新的商品信息**
+
+### 3. 批量发货
+- 选择主订单行，点击"发货"
+- 选择"批量发货"模式
+- 填写统一的快递信息
+- 为每个商品填写快递单号
+- 提交批量发货
+- **自动获取最新的发货数据**
+- **显示完整的商品信息**
+
+## 注意事项
+
+1. **数据一致性**：修改主订单时，子订单数据会同步更新
+2. **权限控制**：确保用户有相应的操作权限
+3. **数据验证**：批量发货前验证所有快递单号已填写
+4. **错误处理**：完善的错误提示和异常处理
+5. **API依赖**：需要后端提供`getByMainOrderId`接口支持
+6. **网络稳定性**：API调用失败时会自动降级到原有逻辑
+7. **商品服务依赖**：需要`IServiceGoodsService`支持商品信息查询
+8. **性能考虑**：批量获取商品信息时注意数据量大小
+
+## 后续优化建议
+
+1. **批量操作API**：后端支持真正的批量发货API
+2. **数据导入导出**：支持主订单数据的批量导入导出
+3. **操作日志**：记录主订单的操作历史
+4. **状态管理**：更完善的主订单状态管理机制
+5. **缓存策略**：实现智能的数据缓存机制
+6. **实时更新**：支持WebSocket实时数据推送
+7. **商品信息缓存**：实现商品信息的本地缓存，减少重复API调用
+8. **图片懒加载**：实现商品图片的懒加载，提升页面性能
+
+## 总结
+
+本次更新大幅提升了GoodsOrder页面的功能性和用户体验，实现了真正的主订单分组管理，支持多个商品的统一操作。**最重要的是，通过API调用优化和商品信息集成，实现了更高效、更准确、更丰富的数据处理，为业务人员提供了更可靠、更直观的工作工具。**
+
+### 主要优势：
+- ✅ **数据准确性**：通过API直接获取最新数据
+- ✅ **性能提升**：减少前端数据处理，提升响应速度
+- ✅ **功能完善**：支持主订单的完整生命周期管理
+- ✅ **用户体验**：直观的界面和流畅的操作流程
+- ✅ **系统稳定**：完善的错误处理和降级方案
+- ✅ **商品信息丰富**：显示完整的商品图片、分类、描述等信息
+- ✅ **数据完整性**：确保订单和商品信息的一致性
diff --git a/GoodsOrder新增订单功能完善说明.md b/GoodsOrder新增订单功能完善说明.md
new file mode 100644
index 0000000..f2d7c48
--- /dev/null
+++ b/GoodsOrder新增订单功能完善说明.md
@@ -0,0 +1,174 @@
+# GoodsOrder新增订单功能完善说明
+
+## 功能概述
+
+本次更新完善了GoodsOrder页面的新增订单功能，实现了基于用户选择、服务商品选择、用户地址选择和预约时间设置的订单创建流程。新增订单功能现在更加符合实际业务需求，支持服务类订单的创建。
+
+## 主要改进内容
+
+### 1. 新增订单对话框重构
+
+#### 1.1 基本信息卡片
+- **主订单号**：系统自动生成，不可编辑
+- **用户选择**：通过`user-select`组件选择用户（必填）
+- **服务商品**：选择服务商品，显示商品名称和价格（必填）
+- **预约时间**：选择预约时间，支持日期时间选择器（必填）
+- **数量**：设置服务数量，支持1-999范围（必填）
+- **单价**：系统自动获取商品价格，不可编辑
+
+#### 1.2 收货信息卡片
+- **收货人**：输入收货人姓名（必填）
+- **联系电话**：输入联系电话（必填）
+- **收货地址**：从用户地址列表中选择（必填）
+- **详细地址**：补充详细地址信息
+- **刷新地址**：刷新用户地址列表按钮
+
+#### 1.3 订单汇总卡片
+- **商品数量**：显示选择的服务数量
+- **商品单价**：显示服务商品单价
+- **总金额**：自动计算总金额（数量 × 单价）
+- **订单状态**：显示为"待支付"状态
+- **备注**：输入订单备注信息
+
+### 2. 表单验证规则完善
+
+#### 2.1 必填字段验证
+- `uid`：用户选择验证
+- `productId`：服务商品选择验证
+- `appointmentTime`：预约时间验证
+- `name`：收货人姓名验证
+- `phone`：联系电话验证
+- `addressId`：收货地址选择验证
+- `address`：详细地址验证
+- `num`：数量验证
+
+#### 2.2 验证触发方式
+- 选择类字段：`change`事件触发
+- 输入类字段：`blur`事件触发
+
+### 3. 数据处理逻辑优化
+
+#### 3.1 商品选择处理
+- `handleProductSelectChange()`：处理商品选择变化
+- 自动设置商品价格和名称
+- 实时计算总金额
+
+#### 3.2 地址选择处理
+- `handleAddressSelectChange()`：处理地址选择变化
+- 自动填充收货人、联系电话、详细地址
+- 支持地址列表刷新
+
+#### 3.3 价格计算
+- `calculateTotalPrice()`：自动计算总金额
+- 数量变化时实时更新总金额
+
+### 4. 新增订单提交逻辑
+
+#### 4.1 默认值设置
+- `type: 1`：设置为服务项目类型
+- `status: 1`：设置为待支付状态
+- `orderId`：使用主订单号作为订单号
+- `payPrice`：支付金额等于总金额
+- `createdAt/updatedAt`：自动设置创建和更新时间
+
+#### 4.2 错误处理
+- 完善的错误提示和日志记录
+- 提交状态管理（loading状态）
+- 异常情况的用户友好提示
+
+### 5. 用户体验优化
+
+#### 5.1 界面布局
+- 卡片式布局，信息层次清晰
+- 必填字段标识（红色星号）
+- 响应式设计，支持不同屏幕尺寸
+
+#### 5.2 交互优化
+- 选择用户后自动加载地址列表
+- 选择商品后自动设置价格
+- 选择地址后自动填充收货信息
+- 数量变化实时计算总金额
+
+#### 5.3 状态管理
+- 提交按钮loading状态
+- 表单验证实时反馈
+- 成功/失败消息提示
+
+## 技术实现特点
+
+### 1. 组件化设计
+- 使用`user-select`组件选择用户
+- 使用`el-select`组件选择商品和地址
+- 使用`el-date-picker`组件选择预约时间
+
+### 2. 数据绑定
+- 双向数据绑定（v-model）
+- 计算属性自动更新
+- 事件驱动数据变化
+
+### 3. 表单验证
+- Element UI表单验证规则
+- 自定义验证器
+- 实时验证反馈
+
+### 4. 状态管理
+- 组件内部状态管理
+- 异步操作状态控制
+- 错误状态处理
+
+## 使用方法
+
+### 1. 新增订单流程
+1. 点击"新增"按钮
+2. 选择用户（必填）
+3. 选择服务商品（必填）
+4. 设置预约时间（必填）
+5. 设置服务数量（必填）
+6. 选择收货地址（必填）
+7. 填写收货人信息（必填）
+8. 填写联系电话（必填）
+9. 补充详细地址（必填）
+10. 添加备注信息（可选）
+11. 点击"提交订单"按钮
+
+### 2. 数据自动填充
+- 选择用户后，系统自动加载该用户的地址列表
+- 选择商品后，系统自动设置商品价格和名称
+- 选择地址后，系统自动填充收货人、电话、地址信息
+- 修改数量后，系统自动计算总金额
+
+### 3. 表单验证
+- 所有必填字段都有红色星号标识
+- 提交时自动验证所有必填字段
+- 验证失败时显示具体错误信息
+
+## 注意事项
+
+1. **用户选择**：必须先选择用户才能加载地址列表
+2. **商品选择**：选择商品后会自动设置价格，不可手动修改
+3. **预约时间**：不能选择过去的日期时间
+4. **数量限制**：数量范围限制在1-999之间
+5. **地址关联**：地址必须与选择的用户关联
+6. **订单状态**：新增订单默认为"待支付"状态
+
+## 后续优化建议
+
+1. **商品库存**：添加商品库存检查
+2. **价格计算**：支持优惠券、会员折扣等价格计算
+3. **时间冲突**：检查预约时间是否与其他订单冲突
+4. **地址验证**：添加地址格式验证
+5. **批量创建**：支持批量创建多个订单
+6. **草稿保存**：支持保存订单草稿
+7. **模板功能**：支持订单模板快速创建
+
+## 总结
+
+本次更新大幅提升了GoodsOrder页面的新增订单功能，实现了：
+
+- ✅ **完整的订单创建流程**：用户选择 → 商品选择 → 时间设置 → 地址选择 → 信息确认
+- ✅ **智能的数据填充**：自动填充商品价格、用户地址等信息
+- ✅ **完善的表单验证**：必填字段验证、格式验证、关联验证
+- ✅ **友好的用户界面**：清晰的布局、直观的操作、实时的反馈
+- ✅ **稳定的数据处理**：完善的错误处理、状态管理、异常处理
+
+新增订单功能现在更加符合实际业务需求，为业务人员提供了便捷、高效、可靠的订单创建工具。
diff --git a/RuoYi-Vue-master/GoodsOrder分组显示修改说明.md b/RuoYi-Vue-master/GoodsOrder分组显示修改说明.md
new file mode 100644
index 0000000..1bdf1d5
--- /dev/null
+++ b/RuoYi-Vue-master/GoodsOrder分组显示修改说明.md
@@ -0,0 +1,133 @@
+# GoodsOrder 页面分组显示修改说明
+
+## 修改概述
+
+根据业务需求，将商品订单页面的数据显示修改为按 `main_order_id` 分组查询显示。主要修改包括前端页面显示逻辑和后端数据查询逻辑的调整。
+
+## 主要修改内容
+
+### 1. 前端页面修改 (`ruoyi-ui/src/views/system/GoodsOrder/index.vue`)
+
+#### 1.1 表格结构调整
+- 添加了"主订单号"列，作为分组的主要标识
+- 修改了商品列显示逻辑，支持显示同一主订单下的多个商品
+- 使用 `:span-method="objectSpanMethod"` 实现单元格合并
+
+#### 1.2 数据结构调整
+- 新增 `groupedGoodsOrderList` 数据属性，用于存储分组后的数据
+- 新增 `processGroupedData()` 方法，处理原始数据的分组逻辑
+- 支持按 `main_order_id` 分组，计算汇总数据（总数量、总金额、支付金额、抵扣金额）
+
+#### 1.3 新增功能
+- 添加"查看详情"按钮，用于查看主订单下的所有商品明细
+- 新增订单详情对话框，显示主订单信息和商品明细表格
+- 支持在主订单详情中直接操作单个商品订单
+
+#### 1.4 操作逻辑优化
+- 修改 `handleSelectionChange` 方法，支持选择主订单时自动选择所有子订单
+- 修改 `handleDelete` 方法，支持删除整个主订单或单个商品订单
+- 优化表格行样式，主订单行使用特殊样式标识
+
+### 2. 后端逻辑调整
+
+#### 2.1 数据查询
+- 后端已实现 `selectGoodsOrdergrouBymAIDList` 方法，按 `main_order_id` 分组查询
+- 使用 `GROUP BY main_order_id` 进行数据分组
+
+#### 2.2 权限控制
+- 移除了 `downloadTemplate` 方法的权限注解，解决模板下载的401错误
+
+## 技术实现细节
+
+### 1. 数据分组逻辑
+```javascript
+processGroupedData() {
+  const grouped = {};
+  this.GoodsOrderList.forEach(item => {
+    if (!grouped[item.mainOrderId]) {
+      grouped[item.mainOrderId] = [];
+    }
+    grouped[item.mainOrderId].push(item);
+  });
+  
+  // 创建支持合并行的扁平化数据结构
+  const flatList = [];
+  Object.keys(grouped).forEach(mainOrderId => {
+    const items = grouped[mainOrderId];
+    // 计算汇总数据并创建主行和子行
+  });
+}
+```
+
+### 2. 单元格合并
+```javascript
+objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+  if (columnIndex === 1) { // 主订单号列
+    if (row.isMainRow) {
+      return { rowspan: row.rowspan, colspan: 1 };
+    } else {
+      return { rowspan: 0, colspan: 0 };
+    }
+  }
+  return { rowspan: 1, colspan: 1 };
+}
+```
+
+### 3. 商品显示优化
+```html
+<el-table-column label="商品" align="center" prop="productName">
+  <template slot-scope="scope">
+    <div v-if="scope.row.isMainRow">
+      <div v-for="(product, index) in scope.row.children" :key="index">
+        <el-tag size="mini" type="info">{{ product.productName }}</el-tag>
+        <span>x{{ product.num }}</span>
+      </div>
+    </div>
+    <span v-else>{{ scope.row.productName }}</span>
+  </template>
+</el-table-column>
+```
+
+## 业务逻辑说明
+
+### 1. 分组显示规则
+- 同一 `main_order_id` 下的所有商品订单合并显示为一行
+- 主行显示汇总信息（总数量、总金额等）
+- 支持展开查看主订单下的所有商品明细
+
+### 2. 操作权限
+- 修改、删除、发货等操作支持在主订单和单个商品订单级别进行
+- 选择主订单时自动选择所有子订单
+- 删除主订单时删除所有相关子订单
+
+### 3. 数据排序
+- 优先显示待处理订单（状态为2或售后状态为1、4）
+- 按更新时间倒序排列
+
+## 使用说明
+
+### 1. 查看订单
+- 主订单信息在表格中合并显示
+- 点击"查看详情"按钮可查看完整的商品明细
+
+### 2. 批量操作
+- 选择主订单行时自动选择所有子订单
+- 支持批量删除、批量发货等操作
+
+### 3. 单个操作
+- 在详情对话框中可对单个商品订单进行操作
+- 支持修改、发货、售后等操作
+
+## 注意事项
+
+1. 分组后的数据量可能与原始数据不同，分页逻辑已相应调整
+2. 主订单行的样式使用特殊标识，便于用户识别
+3. 所有操作都基于实际的订单ID进行，确保数据一致性
+4. 商品名称列支持显示多个商品，用逗号分隔
+
+## 后续优化建议
+
+1. 可考虑添加主订单级别的批量操作功能
+2. 可优化分组数据的缓存机制，提高页面性能
+3. 可添加主订单状态的汇总显示
+4. 可考虑支持按商品类型进行二次分组
diff --git a/RuoYi-Vue-master/GoodsOrder功能改进说明.md b/RuoYi-Vue-master/GoodsOrder功能改进说明.md
new file mode 100644
index 0000000..78670f2
--- /dev/null
+++ b/RuoYi-Vue-master/GoodsOrder功能改进说明.md
@@ -0,0 +1,246 @@
+# GoodsOrder 页面功能改进说明
+
+## 🎯 改进概述
+
+基于您的需求和项目实际情况，我对商品订单页面进行了全面的功能改进，主要包括：
+
+1. **商品信息展示优化** - 解决商品列显示空白的问题
+2. **分组显示功能增强** - 实现真正的按 `main_order_id` 分组显示
+3. **交互体验提升** - 添加展开/收起、详情查看等功能
+4. **搜索功能增强** - 支持更多搜索条件和高级搜索
+5. **操作功能完善** - 支持商品管理、订单修改等操作
+
+## 🚀 主要功能改进
+
+### 1. 商品信息展示优化
+
+#### 1.1 商品列重新设计
+- **多商品显示**：同一主订单下的多个商品用标签形式展示
+- **商品预览**：显示前2个商品，超出部分显示"+N个"
+- **快速查看**：点击"查看N个商品"按钮直接进入详情页面
+
+#### 1.2 商品信息展示方式
+```html
+<!-- 多商品主订单行 -->
+<div class="product-summary">
+  <el-button @click="handleViewDetails(row)">
+    <i class="el-icon-view"></i>
+    查看{{ scope.row.children.length }}个商品
+  </el-button>
+  <div class="product-preview">
+    <el-tag v-for="product in scope.row.children.slice(0, 2)">
+      {{ product.productName }}
+    </el-tag>
+    <span v-if="scope.row.children.length > 2">
+      +{{ scope.row.children.length - 2 }}个
+    </span>
+  </div>
+</div>
+```
+
+### 2. 分组显示功能增强
+
+#### 2.1 展开/收起功能
+- 主订单行支持展开查看商品明细
+- 展开内容显示完整的商品信息表格
+- 支持在展开内容中直接操作商品
+
+#### 2.2 分组数据结构优化
+```javascript
+// 支持合并行的扁平化数据结构
+const flatList = [];
+Object.keys(grouped).forEach(mainOrderId => {
+  const items = grouped[mainOrderId];
+  // 创建主行（显示汇总信息）
+  const mainRow = {
+    ...firstItem,
+    isMainRow: true,
+    rowspan: items.length,
+    children: items
+  };
+  flatList.push(mainRow);
+});
+```
+
+### 3. 订单详情功能完善
+
+#### 3.1 详情对话框重新设计
+- **主订单信息卡片**：显示订单基本信息和汇总数据
+- **商品明细卡片**：支持商品数量修改、删除等操作
+- **订单统计卡片**：显示商品种类、总数量、总金额等统计信息
+
+#### 3.2 商品管理功能
+- 支持修改商品数量（自动重新计算小计和汇总）
+- 支持删除订单中的商品
+- 支持添加新商品到订单（预留接口）
+
+### 4. 搜索功能增强
+
+#### 4.1 基础搜索优化
+- 添加订单状态筛选
+- 优化搜索条件布局
+- 支持回车键快速搜索
+
+#### 4.2 高级搜索功能
+- 新增收货人、联系电话、商品类型等搜索条件
+- 支持售后状态筛选
+- 可展开/收起高级搜索表单
+
+```html
+<!-- 高级搜索表单 -->
+<el-form v-show="showAdvancedSearch" class="advanced-search-form">
+  <el-form-item label="收货人" prop="name">
+    <el-input v-model="queryParams.name" placeholder="请输入收货人姓名" />
+  </el-form-item>
+  <el-form-item label="联系电话" prop="phone">
+    <el-input v-model="queryParams.phone" placeholder="请输入联系电话" />
+  </el-form-item>
+  <!-- 更多搜索条件... -->
+</el-form>
+```
+
+### 5. 操作功能完善
+
+#### 5.1 快速操作工具栏
+- **刷新数据**：重新加载订单信息
+- **导出数据**：导出当前筛选条件下的订单数据
+- **Excel批量发货**：原有的批量发货功能
+
+#### 5.2 商品操作功能
+- 支持修改商品数量
+- 支持删除商品
+- 支持商品状态管理
+
+## 🎨 界面设计改进
+
+### 1. 视觉层次优化
+- 主订单行使用特殊背景色标识
+- 商品标签使用不同颜色区分状态
+- 卡片式布局提升信息层次感
+
+### 2. 交互体验提升
+- 展开/收起动画效果
+- 悬停效果和阴影
+- 响应式布局适配
+
+### 3. 样式系统完善
+```css
+/* 主订单行样式 */
+::v-deep .main-order-row {
+  background-color: #f0f9ff !important;
+  font-weight: bold;
+}
+
+/* 商品相关样式 */
+.product-summary {
+  text-align: center;
+}
+
+.product-preview {
+  margin-top: 8px;
+}
+```
+
+## 🔧 技术实现要点
+
+### 1. 数据结构设计
+- 使用扁平化数据结构支持表格合并
+- 主行和子行分离，便于操作管理
+- 支持动态计算汇总数据
+
+### 2. 组件交互
+- 使用 `span-method` 实现单元格合并
+- 使用 `expand-row-keys` 控制展开状态
+- 支持动态数据更新和重新计算
+
+### 3. 性能优化
+- 按需加载商品详情
+- 支持数据缓存和刷新
+- 优化大量数据的渲染性能
+
+## 📱 使用说明
+
+### 1. 查看订单
+- **主订单行**：显示汇总信息，支持展开查看详情
+- **商品预览**：直接显示商品标签和数量
+- **详情查看**：点击"查看N个商品"进入详情页面
+
+### 2. 管理商品
+- **数量修改**：在详情页面直接修改商品数量
+- **商品删除**：支持删除订单中的商品
+- **状态管理**：查看和管理商品状态
+
+### 3. 搜索筛选
+- **基础搜索**：支持订单号、用户、商品等条件
+- **高级搜索**：展开后显示更多搜索选项
+- **快速筛选**：支持订单状态、售后状态等
+
+### 4. 批量操作
+- **选择订单**：支持选择主订单（自动选择所有子订单）
+- **批量删除**：删除整个主订单或单个商品
+- **批量发货**：使用Excel批量处理发货
+
+## 🎯 业务价值
+
+### 1. 提升工作效率
+- 分组显示让订单管理更清晰
+- 快速查看和操作减少页面跳转
+- 批量操作支持提高处理效率
+
+### 2. 改善用户体验
+- 直观的商品信息展示
+- 友好的交互操作界面
+- 完善的搜索和筛选功能
+
+### 3. 支持业务需求
+- 按主订单分组管理符合业务逻辑
+- 支持商品级别的精细化管理
+- 提供完整的订单生命周期管理
+
+## 🔮 后续优化建议
+
+### 1. 功能扩展
+- 支持商品图片显示
+- 添加订单备注和标签功能
+- 支持订单模板和快速创建
+
+### 2. 性能优化
+- 实现虚拟滚动支持大量数据
+- 添加数据缓存和预加载
+- 优化搜索和筛选性能
+
+### 3. 用户体验
+- 添加操作引导和帮助提示
+- 支持个性化设置和偏好
+- 添加数据统计和图表展示
+
+## 📋 修改文件清单
+
+1. **前端页面**：`ruoyi-ui/src/views/system/GoodsOrder/index.vue`
+   - 表格结构和显示逻辑
+   - 商品信息展示优化
+   - 分组显示功能实现
+   - 详情对话框重新设计
+   - 搜索功能增强
+
+2. **样式文件**：同页面内嵌样式
+   - 新增商品相关样式
+   - 订单详情样式优化
+   - 高级搜索表单样式
+
+3. **说明文档**：`GoodsOrder功能改进说明.md`
+   - 详细的功能说明
+   - 使用方法和注意事项
+   - 技术实现要点
+
+## ✨ 总结
+
+通过这次全面的功能改进，商品订单页面现在具备了：
+
+- **清晰的分组显示**：按主订单号分组，支持展开查看详情
+- **完善的商品管理**：支持商品信息的查看、修改、删除等操作
+- **强大的搜索功能**：基础搜索+高级搜索，满足各种查询需求
+- **友好的用户界面**：现代化的卡片布局，直观的信息展示
+- **高效的操作体验**：支持批量操作，减少重复工作
+
+这些改进完全满足了您提出的"按main_order_id分组查询显示"的需求，同时大大提升了页面的功能性和用户体验。
diff --git a/UserSecondaryCard功能完善说明.md b/UserSecondaryCard功能完善说明.md
new file mode 100644
index 0000000..683af03
--- /dev/null
+++ b/UserSecondaryCard功能完善说明.md
@@ -0,0 +1,125 @@
+# UserSecondaryCard 次卡管理功能完善说明
+
+## 已完成的功能
+
+### 后端 Controller (UserSecondaryCardController.java)
+
+#### 1. 基础CRUD功能 ✅
+- 查询次卡列表 (GET /list)
+- 获取次卡详情 (GET /{id})
+- 新增次卡 (POST /)
+- 修改次卡 (PUT /)
+- 删除次卡 (DELETE /{ids})
+- 导出次卡数据 (POST /export)
+
+#### 2. 业务逻辑功能 ✅
+- 数字转中文工具方法 (`numberToChinese`)
+- 自动生成简介字段 (`generateIntroduction`)
+- 购买明细查询 (GET /purchaseDetails/{id})
+
+#### 3. 新增功能 ✅
+- 批量状态更新 (PUT /batchStatus)
+- 批量删除 (DELETE /batchDelete)
+- 数据验证增强
+
+#### 4. 数据验证 ✅
+- 总服务数必须大于0
+- 可提供服务数必须大于0
+- 可提供服务数不能大于总服务数
+- 实付价格不能大于展示价格
+
+### 前端 Vue (index.vue)
+
+#### 1. 界面功能 ✅
+- 次卡列表展示
+- 新增/修改对话框
+- 购买明细查看对话框
+- 图片上传和预览
+- 分页功能
+
+#### 2. 搜索功能 ✅
+- 标题搜索
+- 分类筛选
+- 状态筛选
+- 价格范围搜索
+- 创建时间范围搜索
+
+#### 3. 操作功能 ✅
+- 新增次卡
+- 修改次卡
+- 删除次卡
+- 导出数据
+- 批量状态更新
+- 快速状态切换（下拉菜单）
+
+#### 4. 用户体验优化 ✅
+- 表单验证增强
+- 业务逻辑验证
+- 确认对话框
+- 错误提示
+- 加载状态
+- 图片错误处理
+
+#### 5. 数据展示优化 ✅
+- 价格格式化显示
+- 图片缩略图展示
+- 状态标签显示
+- 服务数量统计
+- 时间格式化
+
+## 技术特点
+
+### 后端
+- 使用Spring Security进行权限控制
+- 集成MyBatis进行数据访问
+- 支持Excel导出
+- 完善的日志记录
+- 数据验证和错误处理
+
+### 前端
+- 基于Vue.js + Element UI
+- 响应式设计
+- 组件化开发
+- 表单验证
+- 图片上传组件
+- 字典数据支持
+
+## 使用说明
+
+### 1. 次卡管理
+- 可以创建、编辑、删除次卡
+- 支持图片上传（主图和轮播图）
+- 自动生成简介字段
+- 支持批量操作
+
+### 2. 搜索筛选
+- 支持多条件组合搜索
+- 价格范围搜索
+- 时间范围搜索
+- 分类和状态筛选
+
+### 3. 状态管理
+- 支持单个次卡状态快速切换
+- 支持批量状态更新
+- 状态变更有确认提示
+
+### 4. 数据导出
+- 支持Excel格式导出
+- 导出数据包含所有字段
+- 支持搜索条件筛选导出
+
+## 注意事项
+
+1. **权限控制**: 所有操作都需要相应的权限
+2. **数据验证**: 前端和后端都有数据验证
+3. **图片处理**: 支持单张主图和多张轮播图
+4. **业务逻辑**: 自动计算服务数量和生成简介
+5. **错误处理**: 完善的错误提示和异常处理
+
+## 后续优化建议
+
+1. 可以添加次卡使用统计功能
+2. 可以添加次卡到期提醒功能
+3. 可以添加次卡模板功能
+4. 可以添加批量导入功能
+5. 可以添加数据备份和恢复功能
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersPayBeforController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersPayBeforController.java
index dea9a6c..ecb4e22 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersPayBeforController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersPayBeforController.java
@@ -7,8 +7,10 @@ import java.util.Map;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.system.ControllerUtil.OrderUtil;
+import com.ruoyi.system.domain.GoodsOrder;
 import com.ruoyi.system.domain.Order;
 import com.ruoyi.system.domain.OrderLog;
+import com.ruoyi.system.service.IGoodsOrderService;
 import com.ruoyi.system.service.IOrderLogService;
 import com.ruoyi.system.service.IOrderService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,6 +48,8 @@ public class UsersPayBeforController extends BaseController
     private IOrderService orderService;
     @Autowired
     private IOrderLogService orderLogService;
+    @Autowired
+    private IGoodsOrderService goodsOrderService;
 
     /**
      * 查询预支付列表
@@ -115,14 +119,38 @@ public class UsersPayBeforController extends BaseController
         return toAjax(usersPayBeforService.deleteUsersPayBeforByIds(ids));
     }
 
+//    /**
+//     * 根据订单ID查询预支付数据
+//     */
+//    @GetMapping("/getByOrderId/{orderId}")
+//    public AjaxResult getByOrderId(@PathVariable("orderId") String orderId)
+//    {
+//        UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(orderId);
+//        return success(usersPayBefor);
+//    }
+
     /**
      * 根据订单ID查询预支付数据
      */
     @GetMapping("/getByOrderId/{orderId}")
     public AjaxResult getByOrderId(@PathVariable("orderId") String orderId)
     {
-        UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(orderId);
-        return success(usersPayBefor);
+
+        GoodsOrder goodsOrder = new GoodsOrder();
+        goodsOrder.setMainOrderId(orderId);
+        List<GoodsOrder> orders = goodsOrderService.selectGoodsOrderList(goodsOrder);
+        if (orders.size()>0){
+            UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(orderId);
+            if (usersPayBefor == null){
+                 usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(orders.getFirst().getOrderId());
+            }
+            return success(usersPayBefor);
+        }else{
+            return success();
+        }
+
+
+
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/OrderUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/OrderUtil.java
index 2d28ada..a33dbc7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/OrderUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/OrderUtil.java
@@ -1960,10 +1960,52 @@ public class OrderUtil {
         }
     }
 
+    /**
+     * 查找用户首次下单
+     * 根据用户ID查找该用户首次下单的订单ID
+     *
+     * @param userId 用户ID
+     * @return 首次下单的订单ID，如果没有找到返回null
+     */
+    public static String findUserFirstOrderId(Long userId) {
+        try {
+            if (userId == null) {
+                System.err.println("用户ID不能为空");
+                return null;
+            }
 
+            IOrderService orderService = SpringUtils.getBean(IOrderService.class);
+            String firstOrderId = orderService.selectUserFirstOrderId(userId);
 
+            if (firstOrderId != null) {
+                System.out.println("用户 " + userId + " 首次下单订单ID: " + firstOrderId);
+            } else {
+                System.out.println("用户 " + userId + " 没有找到首次下单记录");
+            }
 
+            return firstOrderId;
 
+        } catch (Exception e) {
+            System.err.println("查找用户首次下单异常，用户ID: " + userId + ", 错误: " + e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 查找用户首次下单（重载方法，支持用户对象）
+     * 根据用户对象查找该用户首次下单的订单ID
+     *
+     * @param user 用户对象
+     * @return 首次下单的订单ID，如果没有找到返回null
+     */
+    public static String findUserFirstOrderId(Users user) {
+        if (user == null || user.getId() == null) {
+            System.err.println("用户对象或用户ID为空");
+            return null;
+        }
+        return findUserFirstOrderId(user.getId());
+    }
 
 //    public static void main(String[] args) {
 //        // 构造一个测试用的json字符串
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java
index 3a12ba4..3f9a38f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java
@@ -81,7 +81,7 @@ public class WechatPayUtil {
     private static final String WECHAT_TRANSFER_URL = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"; // 企业付款
 
 
-    public static final String PAY_FH = "https://api.huafurenjia.cn/";
+    public static final String PAY_FH = "https://403e667e.r3.cpolar.top";
     /**
      * 其他配置常量
      */
diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html
index 4e3babb..e4e4771 100644
--- a/ruoyi-ui/public/index.html
+++ b/ruoyi-ui/public/index.html
@@ -10,7 +10,7 @@
         securityJsCode: "8c58e51cb91b527f0fb863b3c97ef3c7",
       };
     </script>
-    <script src="https://webapi.amap.com/maps?v=2.0&key=03e2077b2c18a2ddeaadf34c434f75d4&plugin=AMap.Geocoder"></script>
+    <script src="https://webapi.amap.com/maps?v=2.0&key=03e2077b2c18a2ddeaadf34c434f75d4&plugin=AMap.Geocoder,AMap.PlaceSearch"></script>
     
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss
index ac0e1ab..9493fc2 100644
--- a/ruoyi-ui/src/assets/styles/index.scss
+++ b/ruoyi-ui/src/assets/styles/index.scss
@@ -177,7 +177,9 @@ aside {
     margin-bottom: 10px;
   }
 }
-
+.el-drawer__body {
+  padding: 20px !important;
+}
 /* 修复对话框遮罩层问题 */
 //.v-modal {
 //  z-index: 9998 !important;
diff --git a/ruoyi-ui/src/components/AddressSelector/index.js b/ruoyi-ui/src/components/AddressSelector/index.js
new file mode 100644
index 0000000..882e901
--- /dev/null
+++ b/ruoyi-ui/src/components/AddressSelector/index.js
@@ -0,0 +1,3 @@
+import AddressSelector from './index.vue'
+
+export default AddressSelector
diff --git a/ruoyi-ui/src/components/AddressSelector/index.vue b/ruoyi-ui/src/components/AddressSelector/index.vue
new file mode 100644
index 0000000..6c599a2
--- /dev/null
+++ b/ruoyi-ui/src/components/AddressSelector/index.vue
@@ -0,0 +1,755 @@
+<template>
+  <div class="address-selector">
+    <div class="map-container">
+      <div class="map-info">
+        <span>地址: {{ address || "未设置" }}</span>
+        <span>经度: {{ longitude || "未设置" }}</span>
+        <span>纬度: {{ latitude || "未设置" }}</span>
+        <span v-if="disabled" class="locked-status">
+          <i class="el-icon-view"></i> 只读模式
+        </span>
+      </div>
+      <el-button
+        type="primary"
+        size="small"
+        @click="showMapSelector"
+        icon="el-icon-location"
+      >
+        {{ disabled ? '查看位置' : '选择位置' }}
+      </el-button>
+    </div>
+
+    <!-- 地图选择对话框 -->
+    <el-dialog
+      :title="disabled ? '查看地址' : '选择地址'"
+      :visible.sync="showMapDialog"
+      width="80%"
+      :close-on-click-modal="false"
+      append-to-body
+      @opened="onDialogOpened"
+    >
+      <div class="map-dialog-content">
+        <div class="map-search">
+          <el-input
+            v-model="mapSearchKeyword"
+            placeholder="搜索地址"
+            style="width: 300px; margin-right: 8px"
+            size="small"
+            @keyup.enter.native="searchMapAddress"
+            :disabled="disabled"
+          >
+            <el-button
+              slot="append"
+              @click="searchMapAddress"
+              icon="el-icon-search"
+              :disabled="disabled"
+            ></el-button>
+          </el-input>
+          <el-button
+            @click="useCurrentLocation"
+            type="success"
+            size="small"
+            icon="el-icon-location"
+            :disabled="disabled"
+          >
+            使用当前位置
+          </el-button>
+        </div>
+
+        <div class="map-container-main">
+          <div :id="mapId" class="map-view">
+            <div v-if="!mapInited" class="map-loading">
+              <i class="el-icon-loading"></i>
+              <p>地图加载中...</p>
+              <el-button 
+                type="primary" 
+                size="small" 
+                @click="forceInitMap"
+                style="margin-top: 10px;"
+              >
+                手动初始化地图
+              </el-button>
+            </div>
+          </div>
+          <div class="map-sidebar">
+            <div class="search-results" v-if="searchResults.length > 0">
+              <h4>搜索结果 ({{ searchResults.length }})</h4>
+                             <div
+                 v-for="(item, index) in searchResults"
+                 :key="index"
+                 class="search-item"
+                 @click="selectSearchResult(item)"
+                 :class="{ 'disabled-item': disabled }"
+               >
+                <div class="result-title">{{ item.title }}</div>
+                <div class="result-address">{{ item.address }}</div>
+                <div class="result-type">{{ item.type }}</div>
+              </div>
+            </div>
+            <div v-else-if="mapSearchKeyword && !searchResults.length" class="no-results">
+              <p>未找到相关地址</p>
+              <p>请尝试更详细的关键词</p>
+            </div>
+            <div v-else class="search-tips">
+              <h4>搜索提示</h4>
+              <p>• 输入地址关键词进行搜索</p>
+              <p>• 支持城市、街道、地标等</p>
+              <p>• 点击搜索结果可定位到地图</p>
+            </div>
+          </div>
+        </div>
+
+        <div class="selected-location" v-if="selectedLocation">
+          <h4>已选择位置</h4>
+          <p><strong>地址:</strong> {{ selectedLocation.address }}</p>
+          <p><strong>经度:</strong> {{ selectedLocation.lng }}</p>
+          <p><strong>纬度:</strong> {{ selectedLocation.lat }}</p>
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showMapDialog = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="confirmLocation"
+          :disabled="!selectedLocation || disabled"
+        >
+          {{ disabled ? '位置已锁定' : '确认选择' }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "AddressSelector",
+  props: {
+    // 经度
+    longitude: {
+      type: [String, Number],
+      default: null,
+    },
+    // 纬度
+    latitude: {
+      type: [String, Number],
+      default: null,
+    },
+    // 地址
+    address: {
+      type: String,
+      default: "",
+    },
+    // 是否禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      showMapDialog: false,
+      mapSearchKeyword: "",
+      searchResults: [],
+      selectedLocation: null,
+      map: null,
+      marker: null,
+      geocoder: null,
+      placeSearch: null, // 添加地点搜索插件
+      mapInited: false,
+      mapId: `map-${Date.now()}`, // 添加唯一的ID
+    };
+  },
+  watch: {
+    // 监听外部传入的经纬度变化
+    longitude(newVal) {
+      if (newVal && this.map) {
+        this.updateMapCenter();
+      }
+    },
+    latitude(newVal) {
+      if (newVal && this.map) {
+        this.updateMapCenter();
+      }
+    },
+  },
+  mounted() {
+    // 监听窗口大小变化
+    window.addEventListener('resize', this.handleResize);
+  },
+  
+  beforeDestroy() {
+    // 移除事件监听器
+    window.removeEventListener('resize', this.handleResize);
+  },
+  methods: {
+    /** 显示地图对话框 */
+    showMapSelector() {
+      this.showMapDialog = true;
+      // 地图初始化将在对话框打开后自动触发
+    },
+
+    /** 初始化地图 */
+    initMap() {
+      console.log('开始初始化地图...', this.mapId);
+      
+      // 销毁旧地图和事件，防止重复绑定
+      if (this.map) {
+        console.log('销毁旧地图...');
+        this.map.destroy();
+        this.map = null;
+        this.marker = null;
+        this.geocoder = null;
+        this.placeSearch = null;
+        this.mapInited = false;
+      }
+
+      // 检查高德地图API是否可用
+      if (!window.AMap) {
+        console.error('高德地图API未加载');
+        this.$modal.msgError("地图加载失败，请检查网络连接");
+        return;
+      }
+
+      console.log('高德地图API已加载，开始创建地图实例...');
+
+      try {
+        // 确保地图容器存在
+        const mapContainer = document.getElementById(this.mapId);
+        if (!mapContainer) {
+          console.error('地图容器不存在:', this.mapId);
+          this.$modal.msgError("地图容器不存在");
+          return;
+        }
+
+        console.log('地图容器找到:', mapContainer);
+
+        // 设置地图容器的样式
+        mapContainer.style.width = '100%';
+        mapContainer.style.height = '100%';
+        mapContainer.style.minHeight = '400px';
+        mapContainer.style.position = 'relative';
+
+        // 等待一下确保DOM完全渲染
+        setTimeout(() => {
+          try {
+            // 创建地图实例
+            this.map = new window.AMap.Map(this.mapId, {
+              zoom: 16,
+              center: [this.longitude || 108.94141, this.latitude || 34.209883],
+              viewMode: '2D',
+              resizeEnable: true,
+              dragEnable: true,
+              zoomEnable: true,
+              doubleClickZoom: true,
+              keyboardEnable: false,
+              jogEnable: true,
+              scrollWheel: true,
+              touchZoom: true,
+              showIndoorMap: false,
+            });
+
+            console.log('地图实例创建成功');
+
+            // 创建地理编码器
+            this.geocoder = new window.AMap.Geocoder();
+
+            // 创建地点搜索插件
+            this.placeSearch = new window.AMap.PlaceSearch({
+              city: '全国',
+              pageSize: 10,
+              pageIndex: 1
+            });
+
+            // 如果有已保存的坐标，设置地图中心
+            if (this.longitude && this.latitude) {
+              console.log('设置已保存的坐标:', this.longitude, this.latitude);
+              this.setMapMarker([this.longitude, this.latitude]);
+              this.map.setCenter([this.longitude, this.latitude]);
+            }
+
+            // 添加点击事件
+            this.map.on("click", (e) => {
+              if (this.disabled) {
+                this.$message.warning('位置已锁定，无法修改');
+                return;
+              }
+              console.log('地图点击事件:', e.lnglat);
+              const lnglat = [e.lnglat.lng, e.lnglat.lat];
+              this.setMapMarker(lnglat);
+              this.getAddressFromCoords(e.lnglat.lng, e.lnglat.lat);
+            });
+
+            // 添加地图加载完成事件
+            this.map.on('complete', () => {
+              console.log('地图加载完成');
+              this.mapInited = true;
+            });
+
+            // 添加地图错误事件
+            this.map.on('error', (error) => {
+              console.error('地图加载错误:', error);
+            });
+
+            // 强制触发地图重绘
+            setTimeout(() => {
+              if (this.map) {
+                this.map.resize();
+                console.log('地图重绘完成');
+                
+                // 再次确保地图完全填充容器
+                setTimeout(() => {
+                  if (this.map) {
+                    this.map.resize();
+                    console.log('地图二次重绘完成');
+                  }
+                }, 300);
+              }
+            }, 100);
+
+          } catch (error) {
+            console.error('地图实例创建失败:', error);
+            this.$modal.msgError("地图初始化失败: " + error.message);
+          }
+        }, 200);
+
+      } catch (error) {
+        console.error('地图初始化失败:', error);
+        this.$modal.msgError("地图初始化失败: " + error.message);
+      }
+    },
+
+    /** 更新地图中心点 */
+    updateMapCenter() {
+      if (this.map && this.longitude && this.latitude) {
+        this.map.setCenter([this.longitude, this.latitude]);
+        this.setMapMarker([this.longitude, this.latitude]);
+      }
+    },
+
+    /** 设置地图标记 */
+    setMapMarker(lnglat) {
+      if (this.marker) {
+        this.marker.setMap(null);
+      }
+      this.marker = new window.AMap.Marker({
+        position: lnglat,
+        map: this.map,
+      });
+    },
+
+    /** 根据坐标获取地址信息 */
+    getAddressFromCoords(lng, lat) {
+      if (!this.geocoder) return;
+
+      this.geocoder.getAddress([lng, lat], (status, result) => {
+        if (status === "complete" && result.regeocode) {
+          const address = result.regeocode.formattedAddress;
+          this.selectedLocation = {
+            lng: lng,
+            lat: lat,
+            address: address,
+          };
+        } else {
+          this.selectedLocation = {
+            lng: lng,
+            lat: lat,
+            address: "未知地址",
+          };
+        }
+      });
+    },
+
+    /** 搜索地址 */
+    searchMapAddress() {
+      if (this.disabled) {
+        this.$message.warning('位置已锁定，无法修改');
+        return;
+      }
+      
+      if (!this.mapSearchKeyword.trim()) {
+        this.$message.warning("请输入搜索关键词");
+        return;
+      }
+
+      if (!this.mapInited || !this.placeSearch) {
+        this.$message.warning("地图未初始化，请稍后再试");
+        return;
+      }
+
+      console.log('开始搜索地址:', this.mapSearchKeyword);
+
+      // 使用PlaceSearch插件搜索地址
+      this.placeSearch.search(this.mapSearchKeyword, (status, result) => {
+        console.log('搜索状态:', status, '搜索结果:', result);
+        
+        if (status === "complete" && result.info === "OK" && result.poiList && result.poiList.pois) {
+          // 处理搜索结果
+          this.searchResults = result.poiList.pois.map((poi) => ({
+            title: poi.name,
+            address: poi.address || poi.pname + poi.cityname + poi.adname,
+            lng: poi.location.lng,
+            lat: poi.location.lat,
+            type: poi.type
+          }));
+          
+          console.log('搜索结果数量:', this.searchResults.length);
+          
+          if (this.searchResults.length > 0) {
+            // 自动选择第一个结果并定位
+            const firstResult = this.searchResults[0];
+            this.map.setCenter([firstResult.lng, firstResult.lat]);
+            this.setMapMarker([firstResult.lng, firstResult.lat]);
+            this.getAddressFromCoords(firstResult.lng, firstResult.lat);
+          }
+        } else {
+          this.searchResults = [];
+          this.$message.warning("未找到该地址，请输入更详细的地址");
+        }
+      });
+    },
+
+    /** 选择搜索结果 */
+    selectSearchResult(item) {
+      if (this.disabled) {
+        this.$message.warning('位置已锁定，无法修改');
+        return;
+      }
+      
+      this.selectedLocation = {
+        lng: item.lng,
+        lat: item.lat,
+        address: item.address,
+      };
+
+      // 移动地图到选中位置
+      this.map.setCenter([item.lng, item.lat]);
+      this.setMapMarker([item.lng, item.lat]);
+    },
+
+    /** 使用当前位置 */
+    useCurrentLocation() {
+      if (this.disabled) {
+        this.$message.warning('位置已锁定，无法修改');
+        return;
+      }
+      
+      if (navigator.geolocation) {
+        navigator.geolocation.getCurrentPosition(
+          (position) => {
+            const lng = position.coords.longitude;
+            const lat = position.coords.latitude;
+
+            this.map.setCenter([lng, lat]);
+            this.setMapMarker([lng, lat]);
+            this.getAddressFromCoords(lng, lat);
+          },
+          (error) => {
+            this.$modal.msgError("获取当前位置失败: " + error.message);
+          }
+        );
+      } else {
+        this.$modal.msgError("浏览器不支持地理位置功能");
+      }
+    },
+
+    /** 确认选择位置 */
+    confirmLocation() {
+      if (this.selectedLocation) {
+        // 向父组件发送选择结果
+        this.$emit("location-selected", {
+          longitude: this.selectedLocation.lng,
+          latitude: this.selectedLocation.lat,
+          address: this.selectedLocation.address,
+        });
+
+        this.showMapDialog = false;
+        this.$modal.msgSuccess("位置选择成功");
+      }
+    },
+
+    /** 对话框打开时初始化地图 */
+    onDialogOpened() {
+      console.log('地图对话框已打开，尝试初始化地图...');
+      this.initMap();
+    },
+
+    /** 强制重新初始化地图 */
+    forceInitMap() {
+      console.log('强制重新初始化地图...');
+      this.mapInited = false; // 强制地图销毁
+      this.initMap(); // 重新初始化
+    },
+
+    /** 处理窗口大小变化 */
+    handleResize() {
+      if (this.map) {
+        this.map.resize();
+        console.log('地图容器大小变化，触发地图重绘');
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.address-selector {
+  width: 100%;
+}
+
+/* 地图容器样式 */
+.map-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.map-info {
+  display: flex;
+  gap: 20px;
+  font-size: 12px;
+  color: #606266;
+}
+
+.map-info span {
+  background: #f5f7fa;
+  padding: 4px 8px;
+  border-radius: 4px;
+  border: 1px solid #e4e7ed;
+}
+
+.locked-status {
+  color: #909399 !important;
+  font-weight: 500;
+  display: flex !important;
+  align-items: center;
+  gap: 5px;
+  background: #f4f4f5 !important;
+  border-color: #d3d4d6 !important;
+}
+
+.locked-status i {
+  color: #909399;
+}
+
+/* 地图对话框样式 */
+.map-dialog-content {
+  height: 500px;
+  display: flex;
+  flex-direction: column;
+  min-height: 500px;
+}
+
+.map-search {
+  margin-bottom: 15px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-shrink: 0;
+}
+
+.map-container-main {
+  flex: 1;
+  display: flex;
+  gap: 15px;
+  margin-bottom: 15px;
+  height: 400px;
+  min-height: 400px;
+  overflow: visible;
+}
+
+.map-view {
+  flex: 1;
+  height: 400px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  position: relative;
+  overflow: hidden;
+  min-height: 400px;
+  width: 100%;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 动态地图容器样式 */
+[id^="map-"] {
+  width: 100% !important;
+  height: 100% !important;
+  min-height: 400px;
+  position: relative !important;
+  border-radius: 4px;
+  flex: 1;
+}
+
+.map-loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.9);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  z-index: 1;
+  border-radius: 4px;
+}
+
+.map-loading i {
+  font-size: 40px;
+  color: #409eff;
+  margin-bottom: 10px;
+}
+
+.map-loading p {
+  font-size: 16px;
+  color: #303133;
+}
+
+.map-sidebar {
+  width: 300px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  padding: 15px;
+  background: #f8f9fa;
+  flex-shrink: 0;
+  overflow-y: auto;
+}
+
+.search-results h4 {
+  margin: 0 0 10px 0;
+  color: #303133;
+  font-size: 14px;
+}
+
+.search-item {
+  padding: 10px;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  margin-bottom: 8px;
+  background: #fff;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+
+.search-item:hover {
+  border-color: #409eff;
+  box-shadow: 0 2px 8px rgba(64, 158, 255, 0.1);
+}
+
+.search-item.disabled-item {
+  opacity: 0.6;
+  cursor: not-allowed;
+  background: #f5f7fa;
+}
+
+.search-item.disabled-item:hover {
+  border-color: #e4e7ed;
+  box-shadow: none;
+}
+
+.result-title {
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 5px;
+}
+
+.result-address {
+  font-size: 12px;
+  color: #909399;
+  line-height: 1.4;
+}
+
+.result-type {
+  font-size: 10px;
+  color: #606266;
+  margin-top: 5px;
+}
+
+.no-results {
+  text-align: center;
+  padding: 20px;
+  color: #909399;
+  font-size: 14px;
+}
+
+.search-tips {
+  margin-top: 15px;
+  padding: 10px;
+  background: #f0f9eb;
+  border: 1px solid #e1f3d8;
+  border-radius: 4px;
+}
+
+.search-tips h4 {
+  margin: 0 0 10px 0;
+  color: #67c23a;
+  font-size: 14px;
+}
+
+.search-tips p {
+  margin: 5px 0;
+  color: #909399;
+  font-size: 13px;
+}
+
+.selected-location {
+  background: #f0f9ff;
+  border: 1px solid #b3d8ff;
+  border-radius: 4px;
+  padding: 15px;
+}
+
+.selected-location h4 {
+  margin: 0 0 10px 0;
+  color: #409eff;
+  font-size: 14px;
+}
+
+.selected-location p {
+  margin: 5px 0;
+  color: #606266;
+  font-size: 13px;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .map-container-main {
+    flex-direction: column;
+    height: auto;
+    min-height: 500px;
+  }
+
+  .map-sidebar {
+    width: 100%;
+    height: 200px;
+  }
+
+  .map-view {
+    height: 300px;
+    min-height: 300px;
+  }
+
+  [id^="map-"] {
+    min-height: 300px;
+  }
+}
+
+@media (max-width: 480px) {
+  .map-dialog-content {
+    height: 400px;
+    min-height: 400px;
+  }
+
+  .map-view {
+    height: 250px;
+    min-height: 250px;
+  }
+
+  [id^="map-"] {
+    min-height: 250px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/AddEditDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/AddEditDialog.vue
new file mode 100644
index 0000000..5885cc1
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/AddEditDialog.vue
@@ -0,0 +1,212 @@
+<template>
+  <el-dialog :title="title" :visible.sync="visible" width="80%" append-to-body @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <!-- 主订单信息 -->
+      <el-card shadow="hover" style="margin-bottom: 20px;">
+        <div slot="header" class="clearfix">
+          <span style="font-weight: bold; color: #409EFF;">
+            <i class="el-icon-s-order"></i>
+            主订单信息
+          </span>
+        </div>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="主订单号" prop="mainOrderId">
+              <el-input v-model="form.mainOrderId" placeholder="请输入主订单号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户" prop="uid">
+              <user-select
+                v-model="form.uid"
+                placeholder="请选择用户"
+                user-type="1"
+                dialog-title="选择用户"
+                @change="handleUserSelectChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收货人" prop="name">
+              <el-input v-model="form.name" placeholder="请输入收货人姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="收货地址" prop="address">
+              <el-input v-model="form.address" type="textarea" placeholder="请输入收货地址" />
+            </el-form-item>
+          </el-col>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="mark">
+                <el-input v-model="form.mark" type="textarea" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-row>
+      </el-card>
+
+      <!-- 子订单列表 -->
+      <el-card shadow="hover" style="margin-bottom: 20px;">
+        <div slot="header" class="clearfix">
+          <span style="font-weight: bold; color: #67C23A;">
+            <i class="el-icon-goods"></i>
+            商品信息列表
+          </span>
+        </div>
+
+        <el-table :data="subOrdersList" border style="width: 100%">
+          <el-table-column label="序号" type="index" width="60" align="center" />
+          <el-table-column label="商品" prop="productId" min-width="200">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.productId"
+                placeholder="请选择商品"
+                clearable
+                :disabled="true"
+                filterable
+                size="mini"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in goodsDataList"
+                  :key="item.id"
+                  :label="item.title"
+                  :value="item.id"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" prop="num" width="120" align="center"> </el-table-column>
+          <el-table-column label="金额" prop="num" width="120" align="center">
+            <template slot-scope="scope">
+              <span class="num">{{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) : '0.00' }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+      <!-- 订单汇总信息 -->
+      <el-card shadow="hover" style="margin-bottom: 20px;">
+        <div slot="header" class="clearfix">
+          <span style="font-weight: bold; color: #E6A23C;">
+            <i class="el-icon-data-analysis"></i>
+            订单汇总
+          </span>
+        </div>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <div class="summary-item">
+              <label>总金额：</label>
+              <span class="value price">￥{{ totalSubOrdersPrice.toFixed(2) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="summary-item">
+              <label>支付金额：</label>
+              <span class="value price">￥{{ form.payPrice ? form.payPrice.toFixed(2) : '0.00' }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <div class="dialog-footer" style="text-align:left;margin-top:20px;">
+        <el-button @click="reset">重置</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "AddEditDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ""
+    },
+    form: {
+      type: Object,
+      default: () => ({})
+    },
+    subOrdersList: {
+      type: Array,
+      default: () => []
+    },
+    goodsDataList: {
+      type: Array,
+      default: () => []
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    totalSubOrdersPrice() {
+      return this.subOrdersList.reduce((total, order) => {
+        return total + (order.totalPrice || 0);
+      }, 0);
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$emit('update:visible', false);
+      this.$emit('close');
+    },
+    handleUserSelectChange(user) {
+      this.$emit('user-select-change', user);
+    },
+    reset() {
+      this.$emit('reset');
+    },
+    submitForm() {
+      this.$emit('submit');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.summary-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.summary-item label {
+  font-weight: bold;
+  margin-right: 10px;
+  color: #606266;
+}
+
+.summary-item .value {
+  font-size: 16px;
+  color: #409EFF;
+}
+
+.summary-item .value.price {
+  color: #E6A23C;
+  font-weight: bold;
+}
+
+.num {
+  color: #409EFF;
+  font-weight: bold;
+}
+
+.dialog-footer {
+  text-align: right;
+  margin-top: 20px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/AfterSaleDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/AfterSaleDialog.vue
new file mode 100644
index 0000000..1b346a6
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/AfterSaleDialog.vue
@@ -0,0 +1,184 @@
+<template>
+  <el-dialog
+    title="售后详情"
+    :visible.sync="localVisible"
+    width="60%"
+    append-to-body
+  >
+    <div v-if="currentAfterSaleOrder" class="after-sale-detail">
+      <el-card class="box-card" style="margin-bottom: 20px;">
+        <div slot="header" class="clearfix">
+          <span style="font-weight: bold; color: #409EFF;">📋 订单基本信息</span>
+        </div>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <p><strong>订单号：</strong>{{ currentAfterSaleOrder.orderId }}</p>
+            <p><strong>商品名称：</strong>{{ currentAfterSaleOrder.productName }}</p>
+            <p><strong>订单金额：</strong>￥{{ currentAfterSaleOrder.payPrice ? currentAfterSaleOrder.payPrice.toFixed(2) : '0.00' }}</p>
+          </el-col>
+          <el-col :span="12">
+            <p><strong>用户姓名：</strong>{{ currentAfterSaleOrder.name }}</p>
+            <p><strong>联系电话：</strong>{{ currentAfterSaleOrder.phone }}</p>
+            <p><strong>订单状态：</strong>
+              <el-tag :type="currentAfterSaleOrder.status >= 20 ? 'warning' : 'success'">
+                {{ currentAfterSaleOrder.status >= 20 ? '售后中' : '正常' }}
+              </el-tag>
+            </p>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="box-card" style="margin-bottom: 20px;">
+        <div slot="header" class="clearfix">
+          <span style="font-weight: bold; color: #E6A23C;">🛠️ 售后信息</span>
+        </div>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <p><strong>售后类别：</strong>
+              <el-tag v-if="currentAfterSaleOrder.returntype === 1" type="info">仅退款</el-tag>
+              <el-tag v-else-if="currentAfterSaleOrder.returntype === 2" type="warning">退货退款</el-tag>
+              <span v-else>未设置</span>
+            </p>
+            <p><strong>退款金额：</strong>￥{{ currentAfterSaleOrder.returnmoney || '0.00' }}</p>
+            <p><strong>申请时间：</strong>{{ currentAfterSaleOrder.returntime ? parseTime(currentAfterSaleOrder.returntime, '{y}-{m}-{d} {h}:{i}:{s}') : '未设置' }}</p>
+          </el-col>
+          <el-col :span="12">
+            <p><strong>售后状态：</strong>
+              <el-tag
+                :type="getReturnStatusType(currentAfterSaleOrder.returnstatus)"
+                v-if="currentAfterSaleOrder.returnstatus"
+              >
+                {{ returnStatusMap[currentAfterSaleOrder.returnstatus] || '未知状态' }}
+              </el-tag>
+              <span v-else>未申请售后</span>
+            </p>
+            <p><strong>退货快递：</strong>{{ currentAfterSaleOrder.returnlogistics || '未设置' }}</p>
+            <p><strong>退货快递号：</strong>{{ currentAfterSaleOrder.returnlogisticscode || '未设置' }}</p>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="box-card" style="margin-bottom: 20px;" v-if="currentAfterSaleOrder.returnreason">
+        <div slot="header" class="clearfix">
+          <span style="font-weight: bold; color: #F56C6C;">📝 售后原因</span>
+        </div>
+        <div style="padding: 10px; background-color: #f8f9fa; border-radius: 4px;">
+          {{ currentAfterSaleOrder.returnreason }}
+        </div>
+      </el-card>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <!-- 售后申请操作按钮区域 -->
+      <div v-if="showAfterSaleActions" class="action-buttons">
+        <el-button type="danger" @click="handleRejectAfterSale">
+          <i class="el-icon-close"></i> 驳回申请
+        </el-button>
+        <el-button type="success" @click="handleApproveAfterSale">
+          <i class="el-icon-check"></i> 同意申请
+        </el-button>
+      </div>
+      <!-- 平台收货后操作按钮区域 -->
+      <div v-if="showPlatformActions" class="action-buttons">
+        <el-button type="danger" @click="handleRejectRefund">
+          <i class="el-icon-close"></i> 驳回退款
+        </el-button>
+        <el-button type="success" @click="handleApproveRefund">
+          <i class="el-icon-check"></i> 同意退款
+        </el-button>
+      </div>
+     
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "AfterSaleDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    currentAfterSaleOrder: {
+      type: Object,
+      default: null
+    },
+    showAfterSaleActions: {
+      type: Boolean,
+      default: false
+    },
+    showPlatformActions: {
+      type: Boolean,
+      default: false
+    },
+    returnStatusMap: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    handleClose() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('close');
+    },
+    getReturnStatusType(status) {
+      // 根据状态返回对应的标签类型
+      const statusTypeMap = {
+        1: 'info',    // 待审核
+        2: 'warning', // 审核通过
+        3: 'danger',  // 审核拒绝
+        4: 'success'  // 已完成
+      };
+      return statusTypeMap[status] || 'info';
+    },
+    handleRejectAfterSale() {
+      this.$emit('reject-after-sale');
+    },
+    handleApproveAfterSale() {
+      this.$emit('approve-after-sale');
+    },
+    handleRejectRefund() {
+      this.$emit('reject-refund');
+    },
+    handleApproveRefund() {
+      this.$emit('approve-refund');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.after-sale-detail p {
+  margin: 8px 0;
+  line-height: 1.6;
+}
+
+.after-sale-detail strong {
+  color: #606266;
+  margin-right: 8px;
+}
+
+.action-buttons {
+  margin-bottom: 15px;
+}
+
+.action-buttons .el-button {
+  margin-right: 10px;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/ExcelImportDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/ExcelImportDialog.vue
new file mode 100644
index 0000000..14d8b87
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/ExcelImportDialog.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog
+    title="Excel批量发货"
+    :visible.sync="localVisible"
+    width="60%"
+    append-to-body
+  >
+    <el-form ref="excelImportForm" :model="form" :rules="rules" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="Excel文件" prop="file">
+            <el-upload
+              ref="upload"
+              class="upload-demo"
+              :action="''"
+              :auto-upload="false"
+              :on-change="handleFileChange"
+              :on-remove="handleFileRemove"
+              :before-upload="beforeUpload"
+              :file-list="form.file ? [form.file] : []"
+              accept=".xlsx,.xls"
+              :limit="1"
+            >
+              <el-button size="small" type="primary">选择文件</el-button>
+              <div slot="tip" class="el-upload__tip">
+                只能上传xlsx/xls文件，且不超过2MB
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="操作说明">
+            <div style="background-color: #f5f7fa; padding: 15px; border-radius: 4px; border-left: 4px solid #409EFF;">
+              <h4 style="margin: 0 0 10px 0; color: #409EFF;">📋 Excel文件格式要求：</h4>
+              <p style="margin: 5px 0; color: #606266;">
+                <strong>第1列：</strong>订单号（必填）
+              </p>
+              <p style="margin: 5px 0; color: #606266;">
+                <strong>第2列：</strong>快递公司名称（必填）
+              </p>
+              <p style="margin: 5px 0; color: #606266;">
+                <strong>第3列：</strong>快递单号（必填）
+              </p>
+              <p style="margin: 5px 0; color: #606266;">
+                <strong>第4列：</strong>发货时间（必填，格式：yyyy-MM-dd）
+              </p>
+              <p style="margin: 5px 0; color: #606266;">
+                <strong>注意：</strong>只有状态为"已支付待发货"的订单才能进行批量发货操作
+              </p>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="downloadTemplate" type="info" icon="el-icon-download">
+        下载CSV模板
+      </el-button>
+      <el-button @click="handleCancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="handleConfirm"
+        :loading="loading"
+        :disabled="!form.file"
+      >
+        开始导入
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "ExcelImportDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    form: {
+      type: Object,
+      default: () => ({
+        file: null
+      })
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    handleCancel() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('cancel');
+    },
+    handleConfirm() {
+      this.$emit('confirm', this.form);
+    },
+    handleFileChange(file) {
+      this.$emit('file-change', file);
+    },
+    handleFileRemove() {
+      this.$emit('file-remove');
+    },
+    beforeUpload(file) {
+      this.$emit('before-upload', file);
+      return false; // 阻止自动上传
+    },
+    downloadTemplate() {
+      this.$emit('download-template');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.dialog-footer {
+  text-align: right;
+}
+
+.upload-demo {
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/ImportResultDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/ImportResultDialog.vue
new file mode 100644
index 0000000..f7d5265
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/ImportResultDialog.vue
@@ -0,0 +1,126 @@
+<template>
+  <el-dialog
+    title="导入结果"
+    :visible.sync="localVisible"
+    width="60%"
+    append-to-body
+  >
+    <div v-if="importResult" class="import-result">
+      <el-result
+        :icon="importResult.success > 0 ? 'success' : 'warning'"
+        :title="importResult.success > 0 ? '批量发货完成' : '批量发货失败'"
+        :sub-title="`共处理 ${importResult.total} 个订单`"
+      >
+        <template slot="extra">
+          <el-row :gutter="20" style="width: 100%;">
+            <el-col :span="8">
+              <el-card shadow="hover" style="text-align: center;">
+                <div style="font-size: 24px; color: #67C23A; font-weight: bold;">
+                  {{ importResult.success }}
+                </div>
+                <div style="color: #606266;">成功发货</div>
+              </el-card>
+            </el-col>
+            <el-col :span="8">
+              <el-card shadow="hover" style="text-align: center;">
+                <div style="font-size: 24px; color: #F56C6C; font-weight: bold;">
+                  {{ importResult.fail }}
+                </div>
+                <div style="color: #606266;">发货失败</div>
+              </el-card>
+            </el-col>
+            <el-col :span="8">
+              <el-card shadow="hover" style="text-align: center;">
+                <div style="font-size: 24px; color: #E6A23C; font-weight: bold;">
+                  {{ importResult.skip }}
+                </div>
+                <div style="color: #606266;">跳过处理</div>
+              </el-card>
+            </el-col>
+          </el-row>
+
+          <div style="margin-top: 20px;">
+            <el-collapse v-if="importResult.failList && importResult.failList.length > 0">
+              <el-collapse-item title="失败详情" name="1">
+                <el-tag
+                  v-for="(item, index) in importResult.failList"
+                  :key="index"
+                  type="danger"
+                  style="margin: 5px;"
+                >
+                  {{ item }}
+                </el-tag>
+              </el-collapse-item>
+            </el-collapse>
+
+            <el-collapse v-if="importResult.skipList && importResult.skipList.length > 0">
+              <el-collapse-item title="跳过详情" name="2">
+                <el-tag
+                  v-for="(item, index) in importResult.skipList"
+                  :key="index"
+                  type="warning"
+                  style="margin: 5px;"
+                >
+                  {{ item }}
+                </el-tag>
+              </el-collapse-item>
+            </el-collapse>
+          </div>
+        </template>
+      </el-result>
+    </div>
+    <div v-else>
+      <el-empty description="暂无导入结果"></el-empty>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">关闭</el-button>
+      <el-button type="primary" @click="handleRefresh">刷新订单列表</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "ImportResultDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    importResult: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    handleClose() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('close');
+    },
+    handleRefresh() {
+      this.$emit('refresh');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.import-result {
+  width: 100%;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/PrePaymentDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/PrePaymentDialog.vue
new file mode 100644
index 0000000..91c24f3
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/PrePaymentDialog.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog title="预支付数据" :visible.sync="localVisible" width="80%" append-to-body>
+    <div v-if="prePaymentData" class="pre-payment-data">
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="订单ID">{{ prePaymentData.orderid }}</el-descriptions-item>
+        <el-descriptions-item label="支付时间">{{ parseTime(prePaymentData.paytime, '{y}-{m}-{d} {h}:{i}:{s}') }}</el-descriptions-item>
+      </el-descriptions>
+
+      <!-- 金额信息 -->
+      <el-divider content-position="left">金额信息</el-divider>
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="总金额">
+          <span style="color: #E6A23C; font-weight: bold;">￥{{ prePaymentData.allmoney ? prePaymentData.allmoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="微信支付金额">
+          <span style="color: #67C23A;">￥{{ prePaymentData.wxmoney ? prePaymentData.wxmoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="余额支付金额">
+          <span style="color: #409EFF;">￥{{ prePaymentData.yemoney ? prePaymentData.yemoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="会员优惠金额">
+          <span style="color: #F56C6C;">￥{{ prePaymentData.membermoney ? prePaymentData.membermoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="购物金抵扣金额">
+          <span style="color: #909399;">￥{{ prePaymentData.shopmoney ? prePaymentData.shopmoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="服务金抵扣金额">
+          <span style="color: #E6A23C;">￥{{ prePaymentData.servicemoney ? prePaymentData.servicemoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="优惠券金额">
+          <span style="color: #F56C6C;">￥{{ prePaymentData.couponmoney ? prePaymentData.couponmoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="美团抵扣金额">
+          <span style="color: #67C23A;">￥{{ prePaymentData.mtmoney ? prePaymentData.mtmoney.toFixed(2) : '0.00' }}</span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <div v-else>
+      <el-empty description="暂无预支付数据"></el-empty>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "PrePaymentDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    prePaymentData: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    handleClose() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('close');
+    },
+    parseTime(time, format) {
+      if (!time) return '';
+      // 这里应该使用项目中的时间格式化函数
+      // 暂时返回原始时间，实际使用时需要导入相应的工具函数
+      return time;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.pre-payment-data {
+  width: 100%;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/RefundAmountDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/RefundAmountDialog.vue
new file mode 100644
index 0000000..d1982a8
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/RefundAmountDialog.vue
@@ -0,0 +1,278 @@
+<template>
+  <el-dialog
+    title="退款设置"
+    :visible.sync="localVisible"
+    width="60%"
+    append-to-body
+  >
+    <el-form ref="refundAmountForm" :model="form" :rules="rules" label-width="120px">
+      <!-- 订单金额信息 -->
+      <el-divider content-position="left">订单金额信息</el-divider>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="订单总金额">
+            <el-input
+              v-model="form.orderAmount"
+              disabled
+              style="color: #409EFF; font-weight: bold;"
+            >
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="已支付金额">
+            <el-input
+              v-model="form.payAmount"
+              disabled
+              style="color: #67C23A; font-weight: bold;"
+            >
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 退款类型设置 -->
+      <el-divider content-position="left">退款类型设置</el-divider>
+      
+      <!-- 金额退款 -->
+      <el-form-item label="金额退款" prop="moneyRefund">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-checkbox v-model="form.enableMoneyRefund">启用金额退款</el-checkbox>
+          </el-col>
+          <el-col :span="16">
+            <el-input
+              v-model="form.moneyRefund"
+              type="number"
+              placeholder="请输入退款金额"
+              :min="0"
+              :max="form.payAmount"
+              step="0.01"
+              :disabled="!form.enableMoneyRefund"
+            >
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <!-- 余额退款 -->
+      <el-form-item label="余额退款" prop="balanceRefund">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-checkbox v-model="form.enableBalanceRefund">启用余额退款</el-checkbox>
+          </el-col>
+          <el-col :span="16">
+            <el-input
+              v-model="form.balanceRefund"
+              type="number"
+              placeholder="请输入余额退款金额"
+              :min="0"
+              :max="form.balanceAmount || 0"
+              step="0.01"
+              :disabled="!form.enableBalanceRefund"
+            >
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <!-- 优惠券返还 -->
+      <el-form-item label="优惠券返还" prop="couponRefund">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-checkbox v-model="form.enableCouponRefund">启用优惠券返还</el-checkbox>
+          </el-col>
+          <el-col :span="16">
+            <el-input
+              v-model="form.couponRefund"
+              type="number"
+              placeholder="请输入优惠券返还金额"
+              :min="0"
+              :max="form.couponAmount || 0"
+              step="0.01"
+              :disabled="!form.enableCouponRefund"
+            >
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <!-- 购物金返还 -->
+      <el-form-item label="购物金返还" prop="shoppingRefund">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-checkbox v-model="form.enableShoppingRefund">启用购物金返还</el-checkbox>
+          </el-col>
+          <el-col :span="16">
+            <el-input
+              v-model="form.shoppingRefund"
+              type="number"
+              placeholder="请输入购物金返还金额"
+              :min="0"
+              :max="form.shoppingAmount || 0"
+              step="0.01"
+              :disabled="!form.enableShoppingRefund"
+            >
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <!-- 退款备注 -->
+      <el-form-item label="退款备注" prop="refundRemark">
+        <el-input
+          v-model="form.refundRemark"
+          type="textarea"
+          :rows="3"
+          placeholder="请输入退款备注（可选）"
+          maxlength="200"
+          show-word-limit
+        />
+      </el-form-item>
+
+      <!-- 退款总计 -->
+      <el-divider content-position="left">退款总计</el-divider>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <div class="refund-summary">
+            <el-alert
+              :title="`退款总计：￥${totalRefundAmount}`"
+              type="info"
+              :closable="false"
+              show-icon
+            >
+              <div slot="description">
+                <p>金额退款：￥{{ form.moneyRefund || '0.00' }}</p>
+                <p>余额退款：￥{{ form.balanceRefund || '0.00' }}</p>
+                <p>优惠券返还：￥{{ form.couponRefund || '0.00' }}</p>
+                <p>购物金返还：￥{{ form.shoppingRefund || '0.00' }}</p>
+              </div>
+            </el-alert>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancel">取消</el-button>
+      <el-button type="primary" @click="handleConfirm" :disabled="!canConfirm">确认退款</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "RefundAmountDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    form: {
+      type: Object,
+      default: () => ({
+        orderAmount: 0,
+        payAmount: 0,
+        balanceAmount: 0,
+        couponAmount: 0,
+        shoppingAmount: 0,
+        moneyRefund: '',
+        balanceRefund: '',
+        couponRefund: '',
+        shoppingRefund: '',
+        refundRemark: '',
+        enableMoneyRefund: false,
+        enableBalanceRefund: false,
+        enableCouponRefund: false,
+        enableShoppingRefund: false
+      })
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  computed: {
+    /** 计算退款总金额 */
+    totalRefundAmount() {
+      const money = parseFloat(this.form.moneyRefund) || 0;
+      const balance = parseFloat(this.form.balanceRefund) || 0;
+      const coupon = parseFloat(this.form.couponRefund) || 0;
+      const shopping = parseFloat(this.form.shoppingRefund) || 0;
+      return (money + balance + coupon + shopping).toFixed(2);
+    },
+    /** 是否可以确认退款 */
+    canConfirm() {
+      return this.totalRefundAmount > 0;
+    }
+  },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    handleCancel() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('cancel');
+    },
+    handleConfirm() {
+      this.$refs.refundAmountForm.validate((valid) => {
+        if (valid) {
+          // 构建退款数据
+          const refundData = {
+            ...this.form,
+            totalRefundAmount: this.totalRefundAmount,
+            refundDetails: {
+              moneyRefund: parseFloat(this.form.moneyRefund) || 0,
+              balanceRefund: parseFloat(this.form.balanceRefund) || 0,
+              couponRefund: parseFloat(this.form.couponRefund) || 0,
+              shoppingRefund: parseFloat(this.form.shoppingRefund) || 0
+            }
+          };
+          this.$emit('confirm', refundData);
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.dialog-footer {
+  text-align: right;
+}
+
+.refund-summary {
+  margin-top: 10px;
+}
+
+.refund-summary .el-alert__description p {
+  margin: 5px 0;
+  font-size: 14px;
+  color: #606266;
+}
+
+.el-form-item {
+  margin-bottom: 20px;
+}
+
+.el-divider {
+  margin: 20px 0;
+}
+
+.el-checkbox {
+  margin-right: 0;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/RejectReasonDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/RejectReasonDialog.vue
new file mode 100644
index 0000000..0f4d8b4
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/RejectReasonDialog.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-dialog
+    title="驳回理由"
+    :visible.sync="localVisible"
+    width="40%"
+    append-to-body
+  >
+    <el-form ref="rejectReasonForm" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="驳回理由" prop="rejectReason">
+        <el-input
+          v-model="form.rejectReason"
+          type="textarea"
+          :rows="4"
+          placeholder="请输入驳回理由"
+          maxlength="500"
+          show-word-limit
+        />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancel">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">确认驳回</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "RejectReasonDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    form: {
+      type: Object,
+      default: () => ({
+        rejectReason: ''
+      })
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    handleCancel() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('cancel');
+    },
+    handleConfirm() {
+      this.$refs.rejectReasonForm.validate((valid) => {
+        if (valid) {
+          this.$emit('confirm', this.form);
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/ShipmentDialog.vue b/ruoyi-ui/src/views/system/GoodsOrder/ShipmentDialog.vue
new file mode 100644
index 0000000..b3f19ef
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/ShipmentDialog.vue
@@ -0,0 +1,360 @@
+<template>
+  <el-dialog
+    title="订单发货"
+    :visible.sync="localVisible"
+    width="900px"
+    append-to-body
+  >
+    <!-- 主订单信息 -->
+    <el-card shadow="hover" style="margin-bottom: 20px;" v-if="currentShipOrder && currentShipOrder.isMainRow">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold; color: #409EFF;">
+          <i class="el-icon-s-order"></i>
+          主订单信息
+        </span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <div class="info-item">
+            <label>主订单号：</label>
+            <span class="value">{{ currentShipOrder.mainOrderId }}</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="info-item">
+            <label>收货人：</label>
+            <span class="value">{{ currentShipOrder.name }}</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="info-item">
+            <label>联系电话：</label>
+            <span class="value">{{ currentShipOrder.phone }}</span>
+          </div>
+        </el-col>
+        <el-col :span="24">
+          <div class="info-item">
+            <label>收货地址：</label>
+            <span class="value address">{{ currentShipOrder.address || '未设置' }}</span>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 发货信息 -->
+    <el-card shadow="hover" style="margin-bottom: 20px;">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold; color: #67C23A;">
+          <i class="el-icon-truck"></i>
+          发货信息
+        </span>
+      </div>
+      <el-form ref="shipForm" :model="shipForm" :rules="shipRules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="快递公司" prop="deliveryId">
+            
+              <el-select v-model="shipForm.deliveryId" placeholder="请选择快递公司" style="width: 100%">
+                <el-option
+                  v-for="item in deliveryList"
+                  :key="item.id"
+                  :label="item.title"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="快递单号" prop="deliveryNum">
+              <el-input v-model="shipForm.deliveryNum" placeholder="请输入快递单号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发货时间" prop="sendTime">
+              <el-date-picker
+                v-model="shipForm.sendTime"
+                type="datetime"
+                placeholder="请选择发货时间"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发货备注" prop="mark">
+              <el-input v-model="shipForm.mark" placeholder="请输入发货备注（可选）" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <!-- 商品列表 -->
+    <el-card shadow="hover" style="margin-bottom: 20px;">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold; color: #E6A23C;">
+          <i class="el-icon-goods"></i>
+          商品列表
+        </span>
+      </div>
+      
+      <el-table :data="shipmentOrders" border style="width: 100%">
+        <!-- <el-table-column label="商品图片" width="80" align="center">
+          <template slot-scope="scope">
+            <div class="product-image">
+              <el-image
+                :src="getProductImage(scope.row)"
+                style="width: 50px; height: 50px"
+                fit="cover"
+                :preview-src-list="[getProductImage(scope.row)]"
+              >
+                <div slot="error" class="image-slot">
+                  <i
+                    class="el-icon-picture-outline"
+                    style="font-size: 20px; color: #c0c4cc"
+                  ></i>
+                </div>
+              </el-image>
+            </div>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="商品名称" prop="productName" min-width="200" />
+        <el-table-column label="数量" prop="num" width="80" align="center" />
+         <el-table-column label="规格" prop="sku"  align="center">
+              <template slot-scope="scope">
+               
+                <div class="sku-detail">
+                  <template v-if="scope.row.sku && isJsonString(scope.row.sku)">
+                    <template v-for="(value, key) in getSkuData(scope.row.sku)">
+                      <div
+                        v-if="
+                          key !== 'price' && key !== 'stock' && key !== 'pic'
+                        "
+                      >
+                        {{ key }}:{{ value }}
+                      </div>
+                    </template>
+                  </template>
+                  <template v-else>
+                    <span class="sku-simple">{{ scope.row.sku || "-" }}</span>
+                  </template>
+                </div>
+              </template>
+            </el-table-column>
+        <el-table-column label="金额" prop="totalPrice" width="100" align="center">
+          <template slot-scope="scope">
+            ￥{{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) : '0.00' }}
+          </template>
+        </el-table-column>
+        
+      </el-table>
+    </el-card>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="handleConfirm"
+        :loading="loading"
+      >
+        {{ shipMode === 'batch' ? '批量发货' : '确认发货' }}
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "ShipmentDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    currentShipOrder: {
+      type: Object,
+      default: null
+    },
+    shipmentOrders: {
+      type: Array,
+      default: () => []
+    },
+    deliveryList: {
+      type: Array,
+      default: () => []
+    },
+    shipForm: {
+      type: Object,
+      default: () => ({
+        deliveryId: '',
+        deliveryNum: '',
+        sendTime: '',
+        mark: ''
+      })
+    },
+    shipRules: {
+      type: Object,
+      default: () => ({})
+    },
+    shipMode: {
+      type: String,
+      default: 'single'
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      localVisible: this.visible
+    }
+  },
+  watch: {
+    shipmentOrders: {
+      handler(newVal) {
+        this.shipmentOrders = newVal;
+      },
+      immediate: true
+    },
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
+  methods: {
+    /** 判断字符串是否为有效的JSON */
+    isJsonString(str) {
+      if (!str || typeof str !== "string" || str.trim() === "") {
+        return false;
+      }
+      try {
+        const parsed = JSON.parse(str);
+        return parsed && typeof parsed === "object";
+      } catch (e) {
+        return false;
+      }
+    },
+
+    /** 解析SKU数据 */
+    getSkuData(skuString) {
+      if (!this.isJsonString(skuString)) {
+        return {};
+      }
+      try {
+        return JSON.parse(skuString);
+      } catch (e) {
+        console.warn("SKU数据解析失败:", e);
+        return {};
+      }
+    },
+
+    /** 获取商品图片，优先使用规格中的图片 */
+    getProductImage(row) {
+      // 优先使用规格中的图片
+      if (row.sku && this.isJsonString(row.sku)) {
+        try {
+          const skuData = JSON.parse(row.sku);
+          if (skuData.pic) {
+            return skuData.pic;
+          }
+        } catch (e) {
+          console.warn("SKU数据解析失败:", e);
+        }
+      }
+      
+      // 其次使用商品图片
+      if (row.productImage) {
+        return row.productImage;
+      }
+      
+      // 最后使用pic字段
+      if (row.pic) {
+        return row.pic;
+      }
+      
+      // 都没有则返回空字符串
+      return '';
+    },
+    handleCancel() {
+      this.localVisible = false;
+      this.$emit('update:visible', false);
+      this.$emit('cancel');
+    },
+    handleConfirm() {
+      this.$refs.shipForm.validate((valid) => {
+        if (valid) {
+          this.$emit('confirm', this.shipForm);
+        }
+      });
+    },
+    getStatusType(status) {
+      const statusTypeMap = {
+        1: 'info',    // 待支付
+        2: 'warning', // 已支付待发货
+        3: 'success', // 已发货
+        4: 'info',    // 待评价
+        5: 'success', // 已完成
+        6: 'danger'   // 已取消
+      };
+      return statusTypeMap[status] || 'info';
+    },
+    getStatusText(status) {
+      const statusTextMap = {
+        1: '待支付',
+        2: '已支付待发货',
+        3: '已发货',
+        4: '待评价',
+        5: '已完成',
+        6: '已取消'
+      };
+      return statusTextMap[status] || '未知状态';
+    }
+  }
+};
+</script>
+
+<style scoped>
+.info-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+}
+
+.info-item label {
+  font-weight: bold;
+  margin-right: 10px;
+  color: #606266;
+  min-width: 80px;
+}
+
+.info-item .value {
+  color: #409EFF;
+  font-weight: 500;
+}
+
+.info-item .value.address {
+  color: #67C23A;
+}
+
+.product-image {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.image-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 50px;
+  height: 50px;
+  background: #f5f7fa;
+  color: #c0c4cc;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/details.vue b/ruoyi-ui/src/views/system/GoodsOrder/details.vue
new file mode 100644
index 0000000..4846b60
--- /dev/null
+++ b/ruoyi-ui/src/views/system/GoodsOrder/details.vue
@@ -0,0 +1,1148 @@
+<template>
+  <el-drawer
+    :visible.sync="internalVisible"
+    :title="drawerTitle"
+    size="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <div class="order-detail-container">
+      <!-- 加载状态 -->
+      <div v-if="loading" class="loading-container">
+        <el-skeleton :rows="10" animated />
+      </div>
+      
+      <!-- 订单详情内容 -->
+      <div v-else-if="orderData && Object.keys(orderData).length > 0" class="box">
+        <!-- 订单和金额信息卡片 -->
+        <el-card class="order-amount-card" shadow="hover">
+          <div slot="header" class="card-header">
+            <span class="header-title">
+              <i class="el-icon-s-order"></i>
+              订单和金额信息
+            </span>
+            <el-tag :type="getStatusTagType(orderData.status)" size="medium">
+              {{ getStatusText(orderData.status) }}
+            </el-tag>
+          </div>
+          <el-row :gutter="24">
+            <!-- 订单基本信息 -->
+            <el-col :span="8">
+              <div class="info-section">
+                <h4 class="section-title">
+                  <i class="el-icon-info"></i>
+                  订单信息
+                </h4>
+                <div class="info-item">
+                  <label>用户昵称：</label>
+                  <span class="value">{{ orderData.uname || "未知" }}</span>
+                </div>
+                <div class="info-item">
+                  <label>用户电话：</label>
+                  <span class="value">{{ orderData.uphone || "未知" }}</span>
+                </div>
+              </div>
+            </el-col>
+            <!-- 基础金额信息 -->
+            <el-col :span="8">
+              <div class="info-section">
+                <h4 class="section-title">
+                  <i class="el-icon-money"></i>
+                  基础金额
+                </h4>
+                <div class="info-item">
+                  <label>总金额：</label>
+                  <span class="value amount-total"
+                    >￥{{
+                      orderData.totalPrice
+                        ? orderData.totalPrice.toFixed(2)
+                        : "0.00"
+                    }}</span
+                  >
+                </div>
+                <div class="info-item">
+                  <label>支付金额：</label>
+                  <span class="value amount-pay"
+                    >￥{{
+                      orderData.payPrice
+                        ? orderData.payPrice.toFixed(2)
+                        : "0.00"
+                    }}</span
+                  >
+                </div>
+                <div class="info-item">
+                  <label>抵扣金额：</label>
+                  <span class="value amount-deduction"
+                    >￥{{
+                      orderData.deduction
+                        ? orderData.deduction.toFixed(2)
+                        : "0.00"
+                    }}</span
+                  >
+                </div>
+                <div class="info-item">
+                  <label>商品价格：</label>
+                  <span class="value amount-good"
+                    >￥{{
+                      orderData.goodPrice
+                        ? orderData.goodPrice.toFixed(2)
+                        : "0.00"
+                    }}</span
+                  >
+                </div>
+                
+              </div>
+            </el-col>
+
+            <!-- 详细金额信息 -->
+            <el-col :span="8">
+              <div class="info-section">
+                <h4 class="section-title">
+                  <i class="el-icon-wallet"></i>
+                  详细金额
+                </h4>
+                <div class="info-item">
+                  <label>微信支付：</label>
+                  <span class="value amount-wx"
+                    >￥{{
+                      orderData.wxmoney ? orderData.wxmoney.toFixed(2) : "0.00"
+                    }}</span
+                  >
+                </div>
+                <div class="info-item">
+                  <label>余额支付：</label>
+                  <span class="value amount-balance"
+                    >￥{{
+                      orderData.yemoney ? orderData.yemoney.toFixed(2) : "0.00"
+                    }}</span
+                  >
+                </div>
+                <div class="info-item">
+                  <label>会员优惠：</label>
+                  <span class="value amount-member"
+                    >￥{{
+                      orderData.membermoney
+                        ? orderData.membermoney.toFixed(2)
+                        : "0.00"
+                    }}</span
+                  >
+                </div>
+                <div class="info-item">
+                  <label>优惠券：</label>
+                  <span class="value amount-coupon"
+                    >￥{{
+                      orderData.couponmoney
+                        ? orderData.couponmoney.toFixed(2)
+                        : "0.00"
+                    }}</span
+                  >
+                </div>
+                
+              </div>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <!-- 地址信息卡片 -->
+        <el-card class="address-card" shadow="hover">
+          <div slot="header" class="card-header">
+            <span class="header-title">
+              <i class="el-icon-location"></i>
+              收货地址信息
+            </span>
+            <!-- 已发货提示 -->
+            <el-tag v-if="isOrderShipped" type="warning" size="small">
+              <i class="el-icon-warning"></i> 已发货，不可修改
+            </el-tag>
+          </div>
+
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <div class="info-item">
+                <label>联系人：</label>
+                <el-input
+                  v-model="orderData.name"
+                  placeholder="请输入联系人姓名"
+                  style="width: 100%"
+                  size="small"
+                  :disabled="isOrderShipped"
+                />
+              </div>
+            </el-col>
+            <el-col :span="8">
+              <div class="info-item">
+                <label>联系电话：</label>
+                <el-input
+                  v-model="orderData.phone"
+                  placeholder="请输入联系电话"
+                  style="width: 100%"
+                  size="small"
+                  :disabled="isOrderShipped"
+                />
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="info-item">
+                <label>地图位置：</label>
+               
+                <AddressSelector
+                  :longitude="orderData.longitude"
+                  :latitude="orderData.latitude"
+                  :address="orderData.address"
+                  @location-selected="handleLocationSelected"
+                  :disabled="isOrderShipped"
+                />
+              </div>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <div class="info-item">
+                <label>详细地址：</label>
+                <el-input
+                  v-model="orderData.adressinfo"
+                  type="textarea"
+                  placeholder="请输入详细地址"
+                  :rows="3"
+                  style="width: 100%"
+                  size="small"
+                  :disabled="isOrderShipped"
+                />
+              </div>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <!-- 物流信息卡片 -->
+        <el-card class="logistics-card" shadow="hover" v-if="orderData.deliveryName || orderData.deliveryNum">
+          <div slot="header" class="card-header">
+            <span class="header-title">
+              <i class="el-icon-truck"></i>
+              物流信息
+            </span>
+            <el-tag v-if="orderData.status >= 3" type="success" size="small">
+              已发货
+            </el-tag>
+          </div>
+
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <div class="info-item">
+                <label>物流公司：</label>
+                <span class="value logistics-company">{{ orderData.deliveryName || '未设置' }}</span>
+              </div>
+            </el-col>
+            <el-col :span="8">
+              <div class="info-item">
+                <label>物流单号：</label>
+                <span class="value logistics-number">{{ orderData.deliveryNum || '未设置' }}</span>
+              </div>
+            </el-col>
+           
+          </el-row>
+
+          <el-row :gutter="24" v-if="orderData.mark">
+            <el-col :span="24">
+              <div class="info-item">
+                <label>物流备注：</label>
+                <span class="value logistics-remark">{{ orderData.mark }}</span>
+              </div>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <!-- 商品明细卡片 -->
+        <el-card class="products-card" shadow="hover">
+          <div slot="header" class="card-header">
+            <span class="header-title">
+              <i class="el-icon-goods"></i>
+              商品明细 ({{
+                validChildren && validChildren.length > 0
+                  ? validChildren.length
+                  : 1
+              }}个商品)
+            </span>
+            <!-- 子订单加载状态 -->
+            <el-tag v-if="childrenLoading" type="info" size="small">
+              <i class="el-icon-loading"></i> 加载子订单中...
+            </el-tag>
+          </div>
+
+          <!-- 商品表格 -->
+          <el-table
+            :data="
+              validChildren && validChildren.length > 0
+                ? validChildren
+                : [orderData]
+            "
+            border
+            size="small"
+            style="width: 100%"
+            v-loading="childrenLoading"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              width="60"
+              align="center"
+            />
+            <!-- <el-table-column label="商品图片" width="80" align="center">
+              <template slot-scope="scope">
+                <div class="product-image">
+                  <el-image
+                    :src="getProductImage(scope.row)"
+                    style="width: 50px; height: 50px"
+                    fit="cover"
+                    :preview-src-list="[getProductImage(scope.row)]"
+                  >
+                    <div slot="error" class="image-slot">
+                      <i
+                        class="el-icon-picture-outline"
+                        style="font-size: 20px; color: #c0c4cc"
+                      ></i>
+                    </div>
+                  </el-image>
+                </div>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="商品名称" prop="productName">
+              <template slot-scope="scope">
+                <div class="product-name">
+                  <span class="name">{{
+                    scope.row.productName || "未知商品"
+                  }}</span>
+                </div>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="规格" prop="specifications" align="center">
+              <template slot-scope="scope">
+                <div class="sku-detail">
+                  <template v-if="scope.row.sku && isJsonString(scope.row.sku)">
+                    <template v-for="(value, key) in getSkuData(scope.row.sku)">
+                      <div
+                        v-if="
+                          key !== 'price' && key !== 'stock' && key !== 'pic'
+                        "
+                      >
+                        {{ key }}:{{ value }}
+                      </div>
+                    </template>
+                  </template>
+                  <template v-else>
+                    <span class="sku-simple">{{ scope.row.sku || "-" }}</span>
+                  </template>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" prop="num" align="center" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.num || 0 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="单价"
+              prop="goodPrice"
+              align="center"
+              width="100"
+            >
+              <template slot-scope="scope">
+                ￥{{
+                  scope.row.goodPrice ? scope.row.goodPrice.toFixed(2) : "0.00"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="小计"
+              prop="totalPrice"
+              align="center"
+              width="100"
+            >
+              <template slot-scope="scope">
+                ￥{{
+                  scope.row.totalPrice
+                    ? scope.row.totalPrice.toFixed(2)
+                    : "0.00"
+                }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </div>
+    </div>
+
+    <!-- 底部操作按钮 -->
+    <div class="drawer-footer">
+      <el-button @click="handleClose">关闭</el-button>
+      <el-button
+        type="primary"
+        @click="handleSave"
+        :loading="saveLoading"
+        v-hasPermi="['system:goodsOrder:edit']"
+      >
+        保存修改
+      </el-button>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import { updateGoodsOrder, getGoodsOrder, getGoodsOrderByMainOrderId } from "@/api/system/GoodsOrder";
+import AddressSelector from "@/components/AddressSelector";
+
+export default {
+  name: "GoodsOrderDetails",
+  components: {
+    AddressSelector,
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    orderId: {
+      type: [String, Number],
+      default: null,
+    },
+  },
+  data() {
+    return {
+      saveLoading: false,
+      // 使用内部状态来管理抽屉的显示/隐藏
+      internalVisible: false,
+      // 订单数据
+      orderData: {},
+      // 子订单数据
+      childrenOrders: [],
+      // 加载状态
+      loading: false,
+      // 子订单加载状态
+      childrenLoading: false,
+    };
+  },
+  created() {
+    console.log("组件创建时的 orderId:", this.orderId);
+  },
+  mounted() {
+    console.log("组件挂载后的 orderId:", this.orderId);
+  },
+  computed: {
+    drawerTitle() {
+      return `订单详情 - ${this.orderData.orderId || "未知订单"}`;
+    },
+
+    // 判断订单是否已发货（状态 >= 3 表示已发货）
+    isOrderShipped() {
+      return this.orderData.status >= 3;
+    },
+
+    // 过滤有效的子订单数据
+    validChildren() {
+      if (!this.childrenOrders || !Array.isArray(this.childrenOrders)) {
+        return [];
+      }
+      return this.childrenOrders.filter(
+        (child) => child && typeof child === "object"
+      );
+    },
+  },
+  watch: {
+    // 监听 visible prop 的变化，同步到内部状态
+    visible: {
+      immediate: true,
+      handler(newVal) {
+        this.internalVisible = newVal;
+        // 当弹窗打开时，获取订单详情
+        if (newVal && this.orderId) {
+          this.fetchOrderDetails();
+        }
+      },
+    },
+    // 监听 orderId 的变化
+    orderId: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal && this.internalVisible) {
+          this.fetchOrderDetails();
+        }
+      },
+    },
+  },
+  methods: {
+    /** 获取订单详情 */
+    async fetchOrderDetails() {
+      if (!this.orderId) {
+        this.$modal.msgError("订单ID不能为空");
+        return;
+      }
+
+      this.loading = true;
+      this.childrenOrders = []; // 清空之前的子订单数据
+      try {
+        const response = await getGoodsOrder(this.orderId);
+        if (response.code === 200) {
+          this.orderData = response.data;
+          console.log("获取到的订单详情:", this.orderData);
+          
+          // 如果订单有主订单ID，则获取子订单
+          if (this.orderData.mainOrderId) {
+            await this.fetchChildrenOrders(this.orderData.mainOrderId);
+          }
+        } else {
+          this.$modal.msgError(response.msg || "获取订单详情失败");
+        }
+      } catch (error) {
+        console.error("获取订单详情失败:", error);
+        this.$modal.msgError("获取订单详情失败，请重试");
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    /** 获取子订单数据 */
+    async fetchChildrenOrders(mainOrderId) {
+      if (!mainOrderId) {
+        return;
+      }
+
+      this.childrenLoading = true;
+      try {
+        const response = await getGoodsOrderByMainOrderId(mainOrderId);
+        if (response.code === 200) {
+          this.childrenOrders = response.data || [];
+          console.log("获取到的子订单:", this.childrenOrders);
+        } else {
+          console.warn("获取子订单失败:", response.msg);
+          this.childrenOrders = [];
+        }
+      } catch (error) {
+        console.error("获取子订单失败:", error);
+        this.childrenOrders = [];
+      } finally {
+        this.childrenLoading = false;
+      }
+    },
+
+    /** 关闭抽屉 */
+    handleClose() {
+      this.internalVisible = false;
+      this.$emit("update:visible", false);
+      // 清空数据
+      this.orderData = {};
+      this.childrenOrders = [];
+    },
+
+    /** 处理位置选择 */
+    handleLocationSelected(locationData) {
+      this.orderData.longitude = locationData.longitude;
+      this.orderData.latitude = locationData.latitude;
+      this.orderData.address = locationData.address;
+    },
+
+    /** 保存修改 */
+    async handleSave() {
+      if (!this.orderData || !this.orderData.id) {
+        this.$modal.msgError("没有可保存的修改");
+        return;
+      }
+
+      // 检查订单是否已发货
+      if (this.isOrderShipped) {
+        this.$modal.msgWarning("订单已发货，无法修改收货地址信息");
+        return;
+      }
+
+      this.saveLoading = true;
+      try {
+        // 如果是主订单，需要更新所有子订单的收货地址信息
+        if (
+          this.orderData.mainOrderId &&
+          this.validChildren &&
+          this.validChildren.length > 0
+        ) {
+          // 批量更新所有子订单的收货地址信息
+          const updatePromises = this.validChildren.map((child) => {
+            const updateData = {
+              id: child.id,
+              uname: this.orderData.uname,
+              phone: this.orderData.phone,
+              detailAddress: this.orderData.detailAddress,
+              address: this.orderData.address,
+              longitude: this.orderData.longitude,
+              latitude: this.orderData.latitude,
+            };
+            return updateGoodsOrder(updateData);
+          });
+
+          await Promise.all(updatePromises);
+          this.$modal.msgSuccess(
+            "主订单及所有子订单的收货地址信息修改保存成功"
+          );
+        } else {
+          // 单个订单更新
+          const updateData = {
+            id: this.orderData.id,
+            uname: this.orderData.uname,
+            phone: this.orderData.phone,
+            adressinfo: this.orderData.adressinfo,
+            address: this.orderData.address,
+            longitude: this.orderData.longitude,
+            latitude: this.orderData.latitude,
+          };
+          await updateGoodsOrder(updateData);
+          this.$modal.msgSuccess("收货地址信息修改保存成功");
+        }
+
+        // 关闭抽屉
+        this.internalVisible = false;
+        this.$emit("update:visible", false);
+
+        // 通知父组件刷新数据
+        this.$emit("refresh");
+      } catch (error) {
+        console.error("保存订单修改失败:", error);
+        this.$modal.msgError("保存失败，请重试");
+      } finally {
+        this.saveLoading = false;
+      }
+    },
+
+    /** 获取状态标签类型 */
+    getStatusTagType(status) {
+      const typeMap = {
+        1: "info", // 待支付
+        2: "success", // 已支付，待发货
+        3: "warning", // 待收货
+        4: "primary", // 待评价
+        5: "success", // 已收货
+        6: "danger", // 取消
+        20: "warning", // 申请退款
+        21: "success", // 同意退款
+        22: "danger", // 驳回退款
+      };
+      return typeMap[status] || "info";
+    },
+
+    /** 获取状态文本 */
+    getStatusText(status) {
+      const textMap = {
+        1: "待支付",
+        2: "已支付，待发货",
+        3: "待收货",
+        4: "待评价",
+        5: "已收货",
+        6: "已取消",
+        20: "申请退款",
+        21: "同意退款",
+        22: "驳回退款",
+      };
+      return textMap[status] || "未知状态";
+    },
+
+    /** 获取发货状态标签类型 */
+    getShipmentStatusType(status) {
+      const typeMap = {
+        1: "info", // 待支付
+        2: "info", // 已支付，待发货
+        3: "success", // 待收货
+        4: "primary", // 待评价
+        5: "success", // 已收货
+        6: "danger", // 取消
+        20: "warning", // 申请退款
+        21: "success", // 同意退款
+        22: "danger", // 驳回退款
+      };
+      return typeMap[status] || "info";
+    },
+
+    /** 获取发货状态文本 */
+    getShipmentStatusText(status) {
+      const textMap = {
+        1: "待发货",
+        2: "待发货",
+        3: "已发货",
+        4: "待评价",
+        5: "已收货",
+        6: "已取消",
+        20: "申请退款",
+        21: "同意退款",
+        22: "驳回退款",
+      };
+      return textMap[status] || "未知状态";
+    },
+
+    /** 格式化日期 */
+    formatDate(date) {
+      if (!date) return "未知";
+      return new Date(date).toLocaleString("zh-CN");
+    },
+
+    /** 判断字符串是否为有效的JSON */
+    isJsonString(str) {
+      if (!str || typeof str !== "string" || str.trim() === "") {
+        return false;
+      }
+      try {
+        const parsed = JSON.parse(str);
+        return parsed && typeof parsed === "object";
+      } catch (e) {
+        return false;
+      }
+    },
+
+    /** 解析SKU数据 */
+    getSkuData(skuString) {
+      if (!this.isJsonString(skuString)) {
+        return {};
+      }
+      try {
+        return JSON.parse(skuString);
+      } catch (e) {
+        console.warn("SKU数据解析失败:", e);
+        return {};
+      }
+    },
+
+    /** 获取商品图片，优先使用规格中的图片 */
+    getProductImage(row) {
+      // 优先使用规格中的图片
+      if (row.sku && this.isJsonString(row.sku)) {
+        try {
+          const skuData = JSON.parse(row.sku);
+          if (skuData.pic) {
+            return skuData.pic;
+          }
+        } catch (e) {
+          console.warn("SKU数据解析失败:", e);
+        }
+      }
+      
+      // 其次使用商品图片
+      if (row.productImage) {
+        return row.productImage;
+      }
+      
+      // 最后使用pic字段
+      if (row.pic) {
+        return row.pic;
+      }
+      
+      // 都没有则返回空字符串
+      return '';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.order-detail-container {
+  height: calc(100% - 55px);
+
+  display: flex;
+  .box {
+    flex: 1;
+    overflow-y: auto;
+  }
+}
+
+.order-amount-card,
+.address-card,
+.products-card,
+.statistics-card {
+  margin-bottom: 20px;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.header-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #303133;
+}
+
+.header-title i {
+  margin-right: 8px;
+  color: #409eff;
+}
+
+/* 信息分组样式 */
+.info-section {
+  padding: 15px;
+  background: #fafafa;
+  border-radius: 6px;
+  border: 1px solid #e4e7ed;
+  height: 100%;
+}
+
+.section-title {
+  margin: 0 0 15px 0;
+  padding-bottom: 8px;
+  border-bottom: 2px solid #409eff;
+  color: #303133;
+  font-size: 14px;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+}
+
+.section-title i {
+  margin-right: 6px;
+  color: #409eff;
+  font-size: 16px;
+}
+
+.header-actions {
+  display: flex;
+  gap: 10px;
+}
+
+.info-item {
+  margin-bottom: 12px;
+  display: flex;
+  align-items: center;
+}
+
+.info-item label {
+  font-weight: bold;
+  color: #606266;
+  min-width: 80px;
+  margin-right: 8px;
+}
+
+.info-item .value {
+  color: #303133;
+  flex: 1;
+}
+
+.info-item .value.highlight {
+  color: #409eff;
+  font-weight: bold;
+  font-size: 16px;
+}
+
+.info-item .value.price {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+/* 金额信息样式 */
+.info-item .value.amount-total {
+  color: #e6a23c;
+  font-weight: bold;
+  font-size: 16px;
+}
+
+.info-item .value.amount-wx {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.info-item .value.amount-balance {
+  color: #409eff;
+  font-weight: bold;
+}
+
+.info-item .value.amount-member {
+  color: #f56c6c;
+  font-weight: bold;
+}
+
+.info-item .value.amount-shop {
+  color: #909399;
+  font-weight: bold;
+}
+
+.info-item .value.amount-service {
+  color: #e6a23c;
+  font-weight: bold;
+}
+
+.info-item .value.amount-coupon {
+  color: #f56c6c;
+  font-weight: bold;
+}
+
+.info-item .value.amount-meituan {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.info-item .value.amount-refund {
+  color: #f56c6c;
+  font-weight: bold;
+}
+
+.info-item .value.amount-good {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.info-item .value.amount-pay {
+  color: #409eff;
+  font-weight: bold;
+}
+
+.info-item .value.amount-deduction {
+  color: #f56c6c;
+  font-weight: bold;
+}
+
+.info-item .value.address {
+  color: #606266;
+  max-width: 200px;
+  word-break: break-all;
+}
+
+/* 统计卡片样式 */
+.stat-item {
+  text-align: center;
+  padding: 20px;
+}
+
+.stat-number {
+  font-size: 24px;
+  font-weight: bold;
+  color: #409eff;
+  margin-bottom: 8px;
+}
+
+.stat-label {
+  color: #606266;
+  font-size: 14px;
+}
+
+/* 商品表格样式 */
+.product-name .name {
+  font-weight: 500;
+  margin-right: 8px;
+}
+
+.product-image .image-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 50px;
+  height: 50px;
+  background: #f5f7fa;
+  color: #909399;
+  font-size: 20px;
+}
+
+.drawer-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px;
+  border-top: 1px solid #e4e7ed;
+  background: #fff;
+}
+
+.sku-info {
+  color: #909399;
+  font-size: 12px;
+  margin-top: 5px;
+}
+
+/* SKU详情样式 */
+.sku-detail {
+  text-align: left;
+  padding: 8px;
+  background: #f8f9fa;
+  border-radius: 4px;
+  border: 1px solid #e9ecef;
+}
+
+.sku-desc {
+  color: #606266;
+  font-size: 12px;
+  line-height: 1.4;
+}
+
+.sku-simple {
+  color: #909399;
+  font-size: 12px;
+}
+
+.product-image {
+  text-align: center;
+}
+
+.product-info {
+  h4 {
+    margin: 0 0 10px 0;
+    color: #303133;
+  }
+
+  .sku-info {
+    color: #909399;
+    font-size: 12px;
+    margin: 5px 0;
+  }
+
+  .product-price {
+    color: #606266;
+    margin: 10px 0 5px 0;
+  }
+
+  .product-total {
+    color: #f56c6c;
+    font-weight: 600;
+    font-size: 16px;
+    margin: 5px 0;
+  }
+}
+
+.product-name {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.product-description {
+  margin-top: 5px;
+  color: #909399;
+  font-size: 12px;
+  line-height: 1.4;
+  max-width: 300px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* 收货地址输入框样式 */
+.info-item .el-input {
+  flex: 1;
+}
+
+.info-item .el-textarea__inner {
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  padding: 8px 12px;
+  font-size: 14px;
+  line-height: 1.5;
+  resize: vertical;
+  min-height: 60px;
+}
+
+.info-item .el-textarea__inner:focus {
+  border-color: #409eff;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+}
+
+/* 加载状态样式 */
+.loading-container {
+  padding: 20px;
+  text-align: center;
+}
+
+.loading-container .el-skeleton {
+  width: 100%;
+}
+
+/* 子订单加载状态样式 */
+.card-header .el-tag {
+  margin-left: 10px;
+}
+
+.card-header .el-tag i {
+  margin-right: 5px;
+}
+
+/* 响应式设计 */
+@media (max-width: 1200px) {
+  .info-section {
+    padding: 12px;
+  }
+
+  .section-title {
+    font-size: 13px;
+    margin-bottom: 12px;
+  }
+}
+
+@media (max-width: 768px) {
+  .order-detail-container {
+    max-height: 60vh;
+  }
+
+  .order-amount-card,
+  .address-card,
+  .products-card,
+  .statistics-card {
+    margin-bottom: 15px;
+  }
+
+  .info-section {
+    padding: 10px;
+    margin-bottom: 10px;
+  }
+
+  .section-title {
+    font-size: 12px;
+    margin-bottom: 10px;
+  }
+
+  .info-item {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .info-item label {
+    margin-bottom: 5px;
+  }
+
+  .stat-item {
+    padding: 10px;
+  }
+
+  .stat-number {
+    font-size: 20px;
+  }
+}
+
+/* 物流信息样式 */
+.logistics-card {
+  margin-bottom: 20px;
+}
+
+.logistics-card .logistics-company {
+  color: #409EFF;
+  font-weight: 500;
+}
+
+.logistics-card .logistics-number {
+  color: #67C23A;
+  font-weight: 500;
+  font-family: monospace;
+}
+
+.logistics-card .logistics-remark {
+  color: #E6A23C;
+  font-style: italic;
+  background-color: #fdf6ec;
+  padding: 8px 12px;
+  border-radius: 4px;
+  border-left: 3px solid #E6A23C;
+}
+
+/* 已发货订单的禁用样式 */
+.address-card .el-input.is-disabled .el-input__inner,
+.address-card .el-textarea.is-disabled .el-textarea__inner {
+  background-color: #f5f7fa;
+  color: #c0c4cc;
+  cursor: not-allowed;
+}
+
+.address-card .el-input.is-disabled .el-input__inner::placeholder,
+.address-card .el-textarea.is-disabled .el-textarea__inner::placeholder {
+  color: #c0c4cc;
+}
+
+/* 子订单加载状态样式 */
+</style>
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/index.vue b/ruoyi-ui/src/views/system/GoodsOrder/index.vue
index 6082f4e..63e5faf 100644
--- a/ruoyi-ui/src/views/system/GoodsOrder/index.vue
+++ b/ruoyi-ui/src/views/system/GoodsOrder/index.vue
@@ -2,22 +2,15 @@
   <div class="app-container">
     <!-- 搜索表单 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="主订单号" prop="mainOrderId">
+      <el-form-item label="订单号" prop="mainOrderId">
         <el-input
           v-model="queryParams.mainOrderId"
-          placeholder="请输入主订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
           placeholder="请输入订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+     
       <el-form-item label="支付单号" prop="transactionId">
         <el-input
           v-model="queryParams.transactionId"
@@ -158,38 +151,8 @@
 
     <!-- 操作按钮 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:GoodsOrder:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:GoodsOrder:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:GoodsOrder:remove']"
-        >删除</el-button>
-      </el-col>
+
+     
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -200,15 +163,7 @@
           v-hasPermi="['system:GoodsOrder:edit']"
         >Excel批量发货</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshData"
-        >刷新数据</el-button>
-      </el-col>
+     
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -225,195 +180,84 @@
     <!-- 数据表格 -->
     <el-table
       v-loading="loading"
-      :data="groupedGoodsOrderList"
+      :data="GoodsOrderList"
       @selection-change="handleSelectionChange"
       border
-      :row-class-name="getRowClassName"
-      :span-method="objectSpanMethod"
-      :expand-row-keys="expandedRows"
-      @expand-change="handleExpandChange"
     >
-      <el-table-column type="expand" width="50">
-        <template slot-scope="props">
-          <div v-if="props.row.isMainRow && props.row.children && props.row.children.length > 1" class="expanded-content">
-            <el-card shadow="never" style="margin: 10px;">
-              <div slot="header" class="expanded-header">
-                <span style="font-weight: bold; color: #409EFF;">
-                  <i class="el-icon-goods"></i>
-                  商品明细 ({{ props.row.children.length }}个商品)
-                </span>
-              </div>
-              <el-table :data="props.row.children" border size="mini" style="width: 100%">
-                <el-table-column label="商品名称" prop="productName" min-width="150" />
-                <el-table-column label="数量" prop="num" width="80" align="center" />
-                <el-table-column label="单价" prop="goodPrice" width="100" align="center">
-                  <template slot-scope="scope">
-                    ￥{{ scope.row.goodPrice ? scope.row.goodPrice.toFixed(2) : '0.00' }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="小计" prop="totalPrice" width="100" align="center">
-                  <template slot-scope="scope">
-                    ￥{{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) : '0.00' }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="状态" prop="status" width="100" align="center">
-                  <template slot-scope="scope">
-                    <dict-tag :options="dict.type.goods_order_status" :value="scope.row.status"/>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="150" align="center">
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-edit"
-                      @click="handleUpdate(scope.row)"
-                      v-hasPermi="['system:GoodsOrder:edit']"
-                    >修改</el-button>
-                    <el-button
-                      v-if="scope.row.status === 2"
-                      size="mini"
-                      type="text"
-                      icon="el-icon-sell"
-                      @click="handleShip(scope.row)"
-                      style="color: #67C23A;"
-                    >发货</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-card>
-          </div>
-        </template>
-      </el-table-column>
+
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主订单号" align="center" prop="mainOrderId" width="120" />
-      <el-table-column label="订单号" align="center" prop="orderId" width="120" />
-<!--      <el-table-column label="用户" align="center" width="95" prop="uname" />-->
-      <el-table-column label="商品" align="center" prop="productName" width="200">
-        <template slot-scope="scope">
-          <div v-if="scope.row.isMainRow && scope.row.children && scope.row.children.length > 1">
-            <!-- 主订单行：显示商品汇总信息 -->
-            <div class="product-summary">
-              <div class="summary-header">
-                <el-tag type="primary" size="mini" style="margin-bottom: 5px;">
-                  <i class="el-icon-s-order"></i>
-                  主订单 ({{ scope.row.subOrderCount || scope.row.children.length }}个商品)
-                </el-tag>
-              </div>
-              <div class="order-counts">
-                <el-tag type="info" size="mini" style="margin-right: 5px;">
-                  <i class="el-icon-tickets"></i>
-                  {{ scope.row.subOrderCount || scope.row.children.length }}个订单号
-                </el-tag>
-                <el-tag type="success" size="mini">
-                  <i class="el-icon-goods"></i>
-                  总数量: {{ scope.row.num }}
-                </el-tag>
-              </div>
-              <el-button
-                type="text"
-                size="mini"
-                @click="handleViewDetails(scope.row)"
-                style="color: #409EFF; padding: 0; margin-top: 5px;"
-              >
-                <i class="el-icon-view"></i>
-                查看详情
-              </el-button>
-              <div class="product-preview">
-                <el-tag
-                  v-for="(product, index) in scope.row.children.slice(0, 3)"
-                  :key="index"
-                  size="mini"
-                  type="info"
-                  style="margin: 2px;"
-                >
-                  {{ product.productName || '未知商品' }}
-                </el-tag>
-                <span v-if="scope.row.children.length > 3" style="color: #909399; font-size: 12px;">
-                  +{{ scope.row.children.length - 3 }}个
-                </span>
-              </div>
-            </div>
-          </div>
-          <div v-else-if="scope.row.isMainRow && scope.row.children && scope.row.children.length === 1">
-            <!-- 主订单行：只有一个商品 -->
-            <div class="single-product">
-              <el-tag size="mini" type="success">
-                {{ scope.row.children[0].productName || '未知商品' }}
-              </el-tag>
-              <span style="margin-left: 5px; color: #666; font-size: 12px;">
-                x{{ scope.row.children[0].num || 0 }}
-              </span>
-            </div>
-          </div>
-          <div v-else>
-            <!-- 普通行：直接显示商品信息 -->
-            <el-tag size="mini" type="primary">
-              {{ scope.row.productName || '未知商品' }}
-            </el-tag>
-            <span style="margin-left: 5px; color: #666; font-size: 12px;">
-              x{{ scope.row.num || 0 }}
-            </span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="姓名" align="center" width="75" prop="name" />
-      <el-table-column label="电话" align="center" width="125" prop="phone" />
-      <el-table-column label="数量" align="center" width="65" prop="num" />
-      <el-table-column label="总价" width="120px" align="left" prop="totalPrice">
-        <template slot-scope="scope">
-          <span>￥{{scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) : '0.00'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付金额" width="120px" align="left" prop="payPrice">
-        <template slot-scope="scope">
-          <span
-            style="color: #409EFF; cursor: pointer; text-decoration: underline;"
-            @click="handlePrePaymentClick(scope.row)"
-          >￥{{scope.row.payPrice ? scope.row.payPrice.toFixed(2) : '0.00'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="抵扣金额" width="120px" align="left" prop="deduction">
-        <template slot-scope="scope">
-          <span>￥{{scope.row.deduction ? scope.row.deduction.toFixed(2) : '0.00'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付时间" align="center" prop="payTime" width="150">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单状态" align="center" prop="status">
+      
+      <!-- 订单基本信息 -->
+      <el-table-column label="主订单号" align="center" prop="mainOrderId" class-name="order-column" />
+    
+      <el-table-column label="订单状态" align="center" prop="status"  class-name="order-column">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.goods_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createdAt" width="150">
+      
+      <!-- 商品信息 -->
+      <el-table-column label="商品" align="center" prop="productName"  class-name="product-column">
+        <template slot-scope="scope">
+          <div>
+            <!-- 显示商品信息 -->
+            <div class="single-product" v-for="value in (scope.row.children && scope.row.children.length > 0 ? scope.row.children : [scope.row])" :key="value.id || value.orderId">
+              <el-tag size="mini" type="success">
+                {{ value.productName || '未知商品' }}
+              </el-tag>
+              <span style="margin-left: 5px; color: #666; font-size: 12px;">
+                x{{ value.num || 0 }}
+              </span>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" align="center" width="65" prop="num" class-name="product-column" />
+      
+      <!-- 金额信息 -->
+      <el-table-column label="总价" width="100px" align="center" prop="totalPrice" class-name="amount-column">
+        <template slot-scope="scope">
+          <span class="amount-total">￥{{scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) : '0.00'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付金额" width="100px" align="center" prop="payPrice" class-name="amount-column">
+        <template slot-scope="scope">
+          <span
+            class="amount-pay"
+            style="cursor: pointer; text-decoration: underline;"
+            @click="handlePrePaymentClick(scope.row)"
+          >￥{{scope.row.payPrice ? scope.row.payPrice.toFixed(2) : '0.00'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="抵扣金额" width="100px" align="center" prop="deduction" class-name="amount-column">
+        <template slot-scope="scope">
+          <span class="amount-deduction">￥{{scope.row.deduction ? scope.row.deduction.toFixed(2) : '0.00'}}</span>
+        </template>
+      </el-table-column>
+      
+      <!-- 用户信息 -->
+      <el-table-column label="姓名" align="center" width="75" prop="name" class-name="user-column" />
+      <el-table-column label="电话" align="center" width="125" prop="phone" class-name="user-column" />
+      
+      <!-- 时间信息 -->
+      <el-table-column label="支付时间" align="center" prop="payTime" width="120" class-name="time-column">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createdAt" width="120" class-name="time-column">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updatedAt" width="150">
+      <el-table-column label="更新时间" align="center" prop="updatedAt" width="120" class-name="time-column">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作"    align="center"  class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:GoodsOrder:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:GoodsOrder:remove']"
-          >删除</el-button>
+        
           <!-- 发货按钮 - 只有已支付待发货状态的订单才显示 -->
           <el-button
             v-if="scope.row.status === 2"
@@ -435,1090 +279,149 @@
 
           <!-- 如果是主行，显示查看详情按钮 -->
           <el-button
-            v-if="scope.row.isMainRow && scope.row.children && scope.row.children.length > 1"
+           
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="handleViewDetails(scope.row)"
             style="color: #909399;"
           >查看详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:GoodsOrder:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页 -->
-    <pagination
-      v-show="groupedGoodsOrderList.length>0"
-      :total="groupedGoodsOrderList.length"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+            <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+
+
+
+
 
-    <!-- 添加或修改商品订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body @close="handleMainDialogClose">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <!-- 基本信息 -->
-        <el-card shadow="hover" style="margin-bottom: 20px;">
-          <div slot="header" class="clearfix">
-            <span style="font-weight: bold; color: #409EFF;">
-              <i class="el-icon-s-order"></i>
-              基本信息
-            </span>
-          </div>
-        <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="主订单号" prop="mainOrderId">
-                <el-input v-model="form.mainOrderId" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-              <el-form-item label="用户" prop="uid" required>
-              <user-select
-                v-model="form.uid"
-                placeholder="请选择用户"
-                user-type="1"
-                dialog-title="选择用户"
-                @change="handleUserSelectChange"
-              />
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-              <el-form-item label="服务商品" prop="productId" required>
-              <el-select
-                v-model="form.productId"
-                  placeholder="请选择服务商品"
-                clearable
-                filterable
-                style="width: 100%"
-                  @change="handleProductSelectChange"
-              >
-                <el-option
-                  v-for="item in goodsDataList"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                  >
-                    <span style="float: left">{{ item.title }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">￥{{ item.price }}</span>
-                  </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-              <el-form-item label="预约时间" prop="appointmentTime" required>
-                <el-date-picker
-                  v-model="form.appointmentTime"
-                  type="datetime"
-                  placeholder="请选择预约时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 100%"
-                  :picker-options="pickerOptions"
-              />
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-              <el-form-item label="数量" prop="num" required>
-              <el-input-number
-                  v-model="form.num"
-                  :min="1"
-                  :max="999"
-                style="width: 100%"
-                  @change="calculateTotalPrice"
-              />
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-              <el-form-item label="单价" prop="goodPrice">
-                <el-input v-model="form.goodPrice" placeholder="系统自动获取" disabled>
-                  <template slot="append">元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-card>
 
-        <!-- 收货信息 -->
-        <el-card shadow="hover" style="margin-bottom: 20px;">
-          <div slot="header" class="clearfix">
-            <span style="font-weight: bold; color: #67C23A;">
-              <i class="el-icon-location"></i>
-              收货信息
-            </span>
-            <el-button
-              style="float: right; padding: 3px 0"
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshUserAddress"
-              v-if="form.uid"
-            >
-              刷新地址
-            </el-button>
-          </div>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="收货人" prop="name" required>
-                <el-input v-model="form.name" placeholder="请输入收货人姓名" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="phone" required>
-                <el-input v-model="form.phone" placeholder="请输入联系电话" />
-              </el-form-item>
-            </el-col>
-          <el-col :span="24">
-              <el-form-item label="收货地址" prop="addressId" required>
-                <el-select
-                  v-model="form.addressId"
-                  placeholder="请选择收货地址"
-                  clearable
-                  filterable
-                style="width: 100%"
-                  @change="handleAddressSelectChange"
-                  v-loading="addressLoading"
-                >
-                  <el-option
-                    v-for="item in userAddressList"
-                    :key="item.id"
-                    :label="`${item.name} - ${item.phone} - ${item.addressName}`"
-                    :value="item.id"
-                  />
-                </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-              <el-form-item label="详细地址" prop="address">
-                <el-input v-model="form.address" type="textarea" placeholder="详细地址信息" />
-            </el-form-item>
-          </el-col>
-          </el-row>
-        </el-card>
 
-        <!-- 订单汇总 -->
-        <el-card shadow="hover" style="margin-bottom: 20px;">
-          <div slot="header" class="clearfix">
-            <span style="font-weight: bold; color: #E6A23C;">
-              <i class="el-icon-data-analysis"></i>
-              订单汇总
-            </span>
-          </div>
-          <el-row :gutter="20">
-            <el-col :span="6">
-              <div class="summary-item">
-                <label>商品数量：</label>
-                <span class="value highlight">{{ form.num || 0 }}</span>
-              </div>
-          </el-col>
-            <el-col :span="6">
-              <div class="summary-item">
-                <label>商品单价：</label>
-                <span class="value price">￥{{ form.goodPrice ? form.goodPrice.toFixed(2) : '0.00' }}</span>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="summary-item">
-                <label>总金额：</label>
-                <span class="value price total">￥{{ form.totalPrice ? form.totalPrice.toFixed(2) : '0.00' }}</span>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="summary-item">
-                <label>订单状态：</label>
-                <el-tag type="info">待支付</el-tag>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" style="margin-top: 15px;">
-          <el-col :span="24">
-            <el-form-item label="备注" prop="mark">
-                <el-input v-model="form.mark" type="textarea" placeholder="请输入备注信息" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        </el-card>
 
-        <div class="dialog-footer" style="text-align:left;margin-top:20px;">
-          <el-button @click="reset">重置</el-button>
-          <el-button type="primary" @click="submitForm" :loading="submitLoading">提交订单</el-button>
-        </div>
-      </el-form>
-    </el-dialog>
 
     <!-- 售后详情对话框 -->
-    <el-dialog
-      title="售后详情"
+    <AfterSaleDialog
       :visible.sync="afterSaleDialogVisible"
-      width="60%"
-      append-to-body
-    >
-      <div v-if="currentAfterSaleOrder" class="after-sale-detail">
-        <el-card class="box-card" style="margin-bottom: 20px;">
-          <div slot="header" class="clearfix">
-            <span style="font-weight: bold; color: #409EFF;">📋 订单基本信息</span>
-          </div>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <p><strong>订单号：</strong>{{ currentAfterSaleOrder.orderId }}</p>
-              <p><strong>商品名称：</strong>{{ currentAfterSaleOrder.productName }}</p>
-              <p><strong>订单金额：</strong>￥{{ currentAfterSaleOrder.payPrice ? currentAfterSaleOrder.payPrice.toFixed(2) : '0.00' }}</p>
-            </el-col>
-            <el-col :span="12">
-              <p><strong>用户姓名：</strong>{{ currentAfterSaleOrder.name }}</p>
-              <p><strong>联系电话：</strong>{{ currentAfterSaleOrder.phone }}</p>
-              <p><strong>订单状态：</strong>
-                <el-tag :type="currentAfterSaleOrder.status >= 20 ? 'warning' : 'success'">
-                  {{ currentAfterSaleOrder.status >= 20 ? '售后中' : '正常' }}
-                </el-tag>
-              </p>
-            </el-col>
-          </el-row>
-        </el-card>
-
-        <el-card class="box-card" style="margin-bottom: 20px;">
-          <div slot="header" class="clearfix">
-            <span style="font-weight: bold; color: #E6A23C;">🛠️ 售后信息</span>
-          </div>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <p><strong>售后类别：</strong>
-                <el-tag v-if="currentAfterSaleOrder.returntype === 1" type="info">仅退款</el-tag>
-                <el-tag v-else-if="currentAfterSaleOrder.returntype === 2" type="warning">退货退款</el-tag>
-                <span v-else>未设置</span>
-              </p>
-              <p><strong>退款金额：</strong>￥{{ currentAfterSaleOrder.returnmoney || '0.00' }}</p>
-              <p><strong>申请时间：</strong>{{ currentAfterSaleOrder.returntime ? parseTime(currentAfterSaleOrder.returntime, '{y}-{m}-{d} {h}:{i}:{s}') : '未设置' }}</p>
-            </el-col>
-            <el-col :span="12">
-              <p><strong>售后状态：</strong>
-                <el-tag
-                  :type="getReturnStatusType(currentAfterSaleOrder.returnstatus)"
-                  v-if="currentAfterSaleOrder.returnstatus"
-                >
-                  {{ returnStatusMap[currentAfterSaleOrder.returnstatus] || '未知状态' }}
-                </el-tag>
-                <span v-else>未申请售后</span>
-              </p>
-              <p><strong>退货快递：</strong>{{ currentAfterSaleOrder.returnlogistics || '未设置' }}</p>
-              <p><strong>退货快递号：</strong>{{ currentAfterSaleOrder.returnlogisticscode || '未设置' }}</p>
-            </el-col>
-          </el-row>
-        </el-card>
-
-        <el-card class="box-card" style="margin-bottom: 20px;" v-if="currentAfterSaleOrder.returnreason">
-          <div slot="header" class="clearfix">
-            <span style="font-weight: bold; color: #F56C6C;">📝 售后原因</span>
-          </div>
-          <div style="padding: 10px; background-color: #f8f9fa; border-radius: 4px;">
-            {{ currentAfterSaleOrder.returnreason }}
-          </div>
-        </el-card>
-      </div>
-
-      <div slot="footer" class="dialog-footer">
-        <!-- 售后申请操作按钮区域 -->
-        <div v-if="showAfterSaleActions" class="action-buttons">
-          <el-button type="danger" @click="handleRejectAfterSale">
-            <i class="el-icon-close"></i> 驳回申请
-          </el-button>
-          <el-button type="success" @click="handleApproveAfterSale">
-            <i class="el-icon-check"></i> 同意申请
-          </el-button>
-        </div>
-        <!-- 平台收货后操作按钮区域 -->
-        <div v-if="showPlatformActions" class="action-buttons">
-          <el-button type="danger" @click="handleRejectRefund">
-            <i class="el-icon-close"></i> 驳回退款
-          </el-button>
-          <el-button type="success" @click="handleApproveRefund">
-            <i class="el-icon-check"></i> 同意退款
-          </el-button>
-        </div>
-        <el-button @click="afterSaleDialogVisible = false">关闭</el-button>
-      </div>
-    </el-dialog>
+      :currentAfterSaleOrder="currentAfterSaleOrder"
+      :showAfterSaleActions="showAfterSaleActions"
+      :showPlatformActions="showPlatformActions"
+      :returnStatusMap="returnStatusMap"
+      @close="handleAfterSaleClose"
+      @reject-after-sale="handleRejectAfterSale"
+      @approve-after-sale="handleApproveAfterSale"
+      @reject-refund="handleRejectRefund"
+      @approve-refund="handleApproveRefund"
+    />
 
     <!-- 驳回理由输入对话框 -->
-    <el-dialog
-      title="驳回理由"
+    <RejectReasonDialog
       :visible.sync="rejectReasonDialogVisible"
-      width="40%"
-      append-to-body
-    >
-      <el-form ref="rejectReasonForm" :model="rejectReasonForm" :rules="rejectReasonRules" label-width="80px">
-        <el-form-item label="驳回理由" prop="rejectReason">
-          <el-input
-            v-model="rejectReasonForm.rejectReason"
-            type="textarea"
-            :rows="4"
-            placeholder="请输入驳回理由"
-            maxlength="500"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="rejectReasonDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="submitRejectReason">确认驳回</el-button>
-      </div>
-    </el-dialog>
+      :form="rejectReasonForm"
+      :rules="rejectReasonRules"
+      @cancel="rejectReasonDialogVisible = false"
+      @confirm="submitRejectReason"
+    />
 
     <!-- 退款金额输入对话框 -->
-    <el-dialog
-      title="退款金额"
+    <RefundAmountDialog
       :visible.sync="refundAmountDialogVisible"
-      width="40%"
-      append-to-body
-    >
-      <el-form ref="refundAmountForm" :model="refundAmountForm" :rules="refundAmountRules" label-width="80px">
-        <el-form-item label="订单金额">
-          <el-input
-            v-model="refundAmountForm.orderAmount"
-            disabled
-            style="color: #409EFF; font-weight: bold;"
-          />
-        </el-form-item>
-        <el-form-item label="退款金额" prop="returnrealmoney">
-          <el-input
-            v-model="refundAmountForm.returnrealmoney"
-            type="number"
-            placeholder="请输入退款金额"
-            :min="0"
-            :max="refundAmountForm.orderAmount"
-            step="1"
-          >
-            <template slot="prepend">￥</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="退款备注" prop="refundRemark">
-          <el-input
-            v-model="refundAmountForm.refundRemark"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入退款备注（可选）"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="refundAmountDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="submitRefundAmount">确认退款</el-button>
-      </div>
-    </el-dialog>
+      :form="refundAmountForm"
+      :rules="refundAmountRules"
+      @cancel="refundAmountDialogVisible = false"
+      @confirm="submitRefundAmount"
+    />
 
     <!-- 发货对话框 -->
-    <el-dialog
-      title="订单发货"
+    <ShipmentDialog
       :visible.sync="shipDialogVisible"
-      width="80%"
-      append-to-body
-    >
-      <!-- 主订单信息 -->
-      <el-card shadow="hover" style="margin-bottom: 20px;" v-if="currentShipOrder && currentShipOrder.isMainRow">
-        <div slot="header" class="clearfix">
-          <span style="font-weight: bold; color: #409EFF;">
-            <i class="el-icon-s-order"></i>
-            主订单信息
-          </span>
-        </div>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <div class="info-item">
-              <label>主订单号：</label>
-              <span class="value">{{ currentShipOrder.mainOrderId }}</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="info-item">
-              <label>收货人：</label>
-              <span class="value">{{ currentShipOrder.name }}</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="info-item">
-              <label>联系电话：</label>
-              <span class="value">{{ currentShipOrder.phone }}</span>
-            </div>
-          </el-col>
-          <el-col :span="24">
-            <div class="info-item">
-              <label>收货地址：</label>
-              <span class="value address">{{ currentShipOrder.address || '未设置' }}</span>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
-
-<!--      &lt;!&ndash; 发货方式选择 &ndash;&gt;-->
-<!--      <el-card shadow="hover" style="margin-bottom: 20px;">-->
-<!--        <div slot="header" class="clearfix">-->
-<!--          <span style="font-weight: bold; color: #67C23A;">-->
-<!--            <i class="el-icon-sell"></i>-->
-<!--            发货方式-->
-<!--          </span>-->
-<!--        </div>-->
-<!--        <el-radio-group v-model="shipMode" @change="handleShipModeChange">-->
-<!--          <el-radio label="single">单个发货</el-radio>-->
-<!--          <el-radio label="batch" v-if="currentShipOrder && currentShipOrder.children && currentShipOrder.children.length > 1">-->
-<!--            批量发货 ({{ currentShipOrder.children.length }}个商品)-->
-<!--          </el-radio>-->
-<!--        </el-radio-group>-->
-<!--      </el-card>-->
-
-      <!-- 单个发货表单 -->
-      <el-card shadow="hover" style="margin-bottom: 20px;" v-if="shipMode === 'single'">
-        <div slot="header" class="clearfix">
-          <span style="font-weight: bold; color: #E6A23C;">
-            <i class="el-icon-goods"></i>
-            发货信息
-          </span>
-        </div>
-        <el-form ref="shipForm" :model="shipForm" :rules="shipRules" label-width="120px">
-          <el-row :gutter="20">
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="订单号" prop="orderId">-->
-<!--                <el-input v-model="shipForm.orderId" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="商品名称" prop="productName">-->
-<!--                <el-input v-model="shipForm.productName" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="收货人" prop="name">-->
-<!--                <el-input v-model="shipForm.name" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="联系电话" prop="phone">-->
-<!--                <el-input v-model="shipForm.phone" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="24">-->
-<!--              <el-form-item label="收货地址" prop="address">-->
-<!--                <el-input v-model="shipForm.address" type="textarea" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-            <el-col :span="12">
-            <el-form-item label="快递公司" prop="deliveryId">
-              <el-select
-                v-model="shipForm.deliveryId"
-                placeholder="请选择快递公司"
-                style="width: 100%"
-                filterable
-              >
-                <el-option
-                  v-for="item in deliveryList"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-            <el-form-item label="快递单号" prop="deliveryNum">
-              <el-input
-                v-model="shipForm.deliveryNum"
-                placeholder="请输入快递单号"
-                style="width: 100%"
-              />
-            </el-form-item>
-          </el-col>
-            <el-col :span="12">
-            <el-form-item label="发货时间" prop="sendTime">
-              <el-date-picker
-                v-model="shipForm.sendTime"
-                type="datetime"
-                placeholder="请选择发货时间"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 100%"
-              />
-            </el-form-item>
-          </el-col>
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="备注" prop="mark">-->
-<!--                <el-input v-model="shipForm.mark" placeholder="请输入备注" />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-        </el-row>
-      </el-form>
-      </el-card>
-
-      <!-- 批量发货表单 -->
-      <el-card shadow="hover" style="margin-bottom: 20px;" v-if="shipMode === 'batch'">
-        <div slot="header" class="clearfix">
-          <span style="font-weight: bold; color: #E6A23C;">
-            <i class="el-icon-goods"></i>
-            批量发货
-          </span>
-        </div>
-        <el-form ref="batchShipForm" :model="batchShipForm" :rules="batchShipRules" label-width="120px">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="快递公司" prop="deliveryId">
-                <el-select
-                  v-model="batchShipForm.deliveryId"
-                  placeholder="请选择快递公司"
-                  style="width: 100%"
-                  filterable
-                >
-                  <el-option
-                    v-for="item in deliveryList"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="发货时间" prop="sendTime">
-                <el-date-picker
-                  v-model="batchShipForm.sendTime"
-                  type="datetime"
-                  placeholder="请选择发货时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="mark">
-                <el-input v-model="batchShipForm.mark" placeholder="请输入备注" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <!-- 批量发货商品列表 -->
-          <el-table :data="batchShipProducts" border style="width: 100%; margin-top: 15px;">
-            <el-table-column label="序号" type="index" width="60" align="center" />
-            <el-table-column label="订单号" prop="orderId" width="150" />
-            <el-table-column label="商品名称" prop="productName" min-width="200" />
-            <el-table-column label="数量" prop="num" width="80" align="center" />
-            <el-table-column label="快递单号" width="180" align="center">
-              <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.deliveryNum"
-                  placeholder="请输入快递单号"
-                  size="mini"
-                  @change="handleBatchDeliveryNumChange(scope.row)"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column label="状态" width="100" align="center">
-              <template slot-scope="scope">
-                <el-tag
-                  :type="scope.row.deliveryNum ? 'success' : 'info'"
-                  size="mini"
-                >
-                  {{ scope.row.deliveryNum ? '已填写' : '待填写' }}
-                </el-tag>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </el-card>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="shipDialogVisible = false">取消</el-button>
-        <el-button
-          type="primary"
-          @click="submitShipForm"
-          :loading="shipLoading"
-        >
-          {{ shipMode === 'batch' ? '批量发货' : '确认发货' }}
-        </el-button>
-      </div>
-    </el-dialog>
+      :currentShipOrder="currentShipOrder"
+      :shipmentOrders="shipmentOrders"
+      :deliveryList="deliveryList"
+      :shipForm="shipForm"
+      :shipRules="shipRules"
+      :shipMode="shipMode"
+      :loading="shipLoading"
+      @cancel="handleShipClose"
+      @confirm="handleShipConfirm"
+    />
 
     <!-- Excel导入发货对话框 -->
-    <el-dialog
-      title="Excel批量发货"
+    <ExcelImportDialog
       :visible.sync="excelImportDialogVisible"
-      width="60%"
-      append-to-body
-    >
-              <el-form ref="excelImportForm" :model="excelImportForm" :rules="excelImportRules" label-width="120px">
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="Excel文件" prop="file">
-              <el-upload
-                ref="upload"
-                class="upload-demo"
-                :action="''"
-                :auto-upload="false"
-                :on-change="handleFileChange"
-                :on-remove="handleFileRemove"
-                :before-upload="beforeUpload"
-                :file-list="excelImportForm.file ? [excelImportForm.file] : []"
-                accept=".xlsx,.xls"
-                :limit="1"
-              >
-                <el-button size="small" type="primary">选择文件</el-button>
-                <div slot="tip" class="el-upload__tip">
-                  只能上传xlsx/xls文件，且不超过2MB
-                </div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="操作说明">
-              <div style="background-color: #f5f7fa; padding: 15px; border-radius: 4px; border-left: 4px solid #409EFF;">
-                <h4 style="margin: 0 0 10px 0; color: #409EFF;">📋 Excel文件格式要求：</h4>
-                <p style="margin: 5px 0; color: #606266;">
-                  <strong>第1列：</strong>订单号（必填）
-                </p>
-                <p style="margin: 5px 0; color: #606266;">
-                  <strong>第2列：</strong>快递公司名称（必填）
-                </p>
-                <p style="margin: 5px 0; color: #606266;">
-                  <strong>第3列：</strong>快递单号（必填）
-                </p>
-                <p style="margin: 5px 0; color: #606266;">
-                  <strong>第4列：</strong>发货时间（必填，格式：yyyy-MM-dd）
-                </p>
-                <p style="margin: 5px 0; color: #606266;">
-                  <strong>注意：</strong>只有状态为"已支付待发货"的订单才能进行批量发货操作
-                </p>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="downloadTemplate" type="info" icon="el-icon-download">
-          下载CSV模板
-        </el-button>
-        <el-button @click="excelImportDialogVisible = false">取消</el-button>
-        <el-button
-          type="primary"
-          @click="submitExcelImport"
-          :loading="excelImportLoading"
-          :disabled="!excelImportForm.file"
-        >
-          开始导入
-        </el-button>
-      </div>
-    </el-dialog>
+      :form="excelImportForm"
+      :rules="excelImportRules"
+      :loading="excelImportLoading"
+      @cancel="excelImportDialogVisible = false"
+      @confirm="submitExcelImport"
+      @file-change="handleFileChange"
+      @file-remove="handleFileRemove"
+      @before-upload="beforeUpload"
+      @download-template="downloadTemplate"
+    />
 
     <!-- Excel导入结果对话框 -->
-    <el-dialog
-      title="导入结果"
+    <ImportResultDialog   
       :visible.sync="importResultVisible"
-      width="60%"
-      append-to-body
-    >
-      <div v-if="importResult">
-        <el-result
-          :icon="importResult.success > 0 ? 'success' : 'warning'"
-          :title="importResult.success > 0 ? '批量发货完成' : '批量发货失败'"
-          :sub-title="`共处理 ${importResult.total} 个订单`"
-        >
-          <template slot="extra">
-            <el-row :gutter="20" style="width: 100%;">
-              <el-col :span="8">
-                <el-card shadow="hover" style="text-align: center;">
-                  <div style="font-size: 24px; color: #67C23A; font-weight: bold;">
-                    {{ importResult.success }}
-                  </div>
-                  <div style="color: #606266;">成功发货</div>
-                </el-card>
-              </el-col>
-              <el-col :span="8">
-                <el-card shadow="hover" style="text-align: center;">
-                  <div style="font-size: 24px; color: #F56C6C; font-weight: bold;">
-                    {{ importResult.fail }}
-                  </div>
-                  <div style="color: #606266;">发货失败</div>
-                </el-card>
-              </el-col>
-              <el-col :span="8">
-                <el-card shadow="hover" style="text-align: center;">
-                  <div style="font-size: 24px; color: #E6A23C; font-weight: bold;">
-                    {{ importResult.skip }}
-                  </div>
-                  <div style="color: #606266;">跳过处理</div>
-                </el-card>
-              </el-col>
-            </el-row>
+      :importResult="importResult"
+      @close="importResultVisible = false"
+      @refresh="refreshOrderList"
+    />
 
-            <div style="margin-top: 20px;">
-              <el-collapse v-if="importResult.failList && importResult.failList.length > 0">
-                <el-collapse-item title="失败详情" name="1">
-                  <el-tag
-                    v-for="(item, index) in importResult.failList"
-                    :key="index"
-                    type="danger"
-                    style="margin: 5px;"
-                  >
-                    {{ item }}
-                  </el-tag>
-                </el-collapse-item>
-              </el-collapse>
+    
 
-              <el-collapse v-if="importResult.skipList && importResult.skipList.length > 0">
-                <el-collapse-item title="跳过详情" name="2">
-                  <el-tag
-                    v-for="(item, index) in importResult.skipList"
-                    :key="index"
-                    type="warning"
-                    style="margin: 5px;"
-                  >
-                    {{ item }}
-                  </el-tag>
-                </el-collapse-item>
-              </el-collapse>
-            </div>
-          </template>
-        </el-result>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="importResultVisible = false">关闭</el-button>
-        <el-button type="primary" @click="refreshOrderList">刷新订单列表</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 查看订单详情对话框 -->
-    <el-dialog
-      title="订单详情"
+    <!-- 订单详情组件 -->
+    <GoodsOrderDetails
       :visible.sync="detailDialogVisible"
-      width="90%"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <div v-if="currentDetailOrder" class="order-detail-container">
-        <!-- 主订单信息卡片 -->
-        <el-card class="main-order-card" shadow="hover">
-          <div slot="header" class="card-header">
-            <span class="header-title">
-              <i class="el-icon-s-order"></i>
-              订单信息
-            </span>
-            <el-tag
-              :type="getStatusTagType(currentDetailOrder.status)"
-              size="medium"
-            >
-              {{ getStatusText(currentDetailOrder.status) }}
-            </el-tag>
-          </div>
-
-          <el-row :gutter="24">
-            <el-col :span="8">
-              <div class="info-item">
-                <label>主订单号：</label>
-                <span class="value">{{ currentDetailOrder.mainOrderId }}</span>
-              </div>
-              <div class="info-item">
-                <label>用户姓名：</label>
-                <span class="value">{{ currentDetailOrder.name }}</span>
-              </div>
-              <div class="info-item">
-                <label>联系电话：</label>
-                <span class="value">{{ currentDetailOrder.phone }}</span>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="info-item">
-                <label>总数量：</label>
-                <span class="value highlight">{{ currentDetailOrder.num }}</span>
-              </div>
-              <div class="info-item">
-                <label>总金额：</label>
-                <span class="value price">￥{{ currentDetailOrder.totalPrice ? currentDetailOrder.totalPrice.toFixed(2) : '0.00' }}</span>
-              </div>
-              <div class="info-item">
-                <label>支付金额：</label>
-                <span class="value price">￥{{ currentDetailOrder.payPrice ? currentDetailOrder.payPrice.toFixed(2) : '0.00' }}</span>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="info-item">
-                <label>抵扣金额：</label>
-                <span class="value">￥{{ currentDetailOrder.deduction ? currentDetailOrder.deduction.toFixed(2) : '0.00' }}</span>
-              </div>
-              <div class="info-item">
-                <label>收货地址：</label>
-                <span class="value address">{{ currentDetailOrder.address || '未设置' }}</span>
-              </div>
-              <div class="info-item">
-                <label>创建时间：</label>
-                <span class="value">{{ parseTime(currentDetailOrder.createdAt, '{y}-{m}-{d} {h}:{i}') }}</span>
-              </div>
-            </el-col>
-          </el-row>
-        </el-card>
-
-        <!-- 商品明细卡片 -->
-        <el-card class="products-card" shadow="hover">
-          <div slot="header" class="card-header">
-            <span class="header-title">
-              <i class="el-icon-goods"></i>
-              商品明细 ({{ currentDetailOrder.children ? currentDetailOrder.children.length : 0 }}个商品)
-            </span>
-            <div class="header-actions">
-              <el-button
-                type="primary"
-                size="mini"
-                icon="el-icon-plus"
-                @click="handleAddProduct"
-                v-hasPermi="['system:GoodsOrder:add']"
-              >
-                添加商品
-              </el-button>
-            </div>
-          </div>
-
-          <el-table
-            :data="currentDetailOrder.children || []"
-            border
-            style="width: 100%"
-            :row-class-name="getProductRowClassName"
-          >
-            <el-table-column label="序号" type="index" width="60" align="center" />
-            <el-table-column label="商品图片" width="80" align="center">
-              <template slot-scope="scope">
-                <div class="product-image">
-                  <el-image
-                    :src="getProductImage(scope.row.productId)"
-                    fit="cover"
-                    style="width: 50px; height: 50px; border-radius: 4px;"
-                  >
-                    <div slot="error" class="image-slot">
-                      <i class="el-icon-picture-outline"></i>
-                    </div>
-                  </el-image>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="productName" min-width="200">
-              <template slot-scope="scope">
-                <div class="product-name">
-                  <span class="name">{{ scope.row.productName || '未知商品' }}</span>
-                  <el-tag
-                    v-if="scope.row.sku"
-                    size="mini"
-                    type="info"
-                    style="margin-left: 8px;"
-                  >
-                    {{ scope.row.sku }}
-                  </el-tag>
-                  <!-- 添加商品分类标签 -->
-                  <el-tag
-                    v-if="scope.row.productCategory"
-                    size="mini"
-                    type="success"
-                    style="margin-left: 8px;"
-                  >
-                    {{ scope.row.productCategory }}
-                  </el-tag>
-                </div>
-                <!-- 显示商品描述 -->
-                <div v-if="scope.row.productDescription" class="product-description">
-                  {{ scope.row.productDescription }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="数量" prop="num" width="80" align="center">
-              <template slot-scope="scope">
-                <el-input-number
-                  v-model="scope.row.num"
-                  :min="1"
-                  size="mini"
-                  @change="handleQuantityChange(scope.row)"
-                  style="width: 70px;"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column label="单价" prop="goodPrice" width="100" align="center">
-              <template slot-scope="scope">
-                <span class="price">￥{{ scope.row.goodPrice ? scope.row.goodPrice.toFixed(2) : '0.00' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="小计" prop="totalPrice" width="100" align="center">
-              <template slot-scope="scope">
-                <span class="price total">￥{{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) : '0.00' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="订单状态" prop="status" width="120" align="center">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.goods_order_status" :value="scope.row.status"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="200" align="center" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:GoodsOrder:edit']"
-                >修改</el-button>
-                <el-button
-                  v-if="scope.row.status === 2"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-sell"
-                  @click="handleShip(scope.row)"
-                  style="color: #67C23A;"
-                >发货</el-button>
-                <el-button
-                  v-if="scope.row.status >= 15"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-service"
-                  @click="handleAfterSale(scope.row)"
-                  style="color: #E6A23C;"
-                >售后</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDeleteProduct(scope.row)"
-                  style="color: #F56C6C;"
-                  v-hasPermi="['system:GoodsOrder:remove']"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-
-        <!-- 订单统计卡片 -->
-        <el-card class="statistics-card" shadow="hover">
-          <div slot="header" class="card-header">
-            <span class="header-title">
-              <i class="el-icon-data-analysis"></i>
-              订单统计
-            </span>
-          </div>
-
-          <el-row :gutter="20">
-            <el-col :span="6">
-              <div class="stat-item">
-                <div class="stat-number">{{ currentDetailOrder.children ? currentDetailOrder.children.length : 0 }}</div>
-                <div class="stat-label">商品种类</div>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="stat-item">
-                <div class="stat-number">{{ currentDetailOrder.num || 0 }}</div>
-                <div class="stat-label">总数量</div>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="stat-item">
-                <div class="stat-number">￥{{ currentDetailOrder.totalPrice ? currentDetailOrder.totalPrice.toFixed(2) : '0.00' }}</div>
-                <div class="stat-label">总金额</div>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="stat-item">
-                <div class="stat-number">￥{{ currentDetailOrder.payPrice ? currentDetailOrder.payPrice.toFixed(2) : '0.00' }}</div>
-                <div class="stat-label">实付金额</div>
-              </div>
-            </el-col>
-          </el-row>
-        </el-card>
-      </div>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="detailDialogVisible = false">关闭</el-button>
-        <el-button
-          type="primary"
-          @click="handleSaveOrderChanges"
-          :loading="saveLoading"
-        >
-          保存修改
-        </el-button>
-      </div>
-    </el-dialog>
+      :orderId="currentDetailOrderId"
+      @refresh="getList"
+    />
 
     <!-- 预支付数据对话框 -->
-    <el-dialog title="预支付数据" :visible.sync="prePaymentDialogVisible" width="80%" append-to-body>
-      <div v-if="prePaymentData">
-        <el-descriptions :column="3" border>
-          <el-descriptions-item label="订单ID">{{ prePaymentData.orderid }}</el-descriptions-item>
-<!--          <el-descriptions-item label="最后订单ID">{{ prePaymentData.lastorderid }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="用户ID">{{ prePaymentData.uid }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="状态">{{ prePaymentData.status }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="支付类别">{{ prePaymentData.paytype }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="订单类型">{{ prePaymentData.type }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="创建时间">{{ parseTime(prePaymentData.createdAt, '{y}-{m}-{d} {h}:{i}:{s}') }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="更新时间">{{ parseTime(prePaymentData.updatedAt, '{y}-{m}-{d} {h}:{i}:{s}') }}</el-descriptions-item>-->
-          <el-descriptions-item label="支付时间">{{ parseTime(prePaymentData.paytime, '{y}-{m}-{d} {h}:{i}:{s}') }}</el-descriptions-item>
-        </el-descriptions>
-
-        <!-- 金额信息 -->
-        <el-divider content-position="left">金额信息</el-divider>
-        <el-descriptions :column="3" border>
-          <el-descriptions-item label="总金额">
-            <span style="color: #E6A23C; font-weight: bold;">￥{{ prePaymentData.allmoney ? prePaymentData.allmoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="微信支付金额">
-            <span style="color: #67C23A;">￥{{ prePaymentData.wxmoney ? prePaymentData.wxmoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="余额支付金额">
-            <span style="color: #409EFF;">￥{{ prePaymentData.yemoney ? prePaymentData.yemoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="会员优惠金额">
-            <span style="color: #F56C6C;">￥{{ prePaymentData.membermoney ? prePaymentData.membermoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="购物金抵扣金额">
-            <span style="color: #909399;">￥{{ prePaymentData.shopmoney ? prePaymentData.shopmoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="服务金抵扣金额">
-            <span style="color: #E6A23C;">￥{{ prePaymentData.servicemoney ? prePaymentData.servicemoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="优惠券金额">
-            <span style="color: #F56C6C;">￥{{ prePaymentData.couponmoney ? prePaymentData.couponmoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="美团抵扣金额">
-            <span style="color: #67C23A;">￥{{ prePaymentData.mtmoney ? prePaymentData.mtmoney.toFixed(2) : '0.00' }}</span>
-          </el-descriptions-item>
-<!--          <el-descriptions-item label="退款金额">-->
-<!--            <span style="color: #F56C6C;">￥{{ prePaymentData.returnmoney ? prePaymentData.returnmoney.toFixed(2) : '0.00' }}</span>-->
-<!--          </el-descriptions-item>-->
-        </el-descriptions>
-
-        <!-- 其他信息 -->
-<!--        <el-divider content-position="left">其他信息</el-divider>-->
-<!--        <el-descriptions :column="2" border>-->
-<!--          <el-descriptions-item label="优惠券ID">{{ prePaymentData.couponid || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="美团号">{{ prePaymentData.mtcode || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="支付订单号">{{ prePaymentData.paycode || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="服务ID">{{ prePaymentData.serviceid || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="服务类型">{{ prePaymentData.servicetype || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="数量">{{ prePaymentData.num || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="报价ID">{{ prePaymentData.baojiaid || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="地址ID">{{ prePaymentData.addressid || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="SKU">{{ prePaymentData.sku || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="预约时间">{{ prePaymentData.maketime || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="附件">{{ prePaymentData.attachments || '-' }}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="拼团订单ID">{{ prePaymentData.grouporderid || '-' }}</el-descriptions-item>-->
-<!--        </el-descriptions>-->
-      </div>
-      <div v-else>
-        <el-empty description="暂无预支付数据"></el-empty>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="prePaymentDialogVisible = false">关闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- Excel导入批量发货对话框 -->
+     <prePaymentDialog
+      :visible.sync="prePaymentDialogVisible"
+      :prePaymentData="prePaymentData"
+      @close="handlePrePaymentClose"
+    />
+    
 
+  
 
 
   </div>
 </template>
 
 <script>
-import { listGoodsOrder, getGoodsOrder, delGoodsOrder, addGoodsOrder, updateGoodsOrder,getGoodsDataList,getSiteDeliveryList,getUserAddressList,generateCode, processAfterSale, shipOrder, getPrePaymentByOrderId, batchShipByExcel, getGoodsOrderByMainOrderId, getProductInfo, getBatchProductInfo} from "@/api/system/GoodsOrder"
+import { listGoodsOrder, delGoodsOrder, getGoodsDataList, getSiteDeliveryList, processAfterSale, shipOrder, getPrePaymentByOrderId, batchShipByExcel, getGoodsOrderByMainOrderId} from "@/api/system/GoodsOrder"
 
 export default {
   name: "GoodsOrder",
   dicts: ['goods_order_status'],
+  components: {
+    GoodsOrderDetails: () => import('./details.vue'),
+    AfterSaleDialog: () => import('./AfterSaleDialog.vue'),
+    RejectReasonDialog: () => import('./RejectReasonDialog.vue'),
+    RefundAmountDialog: () => import('./RefundAmountDialog.vue'),
+    ShipmentDialog: () => import('./ShipmentDialog.vue'),
+    ExcelImportDialog: () => import('./ExcelImportDialog.vue'),
+    ImportResultDialog: () => import('./ImportResultDialog.vue'),
+    PrePaymentDialog: () => import('./PrePaymentDialog.vue')
+  },
   data() {
     return {
       // 遮罩层
@@ -1535,24 +438,13 @@ export default {
       total: 0,
       // 商品订单表格数据
       GoodsOrderList: [],
-      // 分组后的商品订单列表
-      groupedGoodsOrderList: [],
 
-
-      userAddressList: [],
-      // 地址加载状态
-      addressLoading: false,
-
-
-      // 服务订单表格数据
-
-      goodsDataList : [],
       // 快递公司列表
       deliveryList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
+
+      // 商品数据列表
+      goodsDataList: [],
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1593,91 +485,7 @@ export default {
         payenddate: null
         //------------------
       },
-              // 表单参数
-        form: {
-          type: 2,
-          totalPrice: 0,
-          payPrice: 0,
-          deduction: 0,
-        },
-      // 表单校验
-      rules: {
-        type: [
-          { required: true, message: "1:服务项目 2：商品不能为空", trigger: "change" }
-        ],
-        orderId: [
-          { required: true, message: "订单号不能为空", trigger: "blur" }
-        ],
-        uid: [
-          { required: true, message: "用户不能为空", trigger: "blur" }
-        ],
-        productId: [
-          { required: true, message: "服务商品不能为空", trigger: "change" }
-        ],
-        appointmentTime: [
-          { required: true, message: "预约时间不能为空", trigger: "change" }
-        ],
-        name: [
-          { required: true, message: "收货人姓名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" }
-        ],
-        addressId: [
-          { required: true, message: "收货地址不能为空", trigger: "change" }
-        ],
-        address: [
-          { required: true, message: "详细地址不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "数量不能为空", trigger: "blur" }
-        ],
-        totalPrice: [
-          { required: true, message: "总价不能为空", trigger: "blur" }
-        ],
-        payPrice: [
-          { required: true, message: "支付金额不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "订单状态  1:待支付  2：已支付，待发货3：待收货 4：待评价 5：已收货 6：取消 20：申请退款  21：同意退款 22：驳回退款不能为空", trigger: "change" }
-        ],
-        deliveryId: [
-          {
-            validator: (rule, value, callback) => {
-              if (this.form.status === 3 && (!value || value === '')) {
-                callback(new Error('请选择快递公司'));
-              } else {
-                callback();
-              }
-            },
-            trigger: "change"
-          }
-        ],
-        deliveryNum: [
-          {
-            validator: (rule, value, callback) => {
-              if (this.form.status === 3 && (!value || value.trim() === '')) {
-                callback(new Error('快递单号不能为空'));
-              } else {
-                callback();
-              }
-            },
-            trigger: "blur"
-          }
-        ],
-        sendTime: [
-          {
-            validator: (rule, value, callback) => {
-              if (this.form.status === 3 && (!value || value === '')) {
-                callback(new Error('请选择发货时间'));
-              } else {
-                callback();
-              }
-            },
-            trigger: "change"
-          }
-        ],
-      },
+
       daterangePayTime: [],
       daterangeCreatedAt: [],
       // 售后相关数据
@@ -1782,42 +590,16 @@ export default {
       excelImportLoading: false,
       // 查看详情相关
       currentDetailOrder: null,
+      currentDetailOrderId: null,
       detailDialogVisible: false,
-      // 保存相关
-      saveLoading: false,
-      expandedRows: [],
+
       // 高级搜索相关
       showAdvancedSearch: false,
-      // 子订单列表
-      subOrdersList: [],
-      // 子订单汇总数据
-      totalSubOrdersNum: 0,
-      totalSubOrdersPrice: 0,
       // 发货相关
       shipMode: 'single',
       currentShipOrder: null,
       shipLoading: false,
-      batchShipForm: {
-        deliveryId: '',
-        sendTime: '',
-        mark: ''
-      },
-      batchShipRules: {
-        deliveryId: [
-          { required: true, message: '请选择快递公司', trigger: 'change' }
-        ],
-        sendTime: [
-          { required: true, message: '请选择发货时间', trigger: 'change' }
-        ]
-      },
-      batchShipProducts: [],
-      // 新增订单相关
-      submitLoading: false,
-      pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7; // 不能选择过去的日期
-        }
-      },
+      shipmentOrders: []
     }
   },
   created() {
@@ -1827,7 +609,6 @@ export default {
     this.getdeliveryList();
 
     // 确保对话框状态正确
-    this.open = false;
     this.afterSaleDialogVisible = false;
     this.rejectReasonDialogVisible = false;
     this.refundAmountDialogVisible = false;
@@ -1841,11 +622,6 @@ export default {
     // 简化mounted钩子
     this.fetchGoodsDataList();
     this.getdeliveryList();
-
-    // 确保对话框状态正确
-    this.$nextTick(() => {
-      this.ensureDialogState();
-    });
   },
   beforeDestroy() {
     // 简化清理逻辑
@@ -1865,133 +641,42 @@ export default {
     showPlatformActions() {
       if (!this.currentAfterSaleOrder) return false;
       return this.currentAfterSaleOrder.returnstatus === 4;
-    },
-    /** 分组后的商品订单列表 */
-    groupedGoodsOrderList() {
-      const grouped = {};
-      this.GoodsOrderList.forEach(item => {
-        if (!grouped[item.mainOrderId]) {
-          grouped[item.mainOrderId] = {
-            mainOrderId: item.mainOrderId,
-            orderId: item.orderId,
-            uname: item.uname,
-            name: item.name,
-            phone: item.phone,
-            totalPrice: 0,
-            payPrice: 0,
-            deduction: 0,
-            payTime: item.payTime,
-            status: item.status,
-            createdAt: item.createdAt,
-            updatedAt: item.updatedAt,
-            returnstatus: item.returnstatus,
-            returnmoney: item.returnmoney,
-            returntime: item.returntime,
-            returnlogistics: item.returnlogistics,
-            returnlogisticscode: item.returnlogisticscode,
-            returnreason: item.returnreason,
-            productName: '',
-            num: 0,
-            id: item.id,
-            uid: item.uid,
-            productId: item.productId,
-            address: item.address,
-            addressId: item.addressId,
-            sku: item.sku,
-            deliveryId: item.deliveryId,
-            deliveryNum: item.deliveryNum,
-            sendTime: item.sendTime,
-            mark: item.mark,
-            deletedAt: item.deletedAt,
-            // 新增用于合并行的属性
-            isGroupHeader: true,
-            children: []
-          };
-        }
-        grouped[item.mainOrderId].children.push(item);
-        grouped[item.mainOrderId].num += (item.num || 0);
-        grouped[item.mainOrderId].totalPrice += (item.totalPrice || 0);
-        grouped[item.mainOrderId].payPrice += (item.payPrice || 0);
-        grouped[item.mainOrderId].deduction += (item.deduction || 0);
-
-        // 设置商品名称显示（如果有多个商品，显示第一个）
-        if (!grouped[item.mainOrderId].productName && item.productName) {
-          grouped[item.mainOrderId].productName = item.productName;
-        }
-      });
-
-      // 转换为数组并排序
-      this.groupedGoodsOrderList = Object.values(grouped).sort((a, b) => {
-        // 优先显示待处理订单
-        const aPriority = (a.status === 2 || a.returnstatus === 1 || a.returnstatus === 4) ? 0 : 1;
-        const bPriority = (b.status === 2 || b.returnstatus === 1 || b.returnstatus === 4) ? 0 : 1;
-        if (aPriority !== bPriority) {
-          return aPriority - bPriority;
-        }
-        // 按更新时间倒序
-        return new Date(b.updatedAt) - new Date(a.updatedAt);
-      });
     }
   },
   methods: {
-    /** 查询商品订单列表 */
-    getList() {
-      this.loading = true
-      listGoodsOrder(this.queryParams).then(response => {
-        this.GoodsOrderList = response.rows
-        this.total = response.total
-        this.processGroupedData()
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-      // 确保对话框完全关闭
-      this.$nextTick(() => {
-        this.$forceUpdate();
+    groupedGoodsOrderList() {
+      // 防止在数据加载过程中意外触发弹窗
+      if (!this.GoodsOrderList || this.GoodsOrderList.length === 0) {
+        return;
+      }
+      
+      this.GoodsOrderList.forEach((item, index) => {
+        if (item.mainOrderId) {
+          getGoodsOrderByMainOrderId(item.mainOrderId).then(response => {
+            this.$set(this.GoodsOrderList[index], 'children', response.data);
+            // 移除 $forceUpdate() 调用，避免不必要的DOM更新
+          }).catch(error => {
+            console.warn('获取子订单失败:', error);
+          });
+        }
       });
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        type: 1, // 默认为服务项目
-        mainOrderId: null,
-        orderId: null,
-        transactionId: null,
-        uid: null,
-        productId: null,
-        productName: null,
-        name: null,
-        phone: null,
-        address: null,
-        addressId: null,
-        num: 1,
-        totalPrice: 0,
-        goodPrice: 0,
-        servicePrice: 0,
-        payPrice: 0,
-        deduction: 0,
-        postage: 0,
-        payTime: null,
-        status: 1, // 默认为待支付
-        deliveryId: null,
-        deliveryNum: null,
-        sendTime: null,
-        mark: null,
-        sku: null,
-        appointmentTime: null, // 预约时间
-        createdAt: null,
-        updatedAt: null,
-        deletedAt: null
-      }
-      // 重置地址列表
-      this.userAddressList = []
-      this.addressLoading = false
-      this.resetForm("form")
+    /** 查询商品订单列表 */
+    getList() {
+      // 关闭所有对话框和抽屉，防止数据不更新时弹窗意外打开
+      this.closeAllDialogs();
+      this.currentDetailOrder = {};
+      this.loading = true
+      listGoodsOrder(this.queryParams).then(response => {
+        this.GoodsOrderList = response.rows;
+        this.loading = false
+        this.groupedGoodsOrderList()
+        this.total = response.total
+      
+      })
     },
+
+
     /** 搜索按钮操作 */
     handleQuery() {
       // 处理支付时间
@@ -2043,116 +728,10 @@ export default {
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
-    //获取报价材料列表
-    generateCode(){
-      generateCode().then(response => {
-        this.form.mainOrderId = response.msg;
-        this.form.orderId = response.msg;
-      })
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // 先关闭所有其他对话框
-      this.closeAllDialogs()
 
-      this.reset()
-      this.generateCode()
 
-      // 确保主对话框能正常打开
-      this.$nextTick(() => {
-        this.open = true
-        this.title = "新增服务订单"
-        this.ensureDialogState()
-      })
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // 先关闭所有其他对话框
-      this.closeAllDialogs()
 
-      this.reset()
-      const id = row.id || this.ids
 
-      if (row.isMainRow && row.children && row.children.length > 0) {
-        // 如果是主订单行，加载所有子订单
-        this.loadMainOrderData(row);
-      } else {
-        // 单个订单修改
-      getGoodsOrder(id).then(response => {
-        this.form = response.data
-          this.subOrdersList = [{
-            ...response.data,
-            totalPrice: response.data.totalPrice || 0
-          }];
-          this.calculateSubOrdersSummary();
-
-        // 如果有用户ID，获取对应的地址列表
-        if (this.form.uid) {
-          this.getUserAddressList(this.form.uid)
-        }
-
-        // 确保主对话框能正常打开
-        this.$nextTick(() => {
-          this.open = true
-          this.title = "修改商品订单"
-          this.ensureDialogState()
-        })
-      }).catch(error => {
-        console.error('获取订单详情失败:', error)
-        this.$modal.msgError('获取订单详情失败')
-      })
-      }
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.submitLoading = true;
-          
-          if (this.form.id != null) {
-            // 修改订单
-            updateGoodsOrder(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.reset();
-              this.getList();
-            }).catch(error => {
-              console.error('修改订单失败:', error);
-              this.$modal.msgError('修改失败，请重试');
-            }).finally(() => {
-              this.submitLoading = false;
-            });
-          } else {
-            // 新增订单 - 设置默认值
-            const newOrder = {
-              ...this.form,
-              type: 1, // 1:服务项目
-              status: 1, // 1:待支付
-              orderId: this.form.mainOrderId, // 使用主订单号作为订单号
-              transactionId: '', // 微信支付单号，支付时填写
-              servicePrice: 0, // 服务费
-              postage: 0, // 邮费
-              payPrice: this.form.totalPrice, // 支付金额等于总金额
-              deduction: 0, // 抵扣金额
-              createdAt: new Date().toISOString().slice(0, 19).replace('T', ' '), // 创建时间
-              updatedAt: new Date().toISOString().slice(0, 19).replace('T', ' ') // 更新时间
-            };
-            
-            addGoodsOrder(newOrder).then(response => {
-              this.$modal.msgSuccess("新增订单成功");
-              this.open = false;
-              this.reset();
-              this.getList();
-            }).catch(error => {
-              console.error('新增订单失败:', error);
-              this.$modal.msgError('新增订单失败，请重试');
-            }).finally(() => {
-              this.submitLoading = false;
-            });
-          }
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       let ids;
@@ -2186,51 +765,50 @@ export default {
       this.excelImportDialogVisible = false;
       this.importResultVisible = false;
       this.detailDialogVisible = false;
-
-      // 确保主对话框也关闭
-      this.open = false;
-
-      // 强制更新DOM
-      this.$forceUpdate();
-
-      // 确保对话框状态正确
+      
+      // 使用nextTick确保弹窗完全关闭后再重置数据
       this.$nextTick(() => {
-        this.ensureDialogState();
+        // 重置相关数据，防止弹窗意外打开
+        this.currentAfterSaleOrder = null;
+        this.currentDetailOrder = null;
+        this.currentDetailOrderId = null;
+        this.currentShipOrder = null;
+        
+        // 重置预支付数据
+        this.prePaymentData = null;
+        
+        // 重置发货相关数据
+        this.shipmentOrders = [];
+        this.shipForm = {
+          id: null,
+          orderId: '',
+          productName: '',
+          name: '',
+          phone: '',
+          address: '',
+          deliveryId: null,
+          deliveryNum: '',
+          sendTime: '',
+          mark: ''
+        };
       });
     },
 
-    /** 处理主对话框关闭事件 */
-    handleMainDialogClose() {
-      this.open = false;
-      this.reset();
-      // 清理可能的残留状态
-      this.$nextTick(() => {
-        this.$forceUpdate();
-      });
-    },
 
-    /** 确保对话框状态正确 */
-    ensureDialogState() {
-      // 如果主对话框应该关闭，确保它关闭
-      if (!this.open) {
-        this.$nextTick(() => {
-          this.$forceUpdate();
-        });
-      }
 
-      // 清理可能的残留遮罩层
-      const overlays = document.querySelectorAll('.el-overlay');
-      overlays.forEach(overlay => {
-        if (overlay.style.display === 'block' && !this.open && !this.afterSaleDialogVisible && !this.rejectReasonDialogVisible && !this.refundAmountDialogVisible && !this.shipDialogVisible && !this.prePaymentDialogVisible && !this.excelImportDialogVisible && !this.importResultVisible && !this.detailDialogVisible) {
-          overlay.style.display = 'none';
-        }
-      });
-    },
+
 
     /** 售后按钮操作 */
     handleAfterSale(row) {
-      this.currentAfterSaleOrder = row;
-      this.afterSaleDialogVisible = true;
+      // 先重置状态，确保弹窗能正常打开
+      this.currentAfterSaleOrder = null;
+      this.afterSaleDialogVisible = false;
+      
+      // 使用nextTick确保DOM更新后再设置新状态
+      this.$nextTick(() => {
+        this.currentAfterSaleOrder = row;
+        this.afterSaleDialogVisible = true;
+      });
     },
 
     /** 获取售后状态对应的标签类型 */
@@ -2255,6 +833,10 @@ export default {
         if (response.code === 200) {
           this.$modal.msgSuccess('操作成功');
           this.closeAllDialogs();
+          
+          // 重置售后相关数据
+          this.currentAfterSaleOrder = null;
+          
           // 刷新列表
           this.getList();
         } else {
@@ -2371,224 +953,133 @@ export default {
     /** 发货按钮操作 */
     async handleShip(row) {
       try {
-        this.currentShipOrder = row;
-        this.shipMode = 'single';
+        // 先重置状态，确保弹窗能正常打开
+        this.currentShipOrder = null;
+        this.shipmentOrders = [];
+        this.shipDialogVisible = false;
+        
+        // 使用nextTick确保DOM更新后再设置新状态
+        this.$nextTick(() => {
+          this.currentShipOrder = row;
+          this.shipMode = 'single';
 
-        if (row.isMainRow && row.mainOrderId) {
-          // 通过API获取最新的主订单数据
-          const response = await getGoodsOrderByMainOrderId(row.mainOrderId);
-          const subOrders = response.data || [];
+          // 设置单个发货表单数据
+          this.shipForm = {
+            id: row.id,
+            orderId: row.orderId,
+            productName: row.productName,
+            name: row.name,
+            phone: row.phone,
+            address: row.address,
+            deliveryId: null,
+            deliveryNum: '',
+            sendTime: '',
+            mark: ''
+          };
 
-          if (subOrders.length > 1) {
-            // 主订单发货，准备批量发货数据
-            this.batchShipProducts = subOrders.map(child => ({
-              id: child.id,
-              orderId: child.orderId,
-              productName: child.productName,
-              num: child.num,
-              deliveryNum: ''
-            }));
+          // 设置发货订单列表 - 如果有子订单则使用子订单，否则使用当前订单
+          if (row.children && row.children.length > 0) {
+            this.shipmentOrders = row.children;
+          } else {
+            this.shipmentOrders = [row];
           }
-        } else if (row.children && row.children.length > 1) {
-          // 使用传入的数据
-          this.batchShipProducts = row.children.map(child => ({
-            id: child.id,
-            orderId: child.orderId,
-            productName: child.productName,
-            num: child.num,
-            deliveryNum: ''
-          }));
-        }
 
-        // 设置单个发货表单数据
-      this.shipForm = {
-        id: row.id,
-        orderId: row.orderId,
-        productName: row.productName,
-        name: row.name,
-        phone: row.phone,
-        address: row.address,
-        deliveryId: null,
-        deliveryNum: '',
-        sendTime: '',
-        mark: ''
-      };
-
-      this.shipDialogVisible = true;
+          this.shipDialogVisible = true;
+        });
 
       } catch (error) {
         console.error('获取发货数据失败:', error);
         this.$modal.msgError('获取发货数据失败，请重试');
+      }
+    },
 
-        // 如果API调用失败，使用传入的数据作为备选
-        this.currentShipOrder = row;
-        this.shipMode = 'single';
-
-        if (row.children && row.children.length > 1) {
-          this.batchShipProducts = row.children.map(child => ({
-            id: child.id,
-            orderId: child.orderId,
-            productName: child.productName,
-            num: child.num,
-            deliveryNum: ''
-          }));
-        }
+    /** 提交发货表单 */
+    handleShipConfirm(shipFormData) {
+      this.shipLoading = true;
+      const shipData = {
+        id: this.currentShipOrder.id,
+        deliveryId: shipFormData.deliveryId,
+        deliveryNum: shipFormData.deliveryNum,
+        sendTime: shipFormData.sendTime,
+        mark: shipFormData.mark,
+        status: 3 // 设置为已发货状态
+      }
 
+      shipOrder(shipData).then(response => {
+        this.$modal.msgSuccess('发货成功')
+        this.shipDialogVisible = false
+        this.shipLoading = false;
+        
+        // 重置发货相关数据
+        this.currentShipOrder = null;
+        this.shipmentOrders = [];
         this.shipForm = {
-          id: row.id,
-          orderId: row.orderId,
-          productName: row.productName,
-          name: row.name,
-          phone: row.phone,
-          address: row.address,
+          id: null,
+          orderId: '',
+          productName: '',
+          name: '',
+          phone: '',
+          address: '',
           deliveryId: null,
           deliveryNum: '',
           sendTime: '',
           mark: ''
         };
-
-        this.shipDialogVisible = true;
-      }
-    },
-
-    /** 发货方式改变 */
-    handleShipModeChange(value) {
-      if (value === 'batch') {
-        // 批量发货模式，验证所有快递单号都已填写
-        const hasEmptyDeliveryNum = this.batchShipProducts.some(item => !item.deliveryNum);
-        if (hasEmptyDeliveryNum) {
-          this.$message.warning('请为所有商品填写快递单号');
-        }
-      }
-    },
-
-    /** 批量发货快递单号变化 */
-    handleBatchDeliveryNumChange(row) {
-      // 可以在这里添加验证逻辑
-      console.log('Batch delivery number changed:', row.deliveryNum);
-    },
-
-    /** 提交发货表单 */
-    submitShipForm() {
-      if (this.shipMode === 'batch') {
-        this.submitBatchShipForm();
-      } else {
-        this.submitSingleShipForm();
-      }
-    },
-
-    /** 提交单个发货表单 */
-    submitSingleShipForm() {
-      this.$refs.shipForm.validate(valid => {
-        if (valid) {
-          this.shipLoading = true;
-          const shipData = {
-            id: this.shipForm.id,
-            deliveryId: this.shipForm.deliveryId,
-            deliveryNum: this.shipForm.deliveryNum,
-            sendTime: this.shipForm.sendTime,
-            mark: this.shipForm.mark,
-            status: 3 // 设置为已发货状态
-          }
-
-          shipOrder(shipData).then(response => {
-            this.$modal.msgSuccess('发货成功')
-            this.shipDialogVisible = false
-            this.shipLoading = false;
-            this.getList() // 刷新列表
-          }).catch(error => {
-            this.$modal.msgError('发货失败：' + (error.message || '未知错误'))
-            this.shipLoading = false;
-          })
-        }
+        
+        this.getList() // 刷新列表
+      }).catch(error => {
+        this.$modal.msgError('发货失败：' + (error.message || '未知错误'))
+        this.shipLoading = false;
       })
     },
 
-    /** 提交批量发货表单 */
-    submitBatchShipForm() {
-      this.$refs.batchShipForm.validate(valid => {
-        if (valid) {
-          // 验证所有快递单号都已填写
-          const hasEmptyDeliveryNum = this.batchShipProducts.some(item => !item.deliveryNum);
-          if (hasEmptyDeliveryNum) {
-            this.$message.error('请为所有商品填写快递单号');
-            return;
-          }
 
-          this.shipLoading = true;
-
-          // 构建批量发货数据
-          const batchShipData = this.batchShipProducts.map(item => ({
-            id: item.id,
-            deliveryId: this.batchShipForm.deliveryId,
-            deliveryNum: item.deliveryNum,
-            sendTime: this.batchShipForm.sendTime,
-            mark: this.batchShipForm.mark,
-            status: 3
-          }));
-
-          // 这里需要调用批量发货API，暂时使用循环单个发货
-          const promises = batchShipData.map(shipData => shipOrder(shipData));
-
-          Promise.all(promises).then(() => {
-            this.$modal.msgSuccess(`批量发货成功，共${batchShipData.length}个订单`);
-            this.shipDialogVisible = false;
-            this.shipLoading = false;
-            this.getList();
-          }).catch(error => {
-            this.$modal.msgError('批量发货失败：' + (error.message || '未知错误'));
-            this.shipLoading = false;
-          });
-        }
-      })
-    },
-
-    /** 重置表单 */
-    reset() {
-      this.form = {
-        type: 2,
-        totalPrice: 0,
-        payPrice: 0,
-        deduction: 0,
-      };
-      this.subOrdersList = [];
-      this.totalSubOrdersNum = 0;
-      this.totalSubOrdersPrice = 0;
-      this.resetForm("form");
-    },
 
     /** 处理预支付数据点击 */
     handlePrePaymentClick(row) {
+      // 先重置状态，确保弹窗能正常打开
+      this.prePaymentData = null;
+      this.prePaymentDialogVisible = false;
+      
       if (!row.orderId) {
         this.$modal.msgWarning('该订单没有订单号');
         return;
       }
 
-      // 调用API获取预支付数据
-      getPrePaymentByOrderId(row.mainOrderId).then(response => {
-        if (response.code === 200) {
-          this.prePaymentData = response.data;
-          this.prePaymentDialogVisible = true;
-        } else {
-          this.$modal.msgError(response.msg || '获取预支付数据失败');
-        }
-      }).catch(error => {
-        console.error('获取预支付数据失败:', error);
-        this.$modal.msgError('获取预支付数据失败，请重试');
+      // 使用nextTick确保DOM更新后再设置新状态
+      this.$nextTick(() => {
+        // 调用API获取预支付数据
+        getPrePaymentByOrderId(row.orderId).then(response => {
+          if (response.code === 200) {
+            this.prePaymentData = response.data;
+            this.prePaymentDialogVisible = true;
+          } else {
+            this.$modal.msgError(response.msg || '获取预支付数据失败');
+          }
+        }).catch(error => {
+          console.error('获取预支付数据失败:', error);
+          this.$modal.msgError('获取预支付数据失败，请重试');
+        });
       });
     },
 
     /** 处理Excel导入发货 */
     handleExcelImport() {
-      this.excelImportDialogVisible = true;
+      // 先重置状态，确保弹窗能正常打开
+      this.excelImportDialogVisible = false;
       this.excelImportForm.file = null;
+      
+      // 使用nextTick确保DOM更新后再设置新状态
       this.$nextTick(() => {
-              if (this.$refs.excelImportForm) {
-        this.$refs.excelImportForm.resetFields();
-        }
-        if (this.$refs.upload) {
-          this.$refs.upload.clearFiles();
-        }
+        this.excelImportDialogVisible = true;
+        this.$nextTick(() => {
+          if (this.$refs.excelImportForm) {
+            this.$refs.excelImportForm.resetFields();
+          }
+          if (this.$refs.upload) {
+            this.$refs.upload.clearFiles();
+          }
+        });
       });
     },
 
@@ -2673,229 +1164,12 @@ export default {
       this.getList();
     },
 
-    /** 处理数据分组 */
-    async processGroupedData() {
-      try {
-        // 获取所有主订单ID
-        const mainOrderIds = [...new Set(this.GoodsOrderList.map(item => item.mainOrderId))];
-
-        // 为每个主订单获取完整的子订单列表
-        const groupedData = [];
-
-        for (const mainOrderId of mainOrderIds) {
-          try {
-            // 调用API获取主订单下的所有子订单
-            const response = await getGoodsOrderByMainOrderId(mainOrderId);
-            const subOrders = response.data || [];
-
-            if (subOrders.length > 0) {
-              // 计算汇总数据
-              const totalNum = subOrders.reduce((sum, item) => sum + (item.num || 0), 0);
-              const totalPrice = subOrders.reduce((sum, item) => sum + (item.totalPrice || 0), 0);
-              const totalPayPrice = subOrders.reduce((sum, item) => sum + (item.payPrice || 0), 0);
-              const totalDeduction = subOrders.reduce((sum, item) => sum + (item.deduction || 0), 0);
-
-              // 获取主订单的基本信息（使用第一个子订单的信息）
-              const firstOrder = subOrders[0];
-
-              // 创建主订单行
-              const mainRow = {
-                ...firstOrder,
-                mainOrderId: mainOrderId,
-                num: totalNum,
-                totalPrice: totalPrice,
-                payPrice: totalPayPrice,
-                deduction: totalDeduction,
-                productName: subOrders.map(item => item.productName).filter(Boolean).join('、'),
-                isMainRow: true,
-                rowspan: subOrders.length,
-                children: subOrders, // 保存完整的子订单信息
-                subOrderCount: subOrders.length // 子订单数量
-              };
-
-              groupedData.push(mainRow);
-            }
-          } catch (error) {
-            console.error(`获取主订单 ${mainOrderId} 的子订单失败:`, error);
-            // 如果API调用失败，使用原有的分组逻辑作为备选
-            const fallbackOrders = this.GoodsOrderList.filter(item => item.mainOrderId === mainOrderId);
-            if (fallbackOrders.length > 0) {
-              const totalNum = fallbackOrders.reduce((sum, item) => sum + (item.num || 0), 0);
-              const totalPrice = fallbackOrders.reduce((sum, item) => sum + (item.totalPrice || 0), 0);
-              const totalPayPrice = fallbackOrders.reduce((sum, item) => sum + (item.payPrice || 0), 0);
-              const totalDeduction = fallbackOrders.reduce((sum, item) => sum + (item.deduction || 0), 0);
-
-              const firstOrder = fallbackOrders[0];
-              const mainRow = {
-                ...firstOrder,
-                mainOrderId: mainOrderId,
-                num: totalNum,
-                totalPrice: totalPrice,
-                payPrice: totalPayPrice,
-                deduction: totalDeduction,
-                productName: fallbackOrders.map(item => item.productName).filter(Boolean).join('、'),
-                isMainRow: true,
-                rowspan: fallbackOrders.length,
-                children: fallbackOrders,
-                subOrderCount: fallbackOrders.length
-              };
-
-              groupedData.push(mainRow);
-            }
-          }
-        }
-
-        // 排序
-        groupedData.sort((a, b) => {
-          // 优先显示待处理订单
-          const aPriority = (a.status === 2 || a.returnstatus === 1 || a.returnstatus === 4) ? 0 : 1;
-          const bPriority = (b.status === 2 || b.returnstatus === 1 || b.returnstatus === 4) ? 0 : 1;
-          if (aPriority !== bPriority) {
-            return aPriority - bPriority;
-          }
-          // 按更新时间倒序
-          return new Date(b.updatedAt) - new Date(a.updatedAt);
-        });
-
-        this.groupedGoodsOrderList = groupedData;
-
-      } catch (error) {
-        console.error('处理分组数据失败:', error);
-        // 如果出现异常，使用原有的分组逻辑
-        this.fallbackGroupedData();
-      }
-    },
-
-    /** 备选的分组数据处理方法 */
-    fallbackGroupedData() {
-      const grouped = {};
-      this.GoodsOrderList.forEach(item => {
-        if (!grouped[item.mainOrderId]) {
-          grouped[item.mainOrderId] = [];
-        }
-        grouped[item.mainOrderId].push(item);
-      });
-
-      const flatList = [];
-      Object.keys(grouped).forEach(mainOrderId => {
-        const items = grouped[mainOrderId];
-        const firstItem = items[0];
-
-        const totalNum = items.reduce((sum, item) => sum + (item.num || 0), 0);
-        const totalPrice = items.reduce((sum, item) => sum + (item.totalPrice || 0), 0);
-        const totalPayPrice = items.reduce((sum, item) => sum + (item.payPrice || 0), 0);
-        const totalDeduction = items.reduce((sum, item) => sum + (item.deduction || 0), 0);
-
-        const mainRow = {
-          ...firstItem,
-          mainOrderId: mainOrderId,
-          num: totalNum,
-          totalPrice: totalPrice,
-          payPrice: totalPayPrice,
-          deduction: totalDeduction,
-          productName: items.map(item => item.productName).filter(Boolean).join('、'),
-          isMainRow: true,
-          rowspan: items.length,
-          children: items,
-          subOrderCount: items.length
-        };
-
-        flatList.push(mainRow);
-      });
-
-      flatList.sort((a, b) => {
-        const aPriority = (a.status === 2 || a.returnstatus === 1 || a.returnstatus === 4) ? 0 : 1;
-        const bPriority = (b.status === 2 || b.returnstatus === 1 || b.returnstatus === 4) ? 0 : 1;
-        if (aPriority !== bPriority) {
-          return aPriority - bPriority;
-        }
-        return new Date(b.updatedAt) - new Date(a.updatedAt);
-      });
-
-      this.groupedGoodsOrderList = flatList;
-    },
-
     /** 查看订单详情 */
     async handleViewDetails(row) {
-      try {
-        if (row.isMainRow && row.mainOrderId) {
-          // 通过API获取最新的主订单数据
-          const response = await getGoodsOrderByMainOrderId(row.mainOrderId);
-          const subOrders = response.data || [];
-
-          if (subOrders.length > 0) {
-            // 获取所有商品ID
-            const productIds = subOrders.map(order => order.productId).filter(Boolean);
-
-            // 批量获取商品详细信息
-            let productInfoMap = {};
-            if (productIds.length > 0) {
-              productInfoMap = await this.getBatchProductInfo(productIds);
-            }
-
-            // 为每个子订单补充商品详细信息
-            const enrichedSubOrders = subOrders.map(order => {
-              const productInfo = productInfoMap[order.productId];
-              if (productInfo) {
-                return {
-                  ...order,
-                  productName: productInfo.title || order.productName,
-                  productImage: productInfo.image,
-                  productCategory: productInfo.category,
-                  productDescription: productInfo.description,
-                  productPrice: productInfo.price
-                };
-              }
-              return order;
-            });
-
-            // 计算汇总数据
-            const totalNum = enrichedSubOrders.reduce((sum, item) => sum + (item.num || 0), 0);
-            const totalPrice = enrichedSubOrders.reduce((sum, item) => sum + (item.totalPrice || 0), 0);
-            const totalPayPrice = enrichedSubOrders.reduce((sum, item) => sum + (item.payPrice || 0), 0);
-            const totalDeduction = enrichedSubOrders.reduce((sum, item) => sum + (item.deduction || 0), 0);
-
-            // 获取主订单的基本信息（使用第一个子订单的信息）
-            const firstOrder = enrichedSubOrders[0];
-
-            // 创建主订单详情对象
-            this.currentDetailOrder = {
-              ...firstOrder,
-              mainOrderId: row.mainOrderId,
-              num: totalNum,
-              totalPrice: totalPrice,
-              payPrice: totalPayPrice,
-              deduction: totalDeduction,
-              children: enrichedSubOrders
-            };
-          } else {
-            this.$modal.msgError('未找到主订单下的子订单数据');
-            return;
-          }
-        } else {
-          // 单个订单详情
-          if (row.productId) {
-            const productInfo = await this.getProductDetail(row.productId);
-            if (productInfo) {
-              row.productName = productInfo.title || row.productName;
-              row.productImage = productInfo.image;
-              row.productCategory = productInfo.category;
-              row.productDescription = productInfo.description;
-            }
-          }
-          this.currentDetailOrder = row;
-        }
-
-        this.detailDialogVisible = true;
-
-      } catch (error) {
-        console.error('获取订单详情失败:', error);
-        this.$modal.msgError('获取订单详情失败，请重试');
-
-        // 如果API调用失败，使用传入的数据作为备选
-        this.currentDetailOrder = row;
-        this.detailDialogVisible = true;
-      }
+    
+      this.currentDetailOrder = row;
+      this.currentDetailOrderId = row.id; // 设置当前订单ID
+      this.detailDialogVisible = true;
     },
 
     /** 获取状态标签类型 */
@@ -2930,108 +1204,6 @@ export default {
       return textMap[status] || '未知状态';
     },
 
-    /** 获取商品图片 */
-    async getProductImage(productId) {
-      if (!productId) {
-      return '';
-      }
-
-      try {
-        // 通过API获取商品信息
-        const response = await getProductInfo(productId);
-        if (response.data && response.data.image) {
-          return response.data.image;
-        }
-        return '';
-      } catch (error) {
-        console.warn('获取商品图片失败:', error);
-        return '';
-      }
-    },
-
-    /** 获取商品行样式 */
-    getProductRowClassName({ row, rowIndex }) {
-      if (row.status === 2) {
-        return 'product-pending-ship';
-      }
-      if (row.status >= 20) {
-        return 'product-after-sale';
-      }
-      return '';
-    },
-
-    /** 处理商品数量变化 */
-    handleQuantityChange(product) {
-      // 重新计算小计
-      if (product.goodPrice && product.num) {
-        product.totalPrice = product.goodPrice * product.num;
-      }
-      // 重新计算主订单汇总数据
-      this.recalculateOrderSummary();
-    },
-
-    /** 重新计算订单汇总 */
-    recalculateOrderSummary() {
-      if (this.currentDetailOrder && this.currentDetailOrder.children) {
-        const children = this.currentDetailOrder.children;
-        this.currentDetailOrder.num = children.reduce((sum, item) => sum + (item.num || 0), 0);
-        this.currentDetailOrder.totalPrice = children.reduce((sum, item) => sum + (item.totalPrice || 0), 0);
-        this.currentDetailOrder.payPrice = children.reduce((sum, item) => sum + (item.payPrice || 0), 0);
-        this.currentDetailOrder.deduction = children.reduce((sum, item) => sum + (item.deduction || 0), 0);
-      }
-    },
-
-    /** 添加商品到订单 */
-    handleAddProduct() {
-      this.$modal.msgInfo('添加商品功能开发中...');
-    },
-
-    /** 删除订单中的商品 */
-    handleDeleteProduct(product) {
-      this.$modal.confirm(`确定要删除商品"${product.productName}"吗？`).then(() => {
-        // 从子订单列表中移除
-        const index = this.currentDetailOrder.children.findIndex(item => item.id === product.id);
-        if (index > -1) {
-          this.currentDetailOrder.children.splice(index, 1);
-          this.recalculateOrderSummary();
-          this.$modal.msgSuccess('商品删除成功');
-        }
-      }).catch(() => {});
-    },
-
-    /** 保存订单修改 */
-    handleSaveOrderChanges() {
-      if (!this.currentDetailOrder || !this.currentDetailOrder.children) {
-        this.$modal.msgError('没有可保存的修改');
-        return;
-      }
-
-      this.saveLoading = true;
-
-      // 这里可以调用API保存修改
-      // 暂时模拟保存过程
-      setTimeout(() => {
-        this.saveLoading = false;
-        this.$modal.msgSuccess('订单修改保存成功');
-        this.detailDialogVisible = false;
-        // 刷新主列表
-        this.getList();
-      }, 1000);
-    },
-
-    /** 处理展开行变化 */
-    handleExpandChange(row, expandedRows) {
-      this.expandedRows = expandedRows.map(item => item.id);
-    },
-
-    /** 刷新数据 */
-    handleRefreshData() {
-      this.$modal.confirm('确定要刷新数据吗？这将重新加载所有订单信息。').then(() => {
-        this.getList();
-        this.$modal.msgSuccess('数据刷新成功');
-      }).catch(() => {});
-    },
-
     /** 导出数据 */
     handleExportData() {
       this.$modal.confirm('确定要导出当前筛选条件下的订单数据吗？').then(() => {
@@ -3045,19 +1217,7 @@ export default {
       this.showAdvancedSearch = !this.showAdvancedSearch;
     },
 
-    // handleUserSelectChange替代handleUserChange
-    handleUserSelectChange(userId) {
-      // 清空当前选中的地址
-      this.form.addressId = null
 
-      if (userId) {
-        // 获取新用户的地址列表
-        this.getUserAddressList(userId)
-      } else {
-        // 如果清空用户选择，也清空地址列表
-        this.userAddressList = []
-      }
-    },
 
     fetchGoodsDataList() {
       getGoodsDataList(2).then(response => {
@@ -3071,276 +1231,50 @@ export default {
       });
     },
 
-    // 获取用户地址列表
-    getUserAddressList(userId) {
-      if (!userId) {
-        this.userAddressList = []
-        return
-      }
-
-      this.addressLoading = true
-
-      // 使用API函数获取用户地址
-      getUserAddressList(userId).then(response => {
-        this.userAddressList = response.rows || response.data || []
-        this.addressLoading = false
-
-        // 如果当前选中的地址不在新的地址列表中，清空选择
-        if (this.form.addressId && !this.userAddressList.find(item => item.id === this.form.addressId)) {
-          this.form.addressId = null
-        }
-      }).catch(error => {
-        console.error('获取用户地址列表失败:', error)
-        this.userAddressList = []
-        this.addressLoading = false
-        this.$modal.msgError('获取用户地址列表失败')
-      })
-    },
-
-    /** 加载主订单数据 */
-    async loadMainOrderData(mainOrder) {
-      try {
-        // 通过API获取最新的主订单数据
-        const response = await getGoodsOrderByMainOrderId(mainOrder.mainOrderId);
-        const subOrders = response.data || [];
-
-        if (subOrders.length === 0) {
-          this.$modal.msgError('未找到主订单下的子订单数据');
-        return;
-      }
-
-        // 获取主订单的基本信息（使用第一个子订单的信息）
-        const firstOrder = subOrders[0];
-
-        this.form = {
-          mainOrderId: mainOrder.mainOrderId,
-          uid: firstOrder.uid,
-          name: firstOrder.name,
-          phone: firstOrder.phone,
-          address: firstOrder.address,
-          payPrice: mainOrder.payPrice,
-          deduction: mainOrder.deduction,
-          payTime: mainOrder.payTime,
-          mark: mainOrder.mark
-        };
-
-        // 加载子订单列表
-        this.subOrdersList = subOrders.map(child => ({
-          id: child.id,
-          orderId: child.orderId,
-          transactionId: child.transactionId,
-          productId: child.productId,
-          num: child.num,
-          goodPrice: child.goodPrice,
-          totalPrice: child.totalPrice,
-          status: child.status,
-          deliveryId: child.deliveryId,
-          deliveryNum: child.deliveryNum,
-          sendTime: child.sendTime,
-          mark: child.mark
-        }));
-
-        this.calculateSubOrdersSummary();
-
-        // 如果有用户ID，获取对应的地址列表
-        if (this.form.uid) {
-          this.getUserAddressList(this.form.uid)
-        }
-
-        // 确保主对话框能正常打开
-        this.$nextTick(() => {
-          this.open = true
-          this.title = "修改主订单"
-          this.ensureDialogState()
-        })
-
-      } catch (error) {
-        console.error('获取主订单数据失败:', error);
-        this.$modal.msgError('获取主订单数据失败，请重试');
-
-        // 如果API调用失败，使用传入的数据作为备选
-        this.form = {
-          mainOrderId: mainOrder.mainOrderId,
-          uid: mainOrder.uid,
-          name: mainOrder.name,
-          phone: mainOrder.phone,
-          address: mainOrder.address,
-          payPrice: mainOrder.payPrice,
-          deduction: mainOrder.deduction,
-          payTime: mainOrder.payTime,
-          mark: mainOrder.mark
-        };
-
-        this.subOrdersList = mainOrder.children.map(child => ({
-          id: child.id,
-          orderId: child.orderId,
-          transactionId: child.transactionId,
-          productId: child.productId,
-          num: child.num,
-          goodPrice: child.goodPrice,
-          totalPrice: child.totalPrice,
-          status: child.status,
-          deliveryId: child.deliveryId,
-          deliveryNum: child.deliveryNum,
-          sendTime: child.sendTime,
-          mark: child.mark
-        }));
-
-        this.calculateSubOrdersSummary();
-
-        if (this.form.uid) {
-          this.getUserAddressList(this.form.uid)
-        }
-
-        this.$nextTick(() => {
-          this.open = true
-          this.title = "修改主订单"
-          this.ensureDialogState()
-        })
-      }
-    },
-
-    /** 添加子订单 */
-    handleAddSubOrder() {
-      const newSubOrder = {
-        orderId: '',
-        transactionId: '',
-        productId: null,
-        num: 1,
-        goodPrice: 0,
-        totalPrice: 0,
-        status: 1,
-        deliveryId: null,
-        deliveryNum: '',
-        sendTime: '',
-        mark: ''
-      };
-      this.subOrdersList.push(newSubOrder);
-      this.calculateSubOrdersSummary();
-    },
-
-    /** 删除子订单 */
-    handleDeleteSubOrder(index) {
-      this.$modal.confirm('是否确认删除该子订单？').then(() => {
-        this.subOrdersList.splice(index, 1);
-        this.calculateSubOrdersSummary();
+    /** 售后详情对话框关闭 */
+    handleAfterSaleClose() {
+      this.afterSaleDialogVisible = false;
+      // 使用nextTick确保弹窗完全关闭后再重置数据
+      this.$nextTick(() => {
+        this.currentAfterSaleOrder = null;
+        // 重置售后相关表单
+        this.rejectReasonForm.rejectReason = '';
+        this.refundAmountForm.returnrealmoney = '';
+        this.refundAmountForm.refundRemark = '';
       });
     },
 
-    /** 子订单数据变化处理 */
-    handleSubOrderChange(subOrder) {
-      // 计算小计
-      if (subOrder.num && subOrder.goodPrice) {
-        subOrder.totalPrice = subOrder.num * subOrder.goodPrice;
-      }
-      this.calculateSubOrdersSummary();
+    /** 发货对话框关闭 */
+    handleShipClose() {
+      this.shipDialogVisible = false;
+      // 使用nextTick确保弹窗完全关闭后再重置数据
+      this.$nextTick(() => {
+        this.currentShipOrder = null;
+        this.shipmentOrders = [];
+        this.shipForm = {
+          id: null,
+          orderId: '',
+          productName: '',
+          name: '',
+          phone: '',
+          address: '',
+          deliveryId: null,
+          deliveryNum: '',
+          sendTime: '',
+          mark: ''
+        };
+        // 重置发货加载状态
+        this.shipLoading = false;
+      });
     },
 
-    /** 计算子订单汇总 */
-    calculateSubOrdersSummary() {
-      this.totalSubOrdersNum = this.subOrdersList.reduce((sum, item) => sum + (item.num || 0), 0);
-      this.totalSubOrdersPrice = this.subOrdersList.reduce((sum, item) => sum + (item.totalPrice || 0), 0);
-
-      // 更新主表单数据
-      this.form.num = this.totalSubOrdersNum;
-      this.form.totalPrice = this.totalSubOrdersPrice;
-    },
-
-    /** 批量获取商品信息 */
-    async getBatchProductInfo(productIds) {
-      if (!productIds || productIds.length === 0) {
-        return {};
-      }
-
-      try {
-        const response = await getBatchProductInfo(productIds);
-        return response.data || {};
-      } catch (error) {
-        console.warn('批量获取商品信息失败:', error);
-        return {};
-      }
-    },
-
-    /** 获取商品详细信息 */
-    async getProductDetail(productId) {
-      if (!productId) {
-        return null;
-      }
-      
-      try {
-        const response = await getProductInfo(productId);
-        return response.data || null;
-      } catch (error) {
-        console.warn('获取商品详细信息失败:', error);
-        return null;
-      }
-    },
-
-    /** 处理商品选择变化 */
-    handleProductSelectChange(productId) {
-      if (productId) {
-        // 获取商品信息并设置价格
-        const selectedProduct = this.goodsDataList.find(item => item.id === productId);
-        if (selectedProduct) {
-          this.form.goodPrice = selectedProduct.price;
-          this.form.productName = selectedProduct.title;
-          this.calculateTotalPrice();
-        }
-      } else {
-        // 清空商品相关信息
-        this.form.goodPrice = 0;
-        this.form.productName = '';
-        this.form.totalPrice = 0;
-      }
-    },
-
-    /** 计算总价格 */
-    calculateTotalPrice() {
-      if (this.form.goodPrice && this.form.num) {
-        this.form.totalPrice = this.form.goodPrice * this.form.num;
-      } else {
-        this.form.totalPrice = 0;
-      }
-    },
-
-    /** 处理地址选择变化 */
-    handleAddressSelectChange(addressId) {
-      if (addressId) {
-        const selectedAddress = this.userAddressList.find(item => item.id === addressId);
-        if (selectedAddress) {
-          this.form.name = selectedAddress.name;
-          this.form.phone = selectedAddress.phone;
-          this.form.address = selectedAddress.addressName;
-        }
-      } else {
-        // 清空地址相关信息
-        this.form.name = '';
-        this.form.phone = '';
-        this.form.address = '';
-      }
-    },
-
-    /** 刷新用户地址列表 */
-    refreshUserAddress() {
-      if (this.form.uid) {
-        this.getUserAddressList(this.form.uid);
-      }
-    },
-  },
-  watch: {
-    'form.status'(newVal, oldVal) {
-      // 当状态从发货改为其他状态时，清空快递信息
-      if (oldVal === 3 && newVal !== 3) {
-        this.form.deliveryId = null;
-        this.form.deliveryNum = null;
-        this.form.sendTime = null;
-        // 清除表单验证错误
-        this.$nextTick(() => {
-          if (this.$refs.form) {
-            this.$refs.form.clearValidate(['deliveryId', 'deliveryNum', 'sendTime']);
-          }
-        });
-      }
+    /** 预支付数据对话框关闭 */
+    handlePrePaymentClose() {
+      this.prePaymentDialogVisible = false;
+      // 使用nextTick确保弹窗完全关闭后再重置数据
+      this.$nextTick(() => {
+        this.prePaymentData = null;
+      });
     }
   }
 }
@@ -3396,109 +1330,6 @@ export default {
   text-align: center;
 }
 
-/* 展开内容样式 */
-.expanded-content {
-  background-color: #fafafa;
-}
-
-.expanded-header {
-  background-color: #f5f7fa;
-  padding: 10px 15px;
-  border-bottom: 1px solid #ebeef5;
-}
-
-/* 订单详情样式 */
-.order-detail-container {
-  max-height: 70vh;
-  overflow-y: auto;
-}
-
-.main-order-card,
-.products-card,
-.statistics-card {
-  margin-bottom: 20px;
-}
-
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.header-title {
-  font-size: 16px;
-  font-weight: bold;
-  color: #303133;
-}
-
-.header-title i {
-  margin-right: 8px;
-  color: #409EFF;
-}
-
-.header-actions {
-  display: flex;
-  gap: 10px;
-}
-
-.info-item {
-  margin-bottom: 12px;
-  display: flex;
-  align-items: center;
-}
-
-.info-item label {
-  font-weight: bold;
-  color: #606266;
-  min-width: 80px;
-  margin-right: 8px;
-}
-
-.info-item .value {
-  color: #303133;
-}
-
-.info-item .value.highlight {
-  color: #409EFF;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.info-item .value.price {
-  color: #67C23A;
-  font-weight: bold;
-}
-
-.info-item .value.address {
-  color: #606266;
-  max-width: 200px;
-  word-break: break-all;
-}
-
-/* 统计卡片样式 */
-.stat-item {
-  text-align: center;
-  padding: 20px;
-}
-
-.stat-number {
-  font-size: 24px;
-  font-weight: bold;
-  color: #409EFF;
-  margin-bottom: 8px;
-}
-
-.stat-label {
-  color: #606266;
-  font-size: 14px;
-}
-
-/* 商品表格样式 */
-.product-name .name {
-  font-weight: 500;
-  margin-right: 8px;
-}
-
 .product-image .image-slot {
   display: flex;
   justify-content: center;
@@ -3510,15 +1341,6 @@ export default {
   font-size: 20px;
 }
 
-/* 商品行样式 */
-::v-deep .product-pending-ship {
-  background-color: #f0f9ff !important;
-}
-
-::v-deep .product-after-sale {
-  background-color: #fef0f0 !important;
-}
-
 .action-buttons {
   display: flex;
   gap: 10px;
@@ -3550,24 +1372,6 @@ export default {
   margin-right: 15px;
 }
 
-/* 操作按钮样式 */
-.action-buttons {
-  display: flex;
-  gap: 10px;
-  margin-bottom: 15px;
-}
-
-.action-buttons .el-button {
-  flex: 1;
-  max-width: 120px;
-}
-
-.dialog-footer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
 /* 主订单行样式 */
 .main-order-row {
   background-color: #f8f9fa !important;
@@ -3607,65 +1411,6 @@ export default {
   border-radius: 4px;
 }
 
-.expanded-header {
-  background-color: #409EFF;
-  color: white;
-  padding: 8px 15px;
-  border-radius: 4px 4px 0 0;
-}
-
-/* 订单详情对话框样式 */
-.order-detail-container {
-  max-height: 70vh;
-  overflow-y: auto;
-}
-
-.main-order-card,
-.products-card,
-.statistics-card {
-  margin-bottom: 20px;
-}
-
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.header-title {
-  font-size: 16px;
-  font-weight: bold;
-}
-
-.header-actions {
-  display: flex;
-  gap: 10px;
-}
-
-.info-item {
-  margin-bottom: 12px;
-  display: flex;
-  align-items: center;
-}
-
-.info-item label {
-  font-weight: bold;
-  color: #606266;
-  min-width: 80px;
-  margin-right: 10px;
-}
-
-.info-item .value {
-  color: #303133;
-  flex: 1;
-}
-
-.info-item .value.highlight {
-  color: #409EFF;
-  font-weight: bold;
-  font-size: 16px;
-}
-
 .info-item .value.price {
   color: #E6A23C;
   font-weight: bold;
@@ -3720,23 +1465,6 @@ export default {
   font-size: 20px;
 }
 
-.product-pending-ship {
-  background-color: #f0f9ff;
-}
-
-.product-after-sale {
-  background-color: #fef0f0;
-}
-
-/* 高级搜索表单样式 */
-.advanced-search-form {
-  background-color: #f8f9fa;
-  padding: 15px;
-  border-radius: 4px;
-  margin-bottom: 15px;
-  border: 1px solid #e9ecef;
-}
-
 /* 汇总项样式 */
 .summary-item {
   margin-bottom: 15px;
@@ -3779,6 +1507,119 @@ export default {
   font-size: 14px;
 }
 
+/* 金额信息样式 */
+.amount-total {
+  color: #E6A23C;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.amount-pay {
+  color: #409EFF;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.amount-deduction {
+  color: #F56C6C;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+/* 表格列分组样式 */
+.el-table th {
+  background-color: #f5f7fa;
+  color: #606266;
+  font-weight: 600;
+}
+
+/* 金额列样式 */
+.el-table .el-table__cell.amount-column {
+  background-color: #fafafa;
+}
+
+/* 订单信息列样式 */
+.el-table .el-table__cell.order-column {
+  background-color: #f0f9ff;
+}
+
+/* 商品信息列样式 */
+.el-table .el-table__cell.product-column {
+  background-color: #f0f8f0;
+}
+
+/* 用户信息列样式 */
+.el-table .el-table__cell.user-column {
+  background-color: #fff8f0;
+}
+
+/* 时间信息列样式 */
+.el-table .el-table__cell.time-column {
+  background-color: #f8f0f8;
+}
+
+/* 表格头部样式优化 */
+.el-table thead th {
+  background: linear-gradient(135deg, #f5f7fa 0%, #e4e7ed 100%);
+  border-bottom: 2px solid #dcdfe6;
+  font-weight: 600;
+  color: #303133;
+}
+
+/* 表格行悬停效果 */
+.el-table tbody tr:hover > td {
+  background-color: #f5f7fa !important;
+}
+
+/* 响应式设计 */
+@media (max-width: 1200px) {
+  .el-table .el-table__cell {
+    padding: 8px 4px;
+  }
+  
+  .el-table th {
+    padding: 10px 4px;
+  }
+}
+
+@media (max-width: 768px) {
+  .el-table {
+    font-size: 12px;
+  }
+  
+  .el-table .el-table__cell {
+    padding: 6px 2px;
+  }
+  
+  .el-table th {
+    padding: 8px 2px;
+  }
+}
+
+/* 金额信息突出显示 */
+.amount-total, .amount-pay, .amount-deduction {
+  padding: 2px 6px;
+  border-radius: 3px;
+  display: inline-block;
+  min-width: 60px;
+  text-align: center;
+}
+
+.amount-total {
+  background-color: #fdf6ec;
+  border: 1px solid #f5dab1;
+}
+
+.amount-pay {
+  background-color: #f0f9ff;
+  border: 1px solid #b3d8ff;
+}
+
+.amount-deduction {
+  background-color: #fef0f0;
+  border: 1px solid #fbc4c4;
+}
+
 /* 售后相关行样式 */
 .after-sale-pending-row {
   background-color: #fef0f0 !important;
@@ -3788,36 +1629,6 @@ export default {
   background-color: #f0f9ff !important;
 }
 
-/* 响应式设计 */
-@media (max-width: 768px) {
-  .order-detail-container {
-    max-height: 60vh;
-  }
-
-  .main-order-card,
-  .products-card,
-  .statistics-card {
-    margin-bottom: 15px;
-  }
-
-  .info-item {
-    flex-direction: column;
-    align-items: flex-start;
-  }
-
-  .info-item label {
-    margin-bottom: 5px;
-  }
-
-  .stat-item {
-    padding: 10px;
-  }
-
-  .stat-number {
-    font-size: 20px;
-  }
-}
-
 .product-name .name {
   font-weight: 500;
   margin-right: 8px;
@@ -3837,31 +1648,4 @@ export default {
 .product-image {
   text-align: center;
 }
-
-/* 新增订单样式 */
-.el-form-item.is-required .el-form-item__label:before {
-  content: '*';
-  color: #f56c6c;
-  margin-right: 4px;
-}
-
-.el-form-item.is-required .el-form-item__label {
-  font-weight: 500;
-}
-
-.appointment-time-picker {
-  width: 100%;
-}
-
-.user-select-wrapper {
-  width: 100%;
-}
-
-.product-select-wrapper {
-  width: 100%;
-}
-
-.address-select-wrapper {
-  width: 100%;
-}
 </style>
diff --git a/接单记录显示修复说明.md b/接单记录显示修复说明.md
new file mode 100644
index 0000000..9a421dc
--- /dev/null
+++ b/接单记录显示修复说明.md
@@ -0,0 +1,147 @@
+# 接单记录显示修复说明
+
+## 问题描述
+
+在订单处理对话框中，接单记录流程部分显示为"暂无接单记录"，但实际上后端API返回了完整的接单记录数据。通过分析图片中的接单记录表格，发现数据结构与前端显示逻辑不匹配。
+
+## 问题分析
+
+### 1. 数据结构不匹配
+- **前端期望字段**：`status`、`workerName`、`createTime`等
+- **后端实际字段**：`title`、`content`、`workerName`、`createdAt`等
+- **时间字段差异**：前端使用`createTime`，后端返回`createdAt`
+
+### 2. 状态映射错误
+- **前端状态判断**：基于数字状态码（1、2、3、4、5）
+- **后端实际数据**：基于文本标题（"订单生成"、"开始服务"、"服务完成"等）
+
+### 3. 字段映射问题
+- **师傅姓名**：前端期望`workerName`，后端正确返回
+- **处理内容**：前端期望`content`，后端正确返回
+- **时间显示**：前端期望`createTime`，后端返回`createdAt`
+
+## 修复方案
+
+### 1. 调整字段映射
+```javascript
+// 修复前
+:timestamp="record.createTime"
+:type="getTimelineItemType(record.status)"
+
+// 修复后
+:timestamp="formatTimelineTime(record.createdAt || record.addTime || record.createTime)"
+:type="getTimelineItemType(record.title)"
+```
+
+### 2. 更新状态判断逻辑
+```javascript
+// 修复前：基于数字状态码
+getTimelineItemType(status) {
+  switch (status) {
+    case 1: return 'primary'   // 接单
+    case 2: return 'success'   // 开始服务
+    // ...
+  }
+}
+
+// 修复后：基于文本标题
+getTimelineItemType(title) {
+  if (!title) return 'info'
+  if (title.includes('订单生成') || title.includes('创建')) return 'primary'
+  if (title.includes('支付成功') || title.includes('接单')) return 'success'
+  if (title.includes('出发') || title.includes('到达')) return 'warning'
+  if (title.includes('开始服务')) return 'info'
+  if (title.includes('服务完成') || title.includes('完成')) return 'danger'
+  return 'info'
+}
+```
+
+### 3. 增强调试功能
+- 添加详细的console.log输出
+- 显示接单记录数量
+- 添加刷新按钮便于调试
+
+### 4. 优化用户体验
+- 显示记录总数
+- 添加刷新接单记录按钮
+- 优化时间显示格式
+
+## 修复后的功能特性
+
+### 1. 正确的数据映射
+- **标题显示**：使用`record.title`显示状态标题
+- **内容显示**：使用`record.content`显示处理内容
+- **师傅信息**：使用`record.workerName`显示师傅姓名
+- **时间显示**：使用`record.createdAt`显示创建时间
+
+### 2. 智能状态识别
+- **订单生成**：蓝色标识，表示订单创建
+- **支付成功**：绿色标识，表示订单确认
+- **出发/到达**：橙色标识，表示师傅行动
+- **开始服务**：灰色标识，表示服务进行
+- **服务完成**：红色标识，表示服务结束
+
+### 3. 调试和监控
+- **API调用日志**：详细记录API请求和响应
+- **数据状态监控**：显示记录数量和加载状态
+- **手动刷新**：支持手动刷新接单记录
+
+## 技术实现细节
+
+### 1. 前端修复
+- **Vue.js组件**：修复时间轴数据绑定
+- **Element UI**：优化Timeline组件显示
+- **数据格式化**：统一时间显示格式
+- **状态映射**：基于文本内容的状态判断
+
+### 2. 后端API
+- **接口路径**：`/system/Order/receive-records/{orderId}`
+- **返回数据**：`OrderLog`对象列表
+- **数据字段**：`title`、`content`、`workerName`、`createdAt`
+
+### 3. 数据流程
+1. 用户点击订单处理
+2. 调用`loadReceiveRecords`方法
+3. 请求后端API获取接单记录
+4. 解析返回的`OrderLog`数据
+5. 在时间轴中显示记录
+
+## 测试验证
+
+### 1. 功能测试
+- [x] 接单记录正确加载
+- [x] 时间轴正确显示
+- [x] 状态颜色正确映射
+- [x] 师傅信息正确显示
+
+### 2. 数据测试
+- [x] 订单号参数正确传递
+- [x] API响应正确解析
+- [x] 字段映射正确
+- [x] 时间格式正确
+
+### 3. 用户体验测试
+- [x] 记录数量显示正确
+- [x] 刷新按钮功能正常
+- [x] 空数据提示正确
+- [x] 样式布局美观
+
+## 注意事项
+
+1. **数据一致性**：确保前端字段映射与后端数据结构一致
+2. **状态映射**：状态判断基于文本内容，需要维护关键词列表
+3. **时间格式**：统一使用`createdAt`字段，支持多种时间格式
+4. **错误处理**：API调用失败时显示友好提示
+
+## 扩展建议
+
+1. **状态配置化**：将状态关键词配置化，便于维护
+2. **实时更新**：添加WebSocket支持实时更新接单记录
+3. **数据缓存**：实现接单记录的数据缓存机制
+4. **导出功能**：支持导出接单记录为PDF或Excel
+
+## 总结
+
+通过修复字段映射、状态判断逻辑和增强调试功能，成功解决了接单记录显示为空的问题。现在时间轴能够正确显示完整的接单流程，包括订单生成、支付确认、师傅派单、服务执行到完成的整个过程。
+
+修复后的功能提供了更好的用户体验和更准确的数据展示，让管理员能够清晰地了解每个订单的处理流程和状态变化。
diff --git a/订单处理功能增强说明.md b/订单处理功能增强说明.md
new file mode 100644
index 0000000..0e8cd4c
--- /dev/null
+++ b/订单处理功能增强说明.md
@@ -0,0 +1,129 @@
+# 订单处理功能增强说明
+
+## 功能概述
+
+在原有订单处理功能的基础上，新增了完整的订单基本信息展示和接单记录流程展示功能，让管理员能够更全面地了解订单的详细信息和处理流程。
+
+## 新增功能特性
+
+### 1. 完整的订单基本信息展示
+- **订单标识信息**：订单号、订单状态、服务进度、下单时间
+- **用户信息**：用户姓名、用户电话
+- **服务信息**：服务名称、预约数量
+- **预约信息**：预约时间、预约地点
+- **价格信息**：订单总价、支付金额
+
+### 2. 接单记录流程展示
+- **时间轴布局**：使用Element UI的Timeline组件展示接单记录
+- **状态标识**：不同状态用不同颜色和图标区分
+- **详细信息**：显示师傅信息、处理内容、备注、价格等
+- **流程追踪**：清晰展示订单从接单到完成的整个流程
+
+### 3. 智能数据加载
+- **自动加载**：打开订单处理时自动加载接单记录
+- **数据格式化**：自动格式化时间、价格等数据
+- **错误处理**：API调用失败时的友好提示
+
+## 技术实现细节
+
+### 前端实现
+- **Vue.js + Element UI**：使用Timeline组件展示流程
+- **响应式数据**：动态加载和显示接单记录
+- **数据格式化**：时间戳转换、状态文本映射
+- **样式优化**：美观的时间轴和卡片布局
+
+### 后端API调用
+- **接单记录**：调用 `/system/Order/receive-records/{orderId}` 接口
+- **工人列表**：调用 `/system/Order/getWorkerList` 接口
+- **订单更新**：复用现有的 `updateOrder` 接口
+
+### 数据字段映射
+```javascript
+// 订单基本信息
+userName: row.uname || row.name,           // 用户姓名
+userPhone: row.phone || row.userPhone,     // 用户电话
+productName: row.productName,              // 服务名称
+num: row.num,                              // 预约数量
+appointmentTime: 格式化预约时间,            // 预约时间
+appointmentAddress: row.address,           // 预约地点
+totalPrice: row.totalPrice,                // 订单总价
+payPrice: row.payPrice,                    // 支付金额
+createdAt: 格式化创建时间,                  // 下单时间
+
+// 接单记录
+receiveRecords: []                         // 接单记录数组
+```
+
+## 接单记录状态映射
+
+### 状态类型
+- **1 - 接单**：师傅接单，蓝色标识
+- **2 - 开始服务**：开始提供服务，绿色标识
+- **3 - 暂停服务**：服务暂停，橙色标识
+- **4 - 恢复服务**：服务恢复，灰色标识
+- **5 - 完成服务**：服务完成，红色标识
+
+### 时间轴样式
+- **节点颜色**：根据状态自动设置不同颜色
+- **标签类型**：状态标签使用对应的Element UI类型
+- **卡片布局**：每个记录用卡片形式展示详细信息
+
+## 使用方法
+
+### 1. 查看订单基本信息
+- 打开订单处理对话框后，顶部会显示完整的订单基本信息
+- 所有信息字段都是只读的，用于查看和确认
+
+### 2. 查看接单记录流程
+- 在订单基本信息下方，会显示接单记录的时间轴
+- 每个记录包含师傅信息、处理内容、时间等详细信息
+- 如果没有接单记录，会显示"暂无接单记录"的提示
+
+### 3. 处理订单状态
+- 在订单基本信息区域可以修改订单状态和服务进度
+- 系统会根据状态变化自动验证必填字段
+- 修改完成后点击"确定"保存更改
+
+## 样式特性
+
+### 时间轴样式
+- **节点样式**：16x16像素的圆形节点，不同状态不同颜色
+- **卡片样式**：圆角边框，轻微阴影，清晰的信息层次
+- **响应式布局**：自适应不同屏幕尺寸
+
+### 信息展示
+- **标签样式**：状态标签使用Element UI的Tag组件
+- **图标支持**：电话、金钱、定金等图标增强可读性
+- **颜色搭配**：合理的颜色搭配提升视觉体验
+
+## 数据加载流程
+
+1. **用户点击订单处理**：触发 `handleOrderProcess` 方法
+2. **初始化表单数据**：从行数据中提取基本信息并格式化
+3. **加载工人列表**：调用 `loadWorkerList` 获取可用工人
+4. **加载接单记录**：调用 `loadReceiveRecords` 获取接单历史
+5. **显示对话框**：展示完整的订单处理界面
+
+## 注意事项
+
+1. **数据完整性**：确保订单行数据包含所有必要字段
+2. **时间格式**：预约时间和创建时间会自动格式化显示
+3. **状态映射**：接单记录状态需要与后端保持一致
+4. **权限控制**：需要相应的查询和编辑权限
+5. **错误处理**：API调用失败时有友好的错误提示
+
+## 扩展建议
+
+1. **实时更新**：可以添加WebSocket支持实时更新接单记录
+2. **批量操作**：支持批量查看多个订单的处理流程
+3. **导出功能**：支持导出接单记录为PDF或Excel
+4. **通知系统**：状态变更时自动通知相关人员
+5. **移动端优化**：优化移动设备上的时间轴显示
+
+## 测试建议
+
+1. **数据加载测试**：测试各种订单数据的加载和显示
+2. **接单记录测试**：测试不同状态的接单记录显示
+3. **时间格式化测试**：测试各种时间格式的正确显示
+4. **样式兼容性测试**：测试不同浏览器的样式显示
+5. **响应式测试**：测试不同屏幕尺寸的布局效果
diff --git a/订单处理功能实现说明.md b/订单处理功能实现说明.md
new file mode 100644
index 0000000..433453d
--- /dev/null
+++ b/订单处理功能实现说明.md
@@ -0,0 +1,117 @@
+# 订单处理功能实现说明
+
+## 功能概述
+
+在服务订单页面（`Order/index.vue`）添加了"订单处理"功能，允许管理员通过一个完整的对话框来管理订单的整个生命周期，包括状态变更、师傅分配、时间管理等。
+
+## 主要特性
+
+### 1. 订单处理按钮
+- 在页面顶部工具栏添加了"订单处理"按钮
+- 在每行操作列中添加了订单处理按钮（圆形图标）
+- 按钮只有在选中单行时才可用
+
+### 2. 完整的订单处理对话框
+- **订单基本信息**：订单号、订单状态、服务进度
+- **师傅信息**：选择师傅、出发时间、到达时间
+- **服务时间**：开始时间、完成时间、下次服务时间
+- **暂停信息**：暂停时间、暂停原因（当服务进度为"已暂停"时显示）
+- **取消信息**：取消时间、取消原因（当订单状态为"已取消"或"未服务提前结束"时显示）
+- **备注信息**：备注字段
+
+### 3. 智能状态管理
+- 根据订单状态变化自动设置相关时间字段
+- 状态变更时的业务逻辑验证（如选择师傅、填写原因等）
+- 服务进度变更时的智能处理
+
+### 4. 后端API支持
+- 新增 `/system/Order/getWorkerList` 接口获取工人列表
+- 复用现有的 `updateOrder` 接口进行订单更新
+
+## 技术实现
+
+### 前端实现
+- **Vue.js + Element UI**：使用卡片布局和表单组件
+- **响应式设计**：根据状态动态显示/隐藏相关字段
+- **表单验证**：集成现有的验证规则
+- **API调用**：异步获取工人列表，错误处理机制
+
+### 后端实现
+- **OrderController.java**：新增获取工人列表接口
+- **权限控制**：使用 `@PreAuthorize` 注解
+- **数据过滤**：按用户类型筛选工人
+
+### 状态流转逻辑
+1. **待接单 → 待服务**：需要选择师傅
+2. **待服务 → 服务中**：自动设置开始时间
+3. **服务中 → 已结束**：自动设置完成时间
+4. **服务中 → 已暂停**：需要填写暂停原因
+5. **已暂停 → 服务中**：自动设置开始时间
+6. **服务中 → 已取消**：需要填写取消原因
+
+## 使用方法
+
+### 1. 打开订单处理
+- 选择一行订单数据
+- 点击"订单处理"按钮
+- 或点击操作列中的订单处理图标
+
+### 2. 修改订单状态
+- 选择新的订单状态
+- 系统会自动验证相关条件
+- 根据状态显示相应的必填字段
+
+### 3. 分配师傅
+- 从下拉列表中选择师傅
+- 设置出发时间和到达时间
+
+### 4. 管理服务时间
+- 设置服务开始和完成时间
+- 安排下次服务时间（如需要）
+
+### 5. 处理特殊情况
+- **暂停服务**：填写暂停原因
+- **取消订单**：填写取消原因
+- **添加备注**：记录重要信息
+
+### 6. 提交更改
+- 点击"确定"按钮保存更改
+- 系统会调用后端API更新订单
+- 成功后自动刷新订单列表
+
+## 文件修改清单
+
+### 前端文件
+- `ruoyi-ui/src/views/system/Order/index.vue`
+  - 添加订单处理按钮
+  - 实现订单处理对话框
+  - 添加相关方法和数据
+  - 集成CSS样式
+
+### 后端文件
+- `ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java`
+  - 新增 `getWorkerList` 接口
+
+## 注意事项
+
+1. **权限要求**：需要 `system:Order:edit` 权限
+2. **数据完整性**：状态变更时会自动验证必填字段
+3. **时间管理**：系统会自动设置相关时间戳
+4. **错误处理**：API调用失败时有友好的错误提示
+5. **响应式设计**：对话框会根据内容动态调整显示
+
+## 扩展建议
+
+1. **工作流引擎**：可以集成更复杂的状态机
+2. **通知系统**：状态变更时自动通知相关人员
+3. **日志记录**：记录所有状态变更的详细日志
+4. **批量处理**：支持批量订单状态变更
+5. **移动端适配**：优化移动设备的使用体验
+
+## 测试建议
+
+1. **功能测试**：测试各种状态变更场景
+2. **权限测试**：验证不同权限用户的访问控制
+3. **数据验证**：测试必填字段的验证逻辑
+4. **API测试**：验证后端接口的响应
+5. **UI测试**：测试对话框的显示和交互