Merge branch 'hotfix-phoenix' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into hotfix-phoenix

app/Admin/Controllers/ImsCjdcMarketController.php

@@ -135,7 +135,7 @@ class ImsCjdcMarketController extends AdminController
         return Form::make(new Market(), function (Form $form) {
             $form->display('id');
             $form->text('name')->required();
-            $form->select('mp_id', '服务商')->options('/api/getMpInfo')->required();
+            $form->select('mp_id', '服务商')->options('/api/getMpInfo');
             $form->mobile('tel','电话')->required();
             $form->select('province_id','省')
                 ->options('/api/area')->required()
@@ -149,6 +149,9 @@ class ImsCjdcMarketController extends AdminController
                     ->required()
                     ->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> 获取经纬度");
+                if (!($form->mp_id)){
+                    $form->mp_id = '0';
+                }
             }else{
                 $form->text('coordinates')
                     ->required()