fix: 售后退货退款日期改为点击选择
Co-authored-by: 苏木 <594326199@qq.com> Co-committed-by: 苏木 <594326199@qq.com>
This commit is contained in:
parent
58eb62b7be
commit
a06cddd60f
@ -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 {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user