From 473868fd09d5cf0fbe746a2a9d806e1238b0bb1b Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 14:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=20https://guangdagit.com/beike/beikeshop/issues/121?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Admin/Http/Controllers/RegionController.php | 2 +- beike/Admin/Repositories/RegionRepo.php | 5 +++++ beike/Models/Base.php | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/beike/Admin/Http/Controllers/RegionController.php b/beike/Admin/Http/Controllers/RegionController.php index f202da24..fab2a674 100644 --- a/beike/Admin/Http/Controllers/RegionController.php +++ b/beike/Admin/Http/Controllers/RegionController.php @@ -21,7 +21,7 @@ class RegionController public function index() { $data = [ - 'regions' => Region::query()->with('regionZones.zone')->get(), + 'regions' => RegionRepo::getList(), 'countries' => CountryRepo::all() ]; diff --git a/beike/Admin/Repositories/RegionRepo.php b/beike/Admin/Repositories/RegionRepo.php index 3a1bf390..16b3185f 100644 --- a/beike/Admin/Repositories/RegionRepo.php +++ b/beike/Admin/Repositories/RegionRepo.php @@ -15,6 +15,11 @@ use Beike\Models\Region; class RegionRepo { + public static function getList() + { + return Region::query()->with('regionZones.zone')->get(); + } + public static function createOrUpdate($data) { $id = $data['id'] ?? 0; diff --git a/beike/Models/Base.php b/beike/Models/Base.php index 615d5965..e843714b 100644 --- a/beike/Models/Base.php +++ b/beike/Models/Base.php @@ -11,9 +11,13 @@ namespace Beike\Models; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; class Base extends Model { - + protected function serializeDate(\DateTimeInterface $date): string + { + return Carbon::createFromFormat('Y-m-d H:i:s', $date)->format('Y-m-d H:i:s'); + } }