up - 字段限制、搜索

app/adminapi/lists/master_worker/MasterWorkerLists.php

@@ -45,7 +45,7 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
     {
         // 派单搜索条件 - 工程师接单状态
         return [
-            '=' => ['mw.sn', 'mw.real_name', 'mw.account', 'mw.password', 'mw.mobile', 'mw.sex', 'mw.channel', 'mw.is_disable', 'mw.is_new_user', 'mw.create_time', 'mw.update_time', 'mw.accept_order_status'],
+            '=' => ['mw.sn', 'mw.real_name', 'mw.account', 'mw.password', 'mw.mobile', 'mw.sex', 'mw.channel', 'mw.is_disable', 'mw.is_new_user', 'mw.create_time', 'mw.update_time', 'mw.accept_order_status', 'mw.cooperation', 'mw.time_period'],
 
         ];
     }

app/workerapi/controller/LoginController.php

@@ -46,7 +46,8 @@ class LoginController extends BaseApiController
     {
         $params = (new RegisterValidate())->post()->goCheck('register');
         $res = LoginLogic::confirmMobile($params);
-        if(!$res){
+        $resCredential = LoginLogic::confirmCredential($params);
+        if(!$res || !$resCredential){
             return $this->fail(LoginLogic::getError());
         }
         $result = LoginLogic::register($params);

app/workerapi/logic/LoginLogic.php

@@ -48,7 +48,18 @@ class LoginLogic extends BaseLogic
             return false;
         }
     }
-
+    public static function confirmCredential(array $params)
+    {
+        try {
+            if(isset($params['is_credential']) && $params['is_credential'] == 1){
+                empty($params['credential_images']) && throw new \Exception('缺少证书');
+            }
+            return true;
+        } catch (\Exception $e) {
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
     public static function register(array $params)
     {
         try {

app/workerapi/validate/RegisterValidate.php

@@ -22,6 +22,10 @@ class RegisterValidate extends BaseValidate
         'age' => 'require|number|between:18,55',
         'mobile' => 'require|mobile',
         'code' => 'require',
+        'city' => 'require',
+        'maintain_exp_type' => 'require',
+        'lon' => 'require',
+        'lat' => 'require',
     ];
 
     protected $message = [
@@ -33,5 +37,9 @@ class RegisterValidate extends BaseValidate
         'age.between' => '年龄只能在18-55之间',
         'mobile.mobile' => '请输入正确手机号',
         'code.require' => '请输入验证码',
+        'city.require' => '请输入城市',
+        'maintain_exp_type.require' => '请输入维修经验',
+        'lon.require' => '请输入经度',
+        'lat.require' => '请输入维度',
     ];
 }