From 6bb3c843ddbc088b6dd8a61b16c652c98ddef296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Sun, 15 Mar 2026 01:43:50 +0000 Subject: [PATCH] PlatformOrder views: use model orderTypeLabel mapping --- app/Http/Controllers/Admin/PlatformOrderController.php | 9 ++++++--- resources/views/admin/platform_orders/index.blade.php | 2 +- resources/views/admin/platform_orders/show.blade.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index 7adb810..6c876a9 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -78,7 +78,8 @@ class PlatformOrderController extends Controller 'plans' => $plans, 'siteSubscription' => $siteSubscription, 'billingCycleLabels' => $this->billingCycleLabels(), - 'orderTypeLabels' => $this->orderTypeLabels(), + // order_type label 映射已下沉到 PlatformOrder::orderTypeLabel();这里不再透传 orderTypeLabels + // 'orderTypeLabels' => $this->orderTypeLabels(), 'defaults' => $defaults, ]); } @@ -335,7 +336,8 @@ class PlatformOrderController extends Controller ->values(), 'statusLabels' => $this->statusLabels(), 'paymentStatusLabels' => $this->paymentStatusLabels(), - 'orderTypeLabels' => $this->orderTypeLabels(), + // order_type label 映射已下沉到 PlatformOrder::orderTypeLabel();这里不再透传 orderTypeLabels + // 'orderTypeLabels' => $this->orderTypeLabels(), 'summaryStats' => [ 'total_orders' => (clone $baseQuery)->count(), 'paid_orders' => (clone $baseQuery)->where('payment_status', 'paid')->count(), @@ -462,7 +464,8 @@ class PlatformOrderController extends Controller 'order' => $order, 'statusLabels' => $this->statusLabels(), 'paymentStatusLabels' => $this->paymentStatusLabels(), - 'orderTypeLabels' => $this->orderTypeLabels(), + // order_type label 映射已下沉到 PlatformOrder::orderTypeLabel();这里不再透传 orderTypeLabels + // 'orderTypeLabels' => $this->orderTypeLabels(), ]); } diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index dd172f9..0e52abd 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -1126,7 +1126,7 @@ @endif - {{ $orderTypeLabels[$order->order_type] ?? $order->order_type }} + {{ $order->orderTypeLabel() }}
{{ $order->order_type }}
diff --git a/resources/views/admin/platform_orders/show.blade.php b/resources/views/admin/platform_orders/show.blade.php index e130f0e..bb2d30d 100644 --- a/resources/views/admin/platform_orders/show.blade.php +++ b/resources/views/admin/platform_orders/show.blade.php @@ -94,7 +94,7 @@ 订单类型 - {{ $orderTypeLabels[$order->order_type] ?? $order->order_type }} ({{ $order->order_type }}) + {{ $order->orderTypeLabel() }} ({{ $order->order_type }}) 订单状态{{ $statusLabels[$order->status] ?? $order->status }} ({{ $order->status }}) 支付状态{{ $paymentStatusLabels[$order->payment_status] ?? $order->payment_status }} ({{ $order->payment_status }})