diff --git a/beike/Admin/Http/Controllers/RegionController.php b/beike/Admin/Http/Controllers/RegionController.php index bd5c0647..43098f46 100644 --- a/beike/Admin/Http/Controllers/RegionController.php +++ b/beike/Admin/Http/Controllers/RegionController.php @@ -13,13 +13,18 @@ namespace Beike\Admin\Http\Controllers; use Beike\Models\Region; use Illuminate\Http\Request; +use Beike\Repositories\CountryRepo; class RegionController { public function index() { - $regions = Region::query()->with('zones')->get(); - return view('admin::pages.regions.index', ['regions' => $regions]); + $data = [ + 'regions' => Region::query()->with('zones')->get(), + 'countries' => CountryRepo::all() + ]; + + return view('admin::pages.regions.index', $data); } public function store(Request $request) diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php index cb526b22..c609a91e 100644 --- a/resources/beike/admin/views/pages/customers/form.blade.php +++ b/resources/beike/admin/views/pages/customers/form.blade.php @@ -288,14 +288,8 @@ }, countryChange(e) { - const self = this; - - $.ajax({ - url: `/admin/countries/${e}/zones`, - type: 'get', - success: function(res) { - self.source.zones = res.data.zones; - } + $http.get(`countries/${e}/zones`).then((res) => { + this.source.zones = res.data.zones; }) } } diff --git a/resources/beike/admin/views/pages/regions/index.blade.php b/resources/beike/admin/views/pages/regions/index.blade.php index 4d423356..04f16164 100644 --- a/resources/beike/admin/views/pages/regions/index.blade.php +++ b/resources/beike/admin/views/pages/regions/index.blade.php @@ -1,8 +1,209 @@ @extends('admin::layouts.master') + @section('title', '区域组') @section('content') - @foreach($regions as $region) - @dump($region->name) - @endforeach +
+
+
+ +
+ + + + + + + + + + + + + + + +
#名称操作
@{{ tax.id }}@{{ tax.name }} + + +
+ + {{-- {{ $regions->links('admin::vendor/pagination/bootstrap-4') }} --}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
国家省份
+ + + + + + + + + + + +
+ 添加区域 +
+ + 保存 + 取消 + +
+
+
@endsection + +@push('footer') + +@endpush diff --git a/resources/beike/admin/views/pages/tax_classes/index.blade.php b/resources/beike/admin/views/pages/tax_classes/index.blade.php index 8792b014..b8fceaf9 100644 --- a/resources/beike/admin/views/pages/tax_classes/index.blade.php +++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php @@ -13,7 +13,7 @@ # 名称 - 操作 + 操作