Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop

* 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat:
  优化服务商系统表单输入填项, 增加对登陆帐号的状态校验

app/Admin/Controllers/AuthController.php

@@ -2,8 +2,21 @@
 
 namespace App\Admin\Controllers;
 
+use App\Models\AdminUsers;
 use Dcat\Admin\Controllers\AuthController as BaseAuthController;
+use Illuminate\Http\Request;
 
 class AuthController extends BaseAuthController
 {
+    public function postLogin(Request $request)
+    {
+        $username = $request->post('username');
+        //校验该帐号状态是否正常
+        $adu = new AdminUsers();
+        $adu = $adu->where(['username'=>$username])->first();
+        if ($adu&&$adu->status==0){
+           return $this->error('该帐号已被冻结,请联系管理员');
+        }
+        return parent::postLogin($request);
+    }
 }

app/Admin/Controllers/ImsCjdcMarketController.php

@@ -112,10 +112,14 @@ class ImsCjdcMarketController extends AdminController
     {
         return Form::make(new ImsCjdcMarket(), function (Form $form) {
             $form->display('id');
-            $form->text('name');
-            $form->select('mp_id','服务商')->options('/api/getMpInfo');
-            $form->text('address');
-            $form->text('coordinates');
+            $form->text('name')->required();
+            $form->select('mp_id','服务商')->options('/api/getMpInfo')->required();
+            $form->text('address')->required();
+            $form->text('coordinates')
+                ->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> 获取经纬度");
+
             $form->text('poundage');
             $form->text('dn_poundage');
             $form->text('dm_poundage');

app/Admin/Controllers/LanzuMmInfoController.php

@@ -107,7 +107,7 @@ class LanzuMmInfoController extends AdminController
             $form->image('id_frond')->uniqueName();
             $form->image('id_back')->uniqueName();
             $form->text('id_number');
-            $form->radio('status','状态')->options(['禁用','启用']);
+            $form->radio('status','状态')->options(['禁用','启用'])->default(1);
             $form->saved(function (Form $form,$result){
                 $adu = new AdminUsers();
                 if ($form->isCreating()){

config/admin.php

@@ -316,6 +316,7 @@ return [
         // indigo, blue, blue-light, blue-dark, green
         'color' => 'indigo',
 
+        //'body_class' => 'dark-mode',
         'body_class' => '',
 
         'sidebar_collapsed' => false,