diff --git a/beike/Admin/Http/Controllers/CountryController.php b/beike/Admin/Http/Controllers/CountryController.php index 4aea9d6c..c032e310 100644 --- a/beike/Admin/Http/Controllers/CountryController.php +++ b/beike/Admin/Http/Controllers/CountryController.php @@ -24,6 +24,10 @@ class CountryController extends Controller 'country' => $countries, ]; + if ($request->expectsJson()) { + return json_success(trans('common.success'), $data); + } + return view('admin::pages.country.index', $data); } diff --git a/beike/Admin/Http/Controllers/ZoneController.php b/beike/Admin/Http/Controllers/ZoneController.php index 582b8543..136d4354 100644 --- a/beike/Admin/Http/Controllers/ZoneController.php +++ b/beike/Admin/Http/Controllers/ZoneController.php @@ -26,6 +26,10 @@ class ZoneController extends Controller 'countries' => CountryRepo::all() ]; + if ($request->expectsJson()) { + return json_success(trans('common.success'), $data); + } + return view('admin::pages.zones.index', $data); } diff --git a/resources/beike/admin/views/pages/country/index.blade.php b/resources/beike/admin/views/pages/country/index.blade.php index b4462ceb..4aa17798 100644 --- a/resources/beike/admin/views/pages/country/index.blade.php +++ b/resources/beike/admin/views/pages/country/index.blade.php @@ -111,9 +111,9 @@ methods: { loadData() { - // $http.get(`brands?page=${this.page}`).then((res) => { - // this.brands = res.data.brands; - // }) + $http.get(`countries?page=${this.page}`).then((res) => { + this.country = res.data.country; + }) }, checkedCreate(type, index) { @@ -148,7 +148,8 @@ $http[type](url, this.dialog.form).then((res) => { this.$message.success(res.message); if (this.dialog.type == 'add') { - this.country.data.push(res.data) + // this.country.data.push(res.data) + this.loadData(); } else { this.country.data[this.dialog.index] = res.data } @@ -167,7 +168,8 @@ }).then(() => { $http.delete('countries/' + id).then((res) => { this.$message.success(res.message); - self.country.data.splice(index, 1) + this.loadData(); + // self.country.data.splice(index, 1) }) }).catch(()=>{}) }, diff --git a/resources/beike/admin/views/pages/zones/index.blade.php b/resources/beike/admin/views/pages/zones/index.blade.php new file mode 100644 index 00000000..d2e24b0a --- /dev/null +++ b/resources/beike/admin/views/pages/zones/index.blade.php @@ -0,0 +1,200 @@ +@extends('admin::layouts.master') + +@section('title', '省份管理') + +@section('content') +
| ID | +名称 | +编码 | +创建时间 | +修改时间 | +排序 | +状态 | +操作 | +
|---|---|---|---|---|---|---|---|
| @{{ zone.id }} | +@{{ zone.name }} | +@{{ zone.code }} | +@{{ zone.created_at }} | +@{{ zone.updated_at }} | +@{{ zone.sort_order }} | ++ {{ __('common.enable') }} + {{ __('common.disable') }} + | ++ + + | +