From c9bcbc780c000b8abdaf902ee2c86eeae1e28f08 Mon Sep 17 00:00:00 2001 From: zhoushengchen <3057083327@qq.com> Date: Tue, 13 Oct 2026 10:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=8A=A0=E8=B4=B9=E7=BB=93=E7=AE=97?= =?UTF-8?q?=EF=BC=9A=E5=88=86=E9=A1=B5=E6=94=B9=E4=B8=BA=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8F=96=E4=BB=B6=E7=AE=A1=E7=90=86=E5=90=8C=E6=AC=BE=E7=B4=A7?= =?UTF-8?q?=E5=87=91=E6=A0=B7=E5=BC=8F=EF=BC=88=E9=A1=B5=E6=95=B0=E6=91=98?= =?UTF-8?q?=E8=A6=81+=E4=B8=8A=E4=B8=8B=E9=A1=B5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courier-surcharge-settlement.blade.php | 20 +++++++++++++++++-- .../CourierSurchargeSettlementPageTest.php | 7 +++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php b/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php index ece05030..12667448 100644 --- a/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php +++ b/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php @@ -170,6 +170,12 @@ .settlement-table tbody tr.is-active td[data-finance-fixed="true"], .settlement-table tbody tr.is-active td[data-finance-fixed="end"] { background: var(--settlement-soft); border-bottom-color: #e4d7ba; } .settlement-table tbody tr.is-active td:first-child { box-shadow: inset 3px 0 0 var(--settlement-accent); } + .settlement-footer { display: flex; align-items: center; justify-content: space-between; gap: .6rem; padding: .35rem .15rem 0; color: var(--settlement-muted); font-size: .72rem; } + .settlement-pagination { display: flex; align-items: center; gap: .35rem; } + .settlement-page-link { display: inline-flex; align-items: center; justify-content: center; min-width: 1.7rem; height: 1.6rem; border: 1px solid var(--settlement-border); border-radius: .4rem; background: #fff; color: var(--settlement-ink); text-decoration: none; } + .settlement-page-link:hover { border-color: var(--settlement-accent); background: var(--settlement-soft); } + .settlement-page-link.is-disabled { opacity: .4; pointer-events: none; } + .settlement-page-link .material-icons-outlined { font-size: 1rem; } @media (max-width: 900px) { .settlement-summary { grid-template-columns: 1fr 1fr; } @@ -266,8 +272,18 @@ - @if (method_exists($rows, 'links') && $rows->hasPages()) -
{{ $rows->withQueryString()->links() }}
+ @if (method_exists($rows, 'hasPages') && $rows->hasPages()) + @endif diff --git a/tests/Feature/Business/CourierSurchargeSettlementPageTest.php b/tests/Feature/Business/CourierSurchargeSettlementPageTest.php index db6b6f00..770f222c 100644 --- a/tests/Feature/Business/CourierSurchargeSettlementPageTest.php +++ b/tests/Feature/Business/CourierSurchargeSettlementPageTest.php @@ -138,9 +138,9 @@ class CourierSurchargeSettlementPageTest extends FeatureTestCase 'settlement_amount' => 8, 'surcharge_type' => '超长费', ]], - 'total' => 1, + 'total' => 30, 'has_more' => false, - 'summary' => ['count' => 1, 'settlement_amount' => 8.0], + 'summary' => ['count' => 30, 'settlement_amount' => 8.0], 'sync' => ['code' => 'fresh', 'last_succeeded_at' => '2026-10-13 06:31:34'], 'state' => ['code' => 'fresh', 'last_succeeded_at' => '2026-10-13 06:31:34'], ]); @@ -153,6 +153,9 @@ class CourierSurchargeSettlementPageTest extends FeatureTestCase ->assertSee('data-settlement-row', false) ->assertSee('is-clickable', false) ->assertSee('is-active', false) + ->assertSee('settlement-page-link', false) + ->assertDontSee('page-item', false) + ->assertSeeText('第 1 / 2 页,本页 1 条,共 30 条') ->assertSeeText('点击行可高亮标记') ->assertSeeText('曹县德邦') ->assertSeeText('超长费');