diff --git a/beike/Admin/Http/Controllers/CountryController.php b/beike/Admin/Http/Controllers/CountryController.php index 3c2b783c..d2398934 100644 --- a/beike/Admin/Http/Controllers/CountryController.php +++ b/beike/Admin/Http/Controllers/CountryController.php @@ -33,7 +33,7 @@ class CountryController extends Controller public function store(Request $request) { - $country = CountryRepo::create($request->only('name', 'code', 'sort_order', 'status')); + $country = CountryRepo::create($request->only('name', 'icon', 'code', 'sort_order', 'status')); hook_action('admin.country.store.after', $country); @@ -42,7 +42,7 @@ class CountryController extends Controller public function update(Request $request, int $id) { - $country = CountryRepo::update($id, $request->only('name', 'code', 'sort_order', 'status')); + $country = CountryRepo::update($id, $request->only('name', 'icon', 'code', 'sort_order', 'status')); hook_action('admin.country.store.after', $country); diff --git a/beike/Models/Country.php b/beike/Models/Country.php index 58385d79..557c124f 100644 --- a/beike/Models/Country.php +++ b/beike/Models/Country.php @@ -18,7 +18,7 @@ class Country extends Base { use HasFactory; - protected $fillable = ['name', 'country_id', 'code', 'sort_order', 'status']; + protected $fillable = ['name','icon', 'country_id', 'code', 'sort_order', 'status']; public function zones(): HasMany { diff --git a/beike/Repositories/CountryRepo.php b/beike/Repositories/CountryRepo.php index abbe02da..c9a75a91 100644 --- a/beike/Repositories/CountryRepo.php +++ b/beike/Repositories/CountryRepo.php @@ -26,6 +26,7 @@ class CountryRepo { return [ 'name' => $data['name'] ?? '', + 'icon' => $data['icon'] ?? '', 'code' => $data['code'] ?? '', 'sort_order' => (int) $data['sort_order'] ?? 0, 'status' => (bool) $data['status'] ?? 0, diff --git a/resources/beike/admin/views/pages/country/index.blade.php b/resources/beike/admin/views/pages/country/index.blade.php index c11c5a14..7e025d1f 100644 --- a/resources/beike/admin/views/pages/country/index.blade.php +++ b/resources/beike/admin/views/pages/country/index.blade.php @@ -14,6 +14,7 @@ ID {{ __('common.name') }} + {{ __('currency.icon') }} {{ __('currency.code') }} {{ __('common.created_at') }} {{ __('common.updated_at') }} @@ -26,6 +27,11 @@ @{{ country.id }} @{{ country.name }} + +
+ +
+ @{{ country.code }} @{{ country.created_at }} @{{ country.updated_at }} @@ -48,26 +54,23 @@ :total="country.total"> - - + - + + + - - - {{ __('common.save') }} {{ __('common.cancel') }} @@ -79,15 +82,12 @@ @push('footer') @include('admin::shared.vue-image') -