From b3547febf1ab694472f6b4a67566770197076e1b Mon Sep 17 00:00:00 2001
From: linbin <495561397@qq.com>
Date: Wed, 8 Oct 2025 01:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E8=BF=B0:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E5=B8=82=E5=9C=BA=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E8=A1=A8=E6=A0=BC=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=20-=20=E5=B0=86=E5=93=81=E7=89=8C=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E8=AE=A2=E5=8D=95=E7=9A=84=E6=97=B6=E9=97=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=94=B9=E4=B8=BA=E4=B8=8E=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=8B=E7=9A=84=E5=B8=82=E5=9C=BA=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=80=E8=87=B4=E7=9A=84=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=8C=85=E6=8B=AC=E8=BF=911=E5=A4=A9?=
 =?UTF-8?q?=E3=80=81=E8=BF=917=E5=A4=A9=E3=80=81=E8=BF=9130=E5=A4=A9?=
 =?UTF-8?q?=E5=92=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E9=80=89=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E6=80=A7=E3=80=82=20-=20=E7=BB=9F=E4=B8=80=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=A1=A8=E6=A0=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=BB=93=E6=9E=84=EF=BC=8C=E5=B0=86"=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D"=E7=AD=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA"=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=80=BB=E9=87=91=E9=A2=9D"=E7=AD=89=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E5=B8=82=E5=9C=BA=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E5=B8=82=E5=9C=BA=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E3=80=82=20-=20=E5=9C=A8=E5=AD=90=E8=A1=A8=E6=A0=BC=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E6=80=BB=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BD=BF=E8=A1=A8=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E4=B8=8E=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=85=A8=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E5=8C=96=E3=80=82=20-=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A1=A8=E6=A0=BCcolspan=E5=92=8C=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84CSS=E6=A0=B7=E5=BC=8F=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E7=9A=84=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E6=80=A7=E5=92=8C=E4=B8=80=E8=87=B4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 商家端web/品牌管理/品牌市场订单管理.html | 105 ++++++++++++++++-------
 1 file changed, 74 insertions(+), 31 deletions(-)

diff --git a/商家端web/品牌管理/品牌市场订单管理.html b/商家端web/品牌管理/品牌市场订单管理.html
index 804552a..df44e16 100644
--- a/商家端web/品牌管理/品牌市场订单管理.html
+++ b/商家端web/品牌管理/品牌市场订单管理.html
@@ -78,14 +78,40 @@
             box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
         }
 
-        .date-range {
+        .filter-row {
             display: flex;
             align-items: center;
-            gap: 8px;
+            gap: 20px;
+            flex-wrap: wrap;
         }
 
-        .date-range .form-input {
-            flex: 1;
+        .filter-item {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+
+        .filter-item label {
+            font-weight: 500;
+            color: #333;
+            min-width: 70px;
+        }
+
+        .filter-item select,
+        .filter-item input {
+            padding: 8px 12px;
+            border: 1px solid #d9d9d9;
+            border-radius: 4px;
+            min-width: 120px;
+            font-size: 14px;
+            transition: all 0.3s ease;
+        }
+
+        .filter-item select:focus,
+        .filter-item input:focus {
+            border-color: #1890ff;
+            box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+            outline: none;
         }
 
         .button-group {
@@ -447,13 +473,22 @@
                         <option value="platform_cancelled">平台取消订单</option>
                     </select>
                 </div>
-                <div class="form-item">
-                    <label class="form-label">订单时间</label>
-                    <div class="date-range">
-                        <input type="date" class="form-input" placeholder="开始日期">
-                        <span>-</span>
-                        <input type="date" class="form-input" placeholder="结束日期">
-                    </div>
+            </div>
+            <div class="filter-row">
+                <div class="filter-item">
+                    <label for="dateRange">日期范围:</label>
+                    <select id="dateRange">
+                        <option value="today">近1天</option>
+                        <option value="week" selected>近7天</option>
+                        <option value="month">近30天</option>
+                        <option value="custom">自定义</option>
+                    </select>
+                </div>
+                <div class="filter-item" id="customDateRange" style="display: none;">
+                    <label for="startDate">开始日期:</label>
+                    <input type="date" id="startDate">
+                    <label for="endDate">结束日期:</label>
+                    <input type="date" id="endDate">
                 </div>
             </div>
             <div class="button-group">
@@ -502,14 +537,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>
@@ -529,13 +562,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>
@@ -544,6 +575,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -554,6 +586,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>
@@ -603,13 +636,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>
@@ -618,6 +649,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -628,6 +660,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>
@@ -677,13 +710,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>
@@ -692,6 +723,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -702,6 +734,7 @@
                                                 <td>1</td>
                                                 <td>SO202407180001</td>
                                                 <td>示例店铺</td>
+                                                <td>2</td>
                                                 <td><span class="status-tag status-completed">完成</span></td>
                                                 <td></td>
                                             </tr>
@@ -751,13 +784,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>
@@ -766,6 +797,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -776,6 +808,7 @@
                                                 <td>1</td>
                                                 <td>SO202407180001</td>
                                                 <td>示例店铺</td>
+                                                <td>2</td>
                                                 <td><span class="status-tag status-completed">完成</span></td>
                                                 <td></td>
                                             </tr>
@@ -825,13 +858,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>
@@ -840,6 +871,7 @@
                                                 <th>序号</th>
                                                 <th>店铺订单号</th>
                                                 <th>店铺名称</th>
+                                                <th>商品总金额</th>
                                                 <th>订单状态</th>
                                                 <th></th>
                                             </tr>
@@ -850,6 +882,7 @@
                                                 <td>1</td>
                                                 <td>SO202407180001</td>
                                                 <td>示例店铺</td>
+                                                <td>2</td>
                                                 <td><span class="status-tag status-completed">完成</span></td>
                                                 <td></td>
                                             </tr>
@@ -921,6 +954,16 @@
     </div>
 
     <script>
+        // 日期范围选择
+        document.getElementById('dateRange').addEventListener('change', function() {
+            const customDateRange = document.getElementById('customDateRange');
+            if (this.value === 'custom') {
+                customDateRange.style.display = 'flex';
+            } else {
+                customDateRange.style.display = 'none';
+            }
+        });
+
         // 标签页切换功能
         document.querySelectorAll('.tab').forEach(tab => {
             tab.addEventListener('click', function() {