From eabfd69e9f3c6c95f5d0541d3ce191598e63c5cb Mon Sep 17 00:00:00 2001 From: TL Date: Wed, 31 Aug 2022 17:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Admin/Http/Resources/RmaReasonDetail.php | 1 + beike/Shop/Http/Controllers/Account/RmaController.php | 2 +- beike/Shop/Http/Resources/Account/RmaReasonDetail.php | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/beike/Admin/Http/Resources/RmaReasonDetail.php b/beike/Admin/Http/Resources/RmaReasonDetail.php index 5ac34939..19027255 100644 --- a/beike/Admin/Http/Resources/RmaReasonDetail.php +++ b/beike/Admin/Http/Resources/RmaReasonDetail.php @@ -21,6 +21,7 @@ class RmaReasonDetail extends JsonResource return [ 'id' => $this->id, 'name' => json_decode($this->name, true)[locale()] ?? '', + 'names' => json_decode($this->name, true) ]; } } diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php index 1905b997..687f40fa 100644 --- a/beike/Shop/Http/Controllers/Account/RmaController.php +++ b/beike/Shop/Http/Controllers/Account/RmaController.php @@ -12,7 +12,7 @@ namespace Beike\Shop\Http\Controllers\Account; use App\Http\Controllers\Controller; -use Beike\Admin\Http\Resources\RmaReasonDetail; +use Beike\Shop\Http\Resources\RmaReasonDetail; use Beike\Repositories\RmaReasonRepo; use Beike\Repositories\RmaRepo; use Beike\Shop\Http\Requests\RmaRequest; diff --git a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php index 5ac34939..18e38387 100644 --- a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php +++ b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php @@ -9,9 +9,8 @@ * @modified 2022-08-31 11:56:28 */ -namespace Beike\Admin\Http\Resources; +namespace Beike\Shop\Http\Resources; -use Beike\Repositories\RmaRepo; use Illuminate\Http\Resources\Json\JsonResource; class RmaReasonDetail extends JsonResource