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'); + } }