diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php
index 02ee788..686a869 100644
--- a/app/Admin/Controllers/ImsCjdcMarketController.php
+++ b/app/Admin/Controllers/ImsCjdcMarketController.php
@@ -7,6 +7,7 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
+use App\Models\LanzuMpInfo;
 
 class ImsCjdcMarketController extends AdminController
 {
@@ -21,6 +22,11 @@ class ImsCjdcMarketController extends AdminController
             $grid->id->sortable();
             $grid->logo->image('',50,50);
             $grid->name;
+            $grid->column('mp_id','服务商')->display(function ($mid){
+                if($mid == 0) return '懒族自营';
+                $mp = LanzuMpInfo::find($mid);
+                return $mp->name;
+            });
             $grid->column('status','状态')->display(function ($status){
                 if ($status==0){
                     return '禁用';
@@ -49,10 +55,10 @@ class ImsCjdcMarketController extends AdminController
         return Show::make($id, new ImsCjdcMarket(), function (Show $show) {
             $show->id;
             $show->name;
-            $show->logo;
+            $show->logo->image();
             $show->introduce;
-            $show->imgs;
-            $show->addtime;
+            $show->imgs->image();
+            $show->addtime('创建时间');
             $show->sort;
             $show->status;
             $show->coordinates;
@@ -82,27 +88,39 @@ class ImsCjdcMarketController extends AdminController
         return Form::make(new ImsCjdcMarket(), function (Form $form) {
             $form->display('id');
             $form->text('name');
-            $form->text('logo');
-            $form->text('introduce');
-            $form->text('imgs');
-            $form->text('addtime');
-            $form->text('sort');
-            $form->text('status');
-            $form->text('coordinates');
-            $form->text('remark');
+            $form->select('mq_id','服务商')->options('/api/getMpInfo');
             $form->text('address');
+            $form->text('coordinates');
             $form->text('poundage');
             $form->text('dn_poundage');
             $form->text('dm_poundage');
             $form->text('yd_poundage');
-            $form->text('dada_number');
-            $form->text('is_open_dada');
-            $form->text('loudspeaker_imei');
-            $form->text('dishes_menu_intro');
-            $form->text('create_time');
-
-            $form->display('created_at');
-            $form->display('updated_at');
+            $form->text('loudspeaker_imei')->value(0);
+            $form->number('sort','排序');
+            $form->number('status','状态');
+            $form->image('logo');
+            $form->multipleImage('imgs','市场图片');
+            $form->textarea('introduce');
+            $form->textarea('remark');
+            $form->textarea('dishes_menu_intro')->value('菜谱简介');
         });
     }
+
+    /**
+     * 服务商信息
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getMpInfo()
+    {
+
+        $mps = LanzuMpInfo::all();
+        $ret = [];
+        foreach ($mps as $key => $value){
+            $item = [];
+            $item['id'] = $value->id;
+            $item['text'] = $value->name;
+            $ret[] = $item;
+        }
+        return response()->json($ret);
+    }
 }
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 8f4256d..f2377e3 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -18,4 +18,7 @@ Route::group([
     $router->resource('/mm', 'LanzuMmInfoController');
     $router->resource('/market', 'ImsCjdcMarketController');
 
+    $router->any('/api/getMpInfo', 'ImsCjdcMarketController@getMpInfo');
+
+
 });
diff --git a/app/Models/ImsCjdcMarket.php b/app/Models/ImsCjdcMarket.php
index b87dbc6..b8a2b6a 100644
--- a/app/Models/ImsCjdcMarket.php
+++ b/app/Models/ImsCjdcMarket.php
@@ -12,5 +12,20 @@ class ImsCjdcMarket extends Model
     use SoftDeletes;
 
     protected $table = 'ims_cjdc_market';
-    
+    protected $dateFormat = 'U';
+    public function setImgsAttribute($imgs)
+    {
+        if ($imgs){
+            $this->attributes['imgs'] = implode(',',$imgs);
+        }
+    }
+
+    public function getImgsAttribute($imgs)
+    {
+        return explode(',',$imgs);
+    }
+
+    public function mp(){
+        return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id');
+    }
 }