From 2867606c8ca714f5c42af9321aa07efd054bd61c Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Mon, 24 Aug 2026 14:16:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=E5=94=AE=E5=90=8E=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/business_navigation.php | 2 +- .../business/pages/refunds/non-jingxi-refund-data.blade.php | 2 +- tests/Feature/Business/PagesTest.php | 5 +++-- tests/Feature/Settings/NavigationTest.php | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/business_navigation.php b/config/business_navigation.php index c5a0c502..8175ebcd 100644 --- a/config/business_navigation.php +++ b/config/business_navigation.php @@ -170,7 +170,7 @@ return [ 'icon' => 'assignment_return', 'pages' => [ ['slug' => 'jingxi-refund-data', 'title' => '京喜退款数据'], - ['slug' => 'non-jingxi-refund-data', 'title' => '非京喜退款数据'], + ['slug' => 'non-jingxi-refund-data', 'title' => '售后（退货退款）'], ], ], [ 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 342f64e3..c667668b 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 @@ -50,7 +50,7 @@
- +
@foreach ($columns as $column) diff --git a/tests/Feature/Business/PagesTest.php b/tests/Feature/Business/PagesTest.php index 1af7213e..b2613b1d 100644 --- a/tests/Feature/Business/PagesTest.php +++ b/tests/Feature/Business/PagesTest.php @@ -175,8 +175,9 @@ class PagesTest extends FeatureTestCase $response ->assertOk() - ->assertSeeText('非京喜退款数据') - ->assertSee('aria-label="非京喜退款数据"', false) + ->assertSeeText('售后（退货退款）') + ->assertSee('aria-label="售后（退货退款）"', false) + ->assertDontSeeText('非京喜退款数据') ->assertSeeText('暂无数据') ->assertSee('class="upstream-data-table refund-data-table refund-data-table--wide"', false) ->assertSee('data-header-row="labels"', false) diff --git a/tests/Feature/Settings/NavigationTest.php b/tests/Feature/Settings/NavigationTest.php index 70351b5c..c93e396a 100644 --- a/tests/Feature/Settings/NavigationTest.php +++ b/tests/Feature/Settings/NavigationTest.php @@ -86,7 +86,7 @@ class NavigationTest extends FeatureTestCase array_column($refund['pages'], 'slug') ); $this->assertSame( - ['京喜退款数据', '非京喜退款数据'], + ['京喜退款数据', '售后（退货退款）'], array_column($refund['pages'], 'title') ); } -- 2.47.2 From 52d7101e649534a959a2c376e9ad4f7991b3e8c5 Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Mon, 24 Aug 2026 14:27:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=8F=AF=E8=A7=81=E6=96=87=E6=9C=AC=E6=96=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Feature/Business/PagesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/Business/PagesTest.php b/tests/Feature/Business/PagesTest.php index 7a74b1f6..48a2ec70 100644 --- a/tests/Feature/Business/PagesTest.php +++ b/tests/Feature/Business/PagesTest.php @@ -188,7 +188,7 @@ class PagesTest extends FeatureTestCase ->assertSeeText('售后（退货退款）') ->assertSee('aria-label="售后（退货退款）"', false) ->assertSee('aria-label="售后（退货退款）分页"', false) - ->assertDontSee('非京喜退款数据') + ->assertDontSeeText('非京喜退款数据') ->assertSeeText('共享业务镜像尚未建立') ->assertSeeText('数据暂时无法读取') ->assertSee('class="upstream-data-table refund-data-table refund-data-table--wide"', false) -- 2.47.2 From d1c2bea692dde786ee829005044449ac71efcc8c Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Mon, 24 Aug 2026 14:34:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=B9=B6=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/pages/refunds/non-jingxi-refund-data.blade.php | 3 ++- tests/Feature/Business/PagesTest.php | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) 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 64c7b294..106e268d 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 @@ -45,6 +45,7 @@ default => '业务镜像尚未建立', }; $lastSucceededAt = $refundSyncStatus['last_succeeded_at'] ?? null; + $displayRefundError = str_replace('非京喜退款数据', '售后（退货退款）', (string) $refundError); @endphp
@@ -87,7 +88,7 @@ @if ($refundError) @elseif ($refundIndexPending)
diff --git a/tests/Feature/Business/PagesTest.php b/tests/Feature/Business/PagesTest.php index 48a2ec70..e4f22824 100644 --- a/tests/Feature/Business/PagesTest.php +++ b/tests/Feature/Business/PagesTest.php @@ -236,11 +236,7 @@ class PagesTest extends FeatureTestCase 'company_id' => $this->company->id, 'section' => 'refunds', 'page' => 'unknown-refund-page', - ]))->assertRedirect(route('business.pages.show', [ - 'company_id' => $this->company->id, - 'section' => 'refunds', - 'page' => 'non-jingxi-refund-data', - ])); + ]))->assertNotFound(); } public function testPaperMaterialPagesRenderAsSeparateTables() -- 2.47.2