From 08202166088ad6f1137276ea23e8bfccbdbac9c2 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Mon, 14 Sep 2020 18:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B7=BB=E5=8A=A0=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=9C=81=20=E5=B8=82=20=E5=8C=BA=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ImsCjdcMarketController.php   | 28 ++++++++-----------
 app/Admin/Controllers/LanzuArea.php           | 18 ++++++++++++
 app/Admin/routes.php                          |  6 +++-
 app/Models/LanzuArea.php                      | 19 +++++++++++++
 4 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 app/Admin/Controllers/LanzuArea.php
 create mode 100644 app/Models/LanzuArea.php

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("通过网址 <a href='https://lbs.amap.com/console/show/picker' target='_blank'>https://lbs.amap.com/console/show/picker</a> 获取经纬度");
             }
+
             $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 @@
+<?php
+
+
+namespace App\Admin\Controllers;
+
+
+use Dcat\Admin\Controllers\AdminController;
+use \App\Models\LanzuArea as Area;
+use Illuminate\Http\Request;
+
+class LanzuArea extends AdminController
+{
+    public function getArea(Request $request)
+    {
+        $pid = $request->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 @@
+<?php
+
+
+namespace App\Models;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuArea extends Model
+{
+    protected $table = 'lanzu_area';
+    protected $dateFormat = 'U';
+
+    public static function getArea($pid=0)
+    {
+        $data = self::where('pid',$pid)->select('id','name as text')->get()->toArray();
+        return $data;
+    }
+}