diff --git a/beike/Admin/Http/Resources/RmaDetail.php b/beike/Admin/Http/Resources/RmaDetail.php index b66f11b5..8c72b77a 100644 --- a/beike/Admin/Http/Resources/RmaDetail.php +++ b/beike/Admin/Http/Resources/RmaDetail.php @@ -35,7 +35,6 @@ class RmaDetail extends JsonResource 'product_name' => $this->product_name, 'name' => $this->name, 'sku' => $this->sku, - 'model' => $this->model, 'reason' => $this->reason->name ?? '', 'type_text' => $this->type_text, ]; diff --git a/beike/Repositories/RmaRepo.php b/beike/Repositories/RmaRepo.php index f800acfb..d88f7b33 100644 --- a/beike/Repositories/RmaRepo.php +++ b/beike/Repositories/RmaRepo.php @@ -141,22 +141,22 @@ class RmaRepo public static function getStatuses(): array { return [ - 'pending' => '待处理', - 'rejected' => '已拒绝', - 'approved' => '已批准(待顾客寄回商品)', - 'shipped' => '已发货(寄回商品)', - 'completed' => '已完成' + 'pending' => trans('rma.status_pending'), + 'rejected' => trans('rma.status_rejected'), + 'approved' => trans('rma.status_approved'), + 'shipped' => trans('rma.status_shipped'), + 'completed' => trans('rma.status_completed') ]; } public static function getTypes(): array { return [ - 'return' => '退货', - 'exchange' => '换货', - 'repair' => '维修', - 'reissue' => '补发商品', - 'refund' => '仅退款' + 'return' => trans('rma.type_return'), + 'exchange' => trans('rma.type_exchange'), + 'repair' => trans('rma.type_repair'), + 'reissue' => trans('rma.type_reissue'), + 'refund' => trans('rma.type_refund') ]; } } diff --git a/resources/beike/admin/views/pages/rmas/index.blade.php b/resources/beike/admin/views/pages/rmas/index.blade.php index 4f698769..e3293f11 100644 --- a/resources/beike/admin/views/pages/rmas/index.blade.php +++ b/resources/beike/admin/views/pages/rmas/index.blade.php @@ -13,7 +13,7 @@