From c167c0322807866374ded146f34643a23e5c4bac Mon Sep 17 00:00:00 2001
From: qiuxiang <394405259@qq.com>
Date: Sat, 24 Oct 2026 10:35:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A0=87=E7=AD=BE=E5=88=97=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Business/Pages.php   | 2 +-
 config/business_navigation.php            | 2 +-
 tests/Feature/Settings/NavigationTest.php | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php
index 2ef11902..5ce3b4a2 100644
--- a/app/Http/Controllers/Business/Pages.php
+++ b/app/Http/Controllers/Business/Pages.php
@@ -2112,12 +2112,12 @@ class Pages extends Controller
             'default_compensation_amount' => ['default_compensation_amount', '违约赔付（冲减收入）', 'money'],
             'refund_amount' => ['refund_amount', '退款金额', 'money'],
             'planting_amount' => ['planting_amount', '种菜金额', 'money'],
-            'planting_label' => ['planting_label', '标签', 'text'],
             'product_amount' => ['product_amount', '商品金额', 'money'],
             'paid_amount' => ['paid_amount', '订单实付金额', 'money'],
             'difference' => ['difference', '差额', 'money'],
             'match_status' => ['match_status', '匹配状态', 'text'],
             'remark' => ['remark', '差额异常备注', 'text'],
+            'planting_label' => ['planting_label', '标签', 'text'],
         ];
 
         [, $month] = $this->receiptOrderMatchMonths();
diff --git a/config/business_navigation.php b/config/business_navigation.php
index 505396e6..15719d68 100644
--- a/config/business_navigation.php
+++ b/config/business_navigation.php
@@ -835,13 +835,13 @@ $navigation = [
                         ['name' => 'default_compensation_amount', 'label' => '违约赔付（冲减收入）', 'kind' => 'number'],
                         ['name' => 'refund_amount', 'label' => '退款金额', 'kind' => 'number'],
                         ['name' => 'planting_amount', 'label' => '种菜金额', 'kind' => 'number'],
-                        ['name' => 'planting_label', 'label' => '标签'],
                         ['name' => 'product_amount', 'label' => '商品金额', 'kind' => 'number'],
                         ['name' => 'paid_amount', 'label' => '订单实付/实收金额', 'kind' => 'number'],
                         ['name' => 'difference', 'label' => '差额', 'kind' => 'number'],
                         ['name' => 'remark', 'label' => '差额异常备注'],
                         ['name' => 'match_status', 'label' => '匹配状态'],
                         ['name' => 'unmatched_reason', 'label' => '匹配原因'],
+                        ['name' => 'planting_label', 'label' => '标签'],
                     ],
                 ],
             ],
diff --git a/tests/Feature/Settings/NavigationTest.php b/tests/Feature/Settings/NavigationTest.php
index 57fbd4f9..6ef709b1 100644
--- a/tests/Feature/Settings/NavigationTest.php
+++ b/tests/Feature/Settings/NavigationTest.php
@@ -105,6 +105,10 @@ class NavigationTest extends FeatureTestCase
             ->assertSee('data-column-key="difference"', false)
             ->assertSee('data-column-key="match_status"', false)
             ->assertSee('data-column-key="remark"', false)
+            ->assertSeeInOrder([
+                'data-column-key="unmatched_reason"',
+                'data-column-key="planting_label"',
+            ], false)
             ->assertSeeText('标签：种菜明细表命中为“种菜报销”，其余聚水潭种菜标签命中为“种菜未报销”')
             // 子订单号已按业务要求移除。
             ->assertDontSeeText('子订单号')
-- 
2.47.2