From 8ef487056b5d4e9c2587de0b97dd8c21a6725c16 Mon Sep 17 00:00:00 2001
From: linbin <495561397@qq.com>
Date: Thu, 2 Oct 2025 17:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E8=BF=B0:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整订单表格字段显示，将"市场订单金额"、"市场订单商品金额"、"市场订单配送费"简化为"订单总金额"、"商品总金额"、"配送费"
- 移除冗余的"市场编号"和"市场名称"字段
- 在子表格中增加"商品总金额"字段显示
- 调整子表格行的列合并数以适应字段调整
---
 商家端web/市场订单管理/市场订单管理.html | 38 +++++++++++-------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/商家端web/市场订单管理/市场订单管理.html b/商家端web/市场订单管理/市场订单管理.html
index 77ff5dc..c6894ee 100644
--- a/商家端web/市场订单管理/市场订单管理.html
+++ b/商家端web/市场订单管理/市场订单管理.html
@@ -491,14 +491,12 @@
                             <th>收货人姓名</th>
                             <th>收货人电话</th>
                             <th>收货人地址</th>
-                            <th>市场订单金额</th>
-                            <th>市场订单商品金额</th>
-                            <th>市场订单配送费</th>
+                            <th>订单总金额</th>
+                            <th>商品总金额</th>
+                            <th>配送费</th>
                             <th>调度费</th>
                             <th>包装费</th>
                             <th>订单状态</th>
-                            <th>市场编号</th>
-                            <th>市场名称</th>
                             <th>申请退款原因</th>
                             <th></th>
                         </tr>
@@ -518,13 +516,11 @@
                             <td>0</td>
                             <td>1</td>
                             <td><span class="status-tag status-paid">已支付</span></td>
-                            <td>1</td>
-                            <td>春申菜市场</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -533,6 +529,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -543,6 +540,7 @@
                                                 <td>1</td>
                                                 <td>SO202407190001</td>
                                                 <td>牛牛蔬菜店</td>
+                                                <td>1.8</td>
                                                 <td><span class="status-tag status-pending">待备货</span></td>
                                                 <td></td>
                                             </tr>
@@ -592,13 +590,11 @@
                             <td>0</td>
                             <td>1</td>
                             <td><span class="status-tag status-paid">已支付</span></td>
-                            <td>1</td>
-                            <td>春申菜市场</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -607,6 +603,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -617,6 +614,7 @@
                                                 <td>1</td>
                                                 <td>SO202407190002</td>
                                                 <td>鲜蔬果园店</td>
+                                                <td>0.9</td>
                                                 <td><span class="status-tag status-pending">待备货</span></td>
                                                 <td></td>
                                             </tr>
@@ -666,13 +664,11 @@
                             <td>0.1</td>
                             <td>0.1</td>
                             <td><span class="status-tag status-completed">已完成</span></td>
-                            <td>2</td>
-                            <td>全季菜市场</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -681,6 +677,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -691,6 +688,7 @@
                                                 <td>1</td>
                                                 <td>SO202407180001</td>
                                                 <td>示例店铺</td>
+                                                <td>2</td>
                                                 <td><span class="status-tag status-completed">完成</span></td>
                                                 <td></td>
                                             </tr>
@@ -740,13 +738,11 @@
                             <td>0</td>
                             <td>0.1</td>
                             <td><span class="status-tag status-cancelled">取消</span></td>
-                            <td>-1</td>
-                            <td>全季菜市场</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -755,6 +751,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -765,6 +762,7 @@
                                                 <td>1</td>
                                                 <td>SO202407180001</td>
                                                 <td>示例店铺</td>
+                                                <td>2</td>
                                                 <td><span class="status-tag status-completed">完成</span></td>
                                                 <td></td>
                                             </tr>
@@ -814,13 +812,11 @@
                             <td>0.1</td>
                             <td>0.1</td>
                             <td><span class="status-tag status-completed">已完成</span></td>
-                            <td>2</td>
-                            <td>全季菜市场</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -829,6 +825,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -839,6 +836,7 @@
                                                 <td>1</td>
                                                 <td>SO202407180001</td>
                                                 <td>示例店铺</td>
+                                                <td>2</td>
                                                 <td><span class="status-tag status-completed">完成</span></td>
                                                 <td></td>
                                             </tr>