diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index 5716c23..51f9efa 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\ImsCjdcMarket; +use App\Models\LanzuArea; use App\Models\LanzuMmInfo; use App\Models\v3\Market; use Dcat\Admin\Admin; @@ -83,7 +84,7 @@ class ImsCjdcMarketController extends AdminController */ protected function detail($id) { - return Show::make($id, new ImsCjdcMarket(), function (Show $show) { + return Show::make($id, new Market(), function (Show $show) { if (!\Admin::user()->isAdministrator() && $show->model()->mp_id == 0) { $show->panel() @@ -103,23 +104,8 @@ class ImsCjdcMarketController extends AdminController $show->addtime('创建时间'); $show->sort; $show->status()->using([0=>'禁用',1=>'正常']); - $show->coordinates; $show->remark; $show->address; - $show->poundage; - $show->dn_poundage; - $show->dm_poundage; - $show->yd_poundage; - $show->loudspeaker_imei; - $show->dishes_menu_intro; - $show->create_time->as(function ($time){ - if ($time){ - return date('Y-m-d H:i',$time); - }else{ - return '-'; - } - - }); $show->created_at->as(function ($time){ if ($time){ return date('Y-m-d H:i',$time); @@ -151,6 +137,11 @@ class ImsCjdcMarketController extends AdminController $form->text('name')->required(); $form->select('mp_id', '服务商')->options('/api/getMpInfo')->required(); $form->mobile('tel','电话')->required(); + $form->select('province_id','省') + ->options('/api/area')->required() + ->load('city_id','/api/area'); + $form->select('city_id','市')->required()->load('region_id','/api/area'); + $form->select('region_id','区')->required(); $form->text('address')->required(); if ($form->isEditing()){ $form->text('coordinates') @@ -164,6 +155,7 @@ class ImsCjdcMarketController extends AdminController ->placeholder('输入 经纬度,如: 108.281552,22.83731') ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度"); } + $form->number('sort', '排序'); $form->switch('status', '状态'); $form->image('logo')->required(); @@ -178,7 +170,7 @@ class ImsCjdcMarketController extends AdminController $form->lat = $coordinates[1]; $form->deleteInput('coordinates'); }); - + $form->deleting(function (Form $form){ //删除市场前,校验该市场下是否存在市场经理 $mids = array_column($form->model()->toArray(), 'id'); @@ -206,4 +198,6 @@ class ImsCjdcMarketController extends AdminController } return response()->json($ret); } + + } diff --git a/app/Admin/Controllers/LanzuArea.php b/app/Admin/Controllers/LanzuArea.php new file mode 100644 index 0000000..a3a350c --- /dev/null +++ b/app/Admin/Controllers/LanzuArea.php @@ -0,0 +1,18 @@ +get('q')??0; + return Area::getArea($pid); + } +} diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 569279d..f313bca 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -61,7 +61,7 @@ Route::group([ // 平台管理 $router->resource('/banners', 'v3\BannersController'); $router->resource('/system_config', 'v3\SystemConfigController'); - + $router->resource('/order', 'ImsCjdcOrderMainController'); $router->resource('/order', 'ImsCjdcOrderMainController'); $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail'); @@ -72,5 +72,9 @@ Route::group([ // 服务站专员 $router->resource('/service_personnel', 'v3\ServicePersonnelController'); + + //地区 + $router->any('/api/area', 'LanzuArea@getArea'); + }); diff --git a/app/Models/LanzuArea.php b/app/Models/LanzuArea.php new file mode 100644 index 0000000..d3fea12 --- /dev/null +++ b/app/Models/LanzuArea.php @@ -0,0 +1,19 @@ +select('id','name as text')->get()->toArray(); + return $data; + } +}