From a393b2ed52397080faac8fe3c1a407b48d557b47 Mon Sep 17 00:00:00 2001
From: linbin <495561397@qq.com>
Date: Thu, 2 Oct 2025 19:03:03 +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=E5=BA=97=E9=93=BA=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=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

- 在市场店铺订单管理页面中，增加结算单位订单状态的筛选功能
- 更新表格字段显示，增加结算单位订单状态列
- 同步更新表格行的colspan属性值以适应新增的列
- 完善店铺订单状态和结算单位订单状态的显示
---
 .../市场店铺订单管理/市场店铺订单管理.html    | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/商家端web/市场店铺订单管理/市场店铺订单管理.html b/商家端web/市场店铺订单管理/市场店铺订单管理.html
index d182e71..d354583 100644
--- a/商家端web/市场店铺订单管理/市场店铺订单管理.html
+++ b/商家端web/市场店铺订单管理/市场店铺订单管理.html
@@ -456,6 +456,25 @@
                         <option value="completed">已完成</option>
                     </select>
                 </div>
+                <div class="filter-item">
+                    <label>结算单位订单状态:</label>
+                    <select>
+                        <option value="">全部</option>
+                        <option value="pending_payment">待支付</option>
+                        <option value="pending_accept">待接单</option>
+                        <option value="pending_prepare">待备货</option>
+                        <option value="pending_pickup">待取货</option>
+                        <option value="pickup_pending_delivery">已取货（待配送）</option>
+                        <option value="delivery_in_progress">配送中（待送达）</option>
+                        <option value="delivered_pending_receipt">已配送（待收货或已送达自提点）</option>
+                        <option value="completed_pending_review">完成（待评价或自动完成）</option>
+                        <option value="unpaid_cancelled">未支付订单取消</option>
+                        <option value="user_refund_processing">用户申请退款中</option>
+                        <option value="user_refund_completed">用户申请已退款</option>
+                        <option value="merchant_cancelled">商家取消订单</option>
+                        <option value="platform_cancelled">平台取消订单</option>
+                    </select>
+                </div>
             </div>
             <div class="filter-row">
                 <div class="filter-item">
@@ -522,7 +541,8 @@
                             <th>收货人地址</th>
                             <th>店铺订单金额</th>
                             <th>店铺订单商品金额</th>
-                            <th>订单状态</th>
+                            <th>店铺订单状态</th>
+                            <th>结算单位订单状态</th>
                             <th>店铺编号</th>
                             <th>店铺名称</th>
                             <th>申请退款原因</th>
@@ -541,13 +561,14 @@
                             <td>3.8</td>
                             <td>1.8</td>
                             <td><span class="status-tag status-paid">已支付</span></td>
+                            <td><span class="status-tag status-paid">已支付</span></td>
                             <td>1001</td>
                             <td>牛牛蔬菜店</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="13">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -590,13 +611,14 @@
                             <td>3.9</td>
                             <td>0.9</td>
                             <td><span class="status-tag status-paid">已支付</span></td>
+                            <td><span class="status-tag status-paid">已支付</span></td>
                             <td>1002</td>
                             <td>鲜蔬果园店</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="13">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -639,13 +661,14 @@
                             <td>2.6</td>
                             <td>2</td>
                             <td><span class="status-tag status-completed">已完成</span></td>
+                            <td><span class="status-tag status-completed">已完成</span></td>
                             <td>1003</td>
                             <td>示例店铺</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="13">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -688,13 +711,14 @@
                             <td>3.6</td>
                             <td>3</td>
                             <td><span class="status-tag status-cancelled">取消</span></td>
+                            <td><span class="status-tag status-cancelled">取消</span></td>
                             <td>1004</td>
                             <td>示例店铺</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="13">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -737,13 +761,14 @@
                             <td>2.6</td>
                             <td>2</td>
                             <td><span class="status-tag status-completed">已完成</span></td>
+                            <td><span class="status-tag status-completed">已完成</span></td>
                             <td>1005</td>
                             <td>示例店铺</td>
                             <td></td>
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="13">
+                            <td colspan="14">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>