diff --git a/beike/Admin/Http/Resources/OrderSimple.php b/beike/Admin/Http/Resources/OrderSimple.php
index f83d4fae..e442d4ef 100644
--- a/beike/Admin/Http/Resources/OrderSimple.php
+++ b/beike/Admin/Http/Resources/OrderSimple.php
@@ -25,7 +25,8 @@ class OrderSimple extends JsonResource
'telephone' => $this->telephone,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
- 'status' => trans("admin/order.{$this->status}"),
+ 'status' => $this->status,
+ 'status_format' => $this->status_format,
];
return $data;
diff --git a/beike/Models/Order.php b/beike/Models/Order.php
index 075c4dc2..f0ecefc2 100644
--- a/beike/Models/Order.php
+++ b/beike/Models/Order.php
@@ -25,7 +25,7 @@ class Order extends Base
'payment_address_1', 'payment_address_2',
];
- protected $appends = ['total_format'];
+ protected $appends = ['status_format', 'total_format'];
public function orderProducts(): HasMany
{
@@ -42,6 +42,11 @@ class Order extends Base
return $this->hasMany(OrderHistory::class);
}
+ public function getStatusFormatAttribute()
+ {
+ return trans('order.' . $this->status);
+ }
+
public function getTotalFormatAttribute()
{
return currency_format($this->total);
diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 0a10adfc..4e8eb5e4 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -85,7 +85,7 @@
- {{ __('admin/order.' . $order->status) }}
+ {{ $order->status_format }}
diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php
index 5f120a76..c8b3c5de 100644
--- a/resources/beike/admin/views/pages/orders/index.blade.php
+++ b/resources/beike/admin/views/pages/orders/index.blade.php
@@ -61,7 +61,7 @@
| {{ $order->number }} |
{{ $order->customer_name }} |
{{ $order->payment_method_name }} |
- {{ $order->status }} |
+ {{ $order->status_format }} |
{{ $order->total_format }} |
{{ $order->created_at }} |
{{ $order->updated_at }} |
diff --git a/resources/lang/en/admin/order.php b/resources/lang/en/admin/order.php
index b27582f6..92cfbc82 100644
--- a/resources/lang/en/admin/order.php
+++ b/resources/lang/en/admin/order.php
@@ -19,9 +19,4 @@ return [
'orders_update' => 'Update',
'orders_delete' => 'Delete',
'orders_update_status' => 'Update Status',
-
- 'unpaid' => 'Unpaid',
- 'paid' => 'Paid',
- 'shipped' => 'Shipped',
- 'completed' => 'Completed',
];
diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php
index 6c43783b..fa97a42f 100644
--- a/resources/lang/en/order.php
+++ b/resources/lang/en/order.php
@@ -20,4 +20,9 @@ return [
'updated_at' => 'Updated',
'status' => 'Status',
'total' => 'Total',
+
+ 'unpaid' => 'Unpaid',
+ 'paid' => 'Paid',
+ 'shipped' => 'Shipped',
+ 'completed' => 'Completed',
];
diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php
index b2e9fab7..87abb200 100644
--- a/resources/lang/zh_cn/admin/order.php
+++ b/resources/lang/zh_cn/admin/order.php
@@ -19,9 +19,4 @@ return [
'orders_update' => '更新订单',
'orders_delete' => '删除订单',
'orders_update_status' => '更新状态',
-
- 'unpaid' => '待支付',
- 'paid' => '已支付',
- 'shipped' => '已发货',
- 'completed' => '已完成',
];
diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/order.php
index 5e88da8b..d8b4ef60 100644
--- a/resources/lang/zh_cn/order.php
+++ b/resources/lang/zh_cn/order.php
@@ -20,4 +20,9 @@ return [
'updated_at' => '更新时间',
'status' => '状态',
'total' => '订单总额',
+
+ 'unpaid' => '待支付',
+ 'paid' => '已支付',
+ 'shipped' => '已发货',
+ 'completed' => '已完成',
];
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 09b19557..5b36b898 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -76,7 +76,7 @@
{{ __('shop/account.order_time') }}:{{ $order->created_at }}
- {{ __('shop/account.state') }}:{{ $order->status }}
+ {{ __('shop/account.state') }}:{{ $order->status_format }}
|
{{ __('shop/account.amount') }}:{{ $order->total_format }}
@@ -90,28 +90,6 @@
@endforeach
- {{-- @foreach ($latest_orders as $order)
-
-
-
- @foreach ($order->orderProducts as $product)
- 
- @endforeach
-
-
-
- 订单号:{{ $order->number }}
- 状态:{{ $order->status }}
- 金额:{{ $order->total }}
-
- 下单时间:{{ $order->created_at }}
-
-
-
- 查看详情
-
- @endforeach --}}
@endif
|