From a06cddd60fd67b14de3eacbbdda7feac78310af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E6=9C=A8?= <594326199@qq.com>
Date: Thu, 29 Oct 2026 17:51:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=94=AE=E5=90=8E=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=97=A5=E6=9C=9F=E6=94=B9=E4=B8=BA=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=80=89=E6=8B=A9=20Co-authored-by:=20=E8=8B=8F?=
 =?UTF-8?q?=E6=9C=A8=20<594326199@qq.com>=20Co-committed-by:=20=E8=8B=8F?=
 =?UTF-8?q?=E6=9C=A8=20<594326199@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partials/date-range-picker.blade.php      |  6 ++
 .../refunds/non-jingxi-refund-data.blade.php  | 60 ++++++++++++++++---
 .../Business/NonJingxiRefundPageTest.php      |  7 ++-
 3 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/resources/views/business/pages/partials/date-range-picker.blade.php b/resources/views/business/pages/partials/date-range-picker.blade.php
index 80fee3aa..094d3bc8 100644
--- a/resources/views/business/pages/partials/date-range-picker.blade.php
+++ b/resources/views/business/pages/partials/date-range-picker.blade.php
@@ -20,6 +20,12 @@
 --}}
 <style>
     .upstream-data-field--dates { flex: 1 1 20rem; }
+    .upstream-data-field__label {
+        color: var(--vip-content-muted, #595959);
+        font-size: 0.75rem;
+        font-weight: 500;
+        line-height: 1.333;
+    }
     .upstream-data-date-range { display: flex; align-items: center; gap: 0.5rem; }
     .upstream-data-date { position: relative; display: flex; flex: 1 1 8.5rem; min-width: 0; }
     .upstream-data-date input {
diff --git a/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php b/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php
index 1c08a26c..a4435196 100644
--- a/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php
+++ b/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php
@@ -79,6 +79,7 @@
     data-refund-page="{{ $refundWarningMode ? 'after-sales-warning' : 'non-jingxi' }}"
 >
     @include('business.pages.partials.upstream-data-styles')
+    @include('business.pages.partials.date-range-picker')
 
     <style>
         .refund-data-table--wide { min-width: 150rem; }
@@ -171,13 +172,49 @@
         action="{{ $refundPageUrl }}"
         data-filter-contract="non-jingxi-refund-data.filters"
     >
-        <div class="upstream-data-field">
-            <label for="non-jingxi-refund-from">退款开始日期</label>
-            <input id="non-jingxi-refund-from" type="date" name="from" min="2026-01-01" value="{{ $filters['from'] }}">
-        </div>
-        <div class="upstream-data-field">
-            <label for="non-jingxi-refund-to">退款结束日期</label>
-            <input id="non-jingxi-refund-to" type="date" name="to" min="2026-01-01" value="{{ $filters['to'] }}">
+        <div class="upstream-data-field upstream-data-field--dates">
+            <span class="upstream-data-field__label">退款日期</span>
+            <div class="upstream-data-date-range">
+                <span class="upstream-data-date" data-date-picker>
+                    <input
+                        id="non-jingxi-refund-from"
+                        type="text"
+                        name="from"
+                        value="{{ $filters['from'] }}"
+                        readonly
+                        autocomplete="off"
+                        aria-label="退款开始日期"
+                        data-date-input
+                    >
+                    <button type="button" class="upstream-data-date__clear" data-date-clear hidden aria-label="清除退款开始日期">
+                        <span class="material-icons-outlined" aria-hidden="true">close</span>
+                    </button>
+                    <button type="button" class="upstream-data-date__pick" data-date-toggle aria-label="选择退款开始日期">
+                        <span class="material-icons-outlined" aria-hidden="true">calendar_today</span>
+                    </button>
+                    <div class="upstream-data-calendar" role="dialog" aria-label="退款开始日期日历" data-date-calendar hidden></div>
+                </span>
+                <b class="upstream-data-date-range__sep">至</b>
+                <span class="upstream-data-date" data-date-picker>
+                    <input
+                        id="non-jingxi-refund-to"
+                        type="text"
+                        name="to"
+                        value="{{ $filters['to'] }}"
+                        readonly
+                        autocomplete="off"
+                        aria-label="退款结束日期"
+                        data-date-input
+                    >
+                    <button type="button" class="upstream-data-date__clear" data-date-clear hidden aria-label="清除退款结束日期">
+                        <span class="material-icons-outlined" aria-hidden="true">close</span>
+                    </button>
+                    <button type="button" class="upstream-data-date__pick" data-date-toggle aria-label="选择退款结束日期">
+                        <span class="material-icons-outlined" aria-hidden="true">calendar_today</span>
+                    </button>
+                    <div class="upstream-data-calendar" role="dialog" aria-label="退款结束日期日历" data-date-calendar hidden></div>
+                </span>
+            </div>
         </div>
         <div class="upstream-data-field">
             <label for="non-jingxi-refund-order">订单号</label>
@@ -218,6 +255,15 @@
         </div>
     </form>
 
+    <script>
+        (() => {
+            const form = document.querySelector('[data-refund-page] .upstream-data-toolbar');
+            if (form && window.CaiWuDatePicker) {
+                window.CaiWuDatePicker.setup(form);
+            }
+        })();
+    </script>
+
     <div class="upstream-data-table-panel">
         <div class="upstream-data-table-scroll">
             <table
diff --git a/tests/Feature/Business/NonJingxiRefundPageTest.php b/tests/Feature/Business/NonJingxiRefundPageTest.php
index 94052a57..887ca86d 100644
--- a/tests/Feature/Business/NonJingxiRefundPageTest.php
+++ b/tests/Feature/Business/NonJingxiRefundPageTest.php
@@ -112,6 +112,10 @@ class NonJingxiRefundPageTest extends FeatureTestCase
             ->assertSee('workspace/refunds/non-jingxi-refund-data/export', false)
             ->assertSee('data-finance-export-base=', false)
             ->assertSee('data-export-field="refundDate"', false)
+            ->assertSee('data-date-picker', false)
+            ->assertSee('data-date-calendar', false)
+            ->assertSee('data-date-toggle', false)
+            ->assertSee('CaiWuDatePicker.setup(form)', false)
             ->assertSee('value="2026-08-01"', false)
             ->assertSee('value="ORDER-1"', false)
             ->assertSee('name="waybill_no"', false)
@@ -238,7 +242,8 @@ class NonJingxiRefundPageTest extends FeatureTestCase
         $this->loginAs()->get(route('business.pages.show', [
             'section' => 'refunds', 'page' => 'non-jingxi-refund-data',
             'from' => '2025-01-01', 'to' => '2026-08-21', 'shop_name' => '测试店',
-        ]))->assertOk()->assertSee('min="2026-01-01"', false)
+        ]))->assertOk()
+            ->assertSee('data-date-picker', false)
             ->assertSee('value="2026-01-01"', false);
     }