From fc2d58188402d59c1c931f8d6f0e9ca7f958b03a Mon Sep 17 00:00:00 2001
From: linbin <495561397@qq.com>
Date: Thu, 2 Oct 2025 18:45:28 +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?=
 =?UTF-8?q?=20-=20=E5=88=A0=E9=99=A4=E5=BA=97=E9=93=BA=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9=E3=80=81=E8=B0=83=E5=BA=A6=E8=B4=B9?=
 =?UTF-8?q?=E3=80=81=E5=8C=85=E8=A3=85=E8=B4=B9=E7=AD=89=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=97=20-=20=E6=A0=B9=E6=8D=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E5=88=97=E6=95=B0=E7=9B=B8=E5=BA=94=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A1=A8=E6=A0=BC=E8=A1=8C=E7=9A=84colspan=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=80=BC=20-=20=E7=AE=80=E5=8C=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../市场店铺订单管理/市场店铺订单管理.html    | 44 +++++--------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/商家端web/市场店铺订单管理/市场店铺订单管理.html b/商家端web/市场店铺订单管理/市场店铺订单管理.html
index e5d625c..3824ad2 100644
--- a/商家端web/市场店铺订单管理/市场店铺订单管理.html
+++ b/商家端web/市场店铺订单管理/市场店铺订单管理.html
@@ -421,19 +421,13 @@
                     <label class="form-label">店铺订单状态</label>
                     <select class="form-input">
                         <option value="">全部</option>
-                        <option value="pending_payment">待支付</option>
-                        <option value="pending_accept">待接单</option>
-                        <option value="pending_prepare">待备货</option>
+                        <option value="stock_completed">备货完成</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>
+                        <option value="delivery_in_progress">配送中</option>
+                        <option value="delivery_completed_pending_receipt">配送完成(待收货)</option>
+                        <option value="pending_review">待评价</option>
+                        <option value="completed">已完成</option>
                     </select>
                 </div>
                 <div class="form-item">
@@ -493,9 +487,6 @@
                             <th>收货人地址</th>
                             <th>店铺订单金额</th>
                             <th>店铺订单商品金额</th>
-                            <th>店铺订单配送费</th>
-                            <th>调度费</th>
-                            <th>包装费</th>
                             <th>订单状态</th>
                             <th>店铺编号</th>
                             <th>店铺名称</th>
@@ -514,9 +505,6 @@
                             <td>茅台酱香万家共享(春申路店) 101室</td>
                             <td>3.8</td>
                             <td>1.8</td>
-                            <td>0</td>
-                            <td>0</td>
-                            <td>1</td>
                             <td><span class="status-tag status-paid">已支付</span></td>
                             <td>1001</td>
                             <td>牛牛蔬菜店</td>
@@ -524,7 +512,7 @@
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="13">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -566,9 +554,6 @@
                             <td>茅台酱香万家共享(春申路店) 101室</td>
                             <td>3.9</td>
                             <td>0.9</td>
-                            <td>1</td>
-                            <td>0</td>
-                            <td>1</td>
                             <td><span class="status-tag status-paid">已支付</span></td>
                             <td>1002</td>
                             <td>鲜蔬果园店</td>
@@ -576,7 +561,7 @@
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="13">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -618,9 +603,6 @@
                             <td>瑞星商务中心 201室</td>
                             <td>2.6</td>
                             <td>2</td>
-                            <td>0.5</td>
-                            <td>0.1</td>
-                            <td>0.1</td>
                             <td><span class="status-tag status-completed">已完成</span></td>
                             <td>1003</td>
                             <td>示例店铺</td>
@@ -628,7 +610,7 @@
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="13">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -670,9 +652,6 @@
                             <td>瑞星商务中心 201室</td>
                             <td>3.6</td>
                             <td>3</td>
-                            <td>0.5</td>
-                            <td>0</td>
-                            <td>0.1</td>
                             <td><span class="status-tag status-cancelled">取消</span></td>
                             <td>1004</td>
                             <td>示例店铺</td>
@@ -680,7 +659,7 @@
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="13">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>
@@ -722,9 +701,6 @@
                             <td>瑞星商务中心 201室</td>
                             <td>2.6</td>
                             <td>2</td>
-                            <td>0.5</td>
-                            <td>0.1</td>
-                            <td>0.1</td>
                             <td><span class="status-tag status-completed">已完成</span></td>
                             <td>1005</td>
                             <td>示例店铺</td>
@@ -732,7 +708,7 @@
                             <td></td>
                         </tr>
                         <tr class="expandable-row" style="display: none;">
-                            <td colspan="16">
+                            <td colspan="13">
                                 <div class="nested-table-wrapper">
                                     <table class="sub-table">
                                         <thead>