1

app/adminapi/validate/agricultural_machinery/UserServiceValidate.php

@@ -39,10 +39,13 @@ class UserServiceValidate extends BaseValidate
         'mobile' => 'require|mobile',
         'cate_id'=>'require|checkCateCode',
         'area_id'  => 'require|checkArea',
-        'images'=>'require',
         'money' => 'require|float|egt:0',
         'agricultural_service'=>'requireIf:agricultural_service,true',
-        'disclaimer'=>'require'
+        'disclaimer'=>'require',
+        'driver_image'=>'require',
+        'driving_image'=>'require',
+        'agricultural_image'=>'require',
+        'mechanical_cate_id'=>'require',
 
     ];
 
@@ -59,12 +62,15 @@ class UserServiceValidate extends BaseValidate
         'mobile.require' => '联系方式参数缺失',
         'mobile.mobile' => '请填写正确的手机号',
         'cate_id.require'  => '分类信息必传',
-        'images.require'                          => '请输入上传服务图片',
         'area_id.require'  => '地区信息必传',
         'money.require' =>'服务费用必传',
         'money.float' =>'服务费参数错误',
         'money.egt' =>'服务费参数规则错误',
         'disclaimer.require' =>'免责条款必传',
+        'driver_image.require'                  => '请上传驾驶证图片',
+        'driving_image.require'                 => '请上传行驶证图片',
+        'agricultural_image.require'            => '请上传农机图片',
+        'mechanical_cate_id.require'            => '机械分类必传',
     ];
     public function sceneEditContent(){
         return $this->only(['agricultural_service']);
@@ -98,8 +104,9 @@ class UserServiceValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->remove(['id'])
-            ->remove('id', 'require|checkUserServiceInfo');
+        return $this->remove(['id','disclaimer'])
+            ->remove('id', 'require|checkUserServiceInfo')
+            ->remove('disclaimer', 'require');
     }
 
     /**

app/api/controller/ServiceController.php

@@ -30,7 +30,7 @@ use app\api\lists\service\ServiceLists;
 class ServiceController extends BaseApiController
 {
 
-    public array $notNeedLogin = ['getServiceList','getAreaList','getCateList','getServiceInfo','autoUpdateStatus','getServiceContent','getServiceDisclaimer','addScanLog'];
+    public array $notNeedLogin = ['getServiceList','getAreaList','getCateList','getServiceInfo','autoUpdateStatus','getServiceContent','getServiceDisclaimer','addScanLog','getMechanicalCateList'];
 
 
     /**
@@ -193,4 +193,11 @@ class ServiceController extends BaseApiController
             return $this->fail('请求方式错误');
         }
     }
+
+    public function getMechanicalCateList(){
+
+        $params = $this->request->get();
+        $result = ServiceLogic::getsMechanicalCateLists($params);
+        return $this->data($result);
+    }
 }

app/api/logic/ServiceLogic.php

@@ -14,21 +14,15 @@
 
 namespace app\api\logic;
 
-use app\common\cache\WebScanLoginCache;
 use app\common\logic\BaseLogic;
-use app\api\service\{UserTokenService, WechatUserService};
-use app\common\enum\{LoginEnum, PayEnum, user\UserTerminalEnum, YesNoEnum};
+use app\common\enum\{LoginEnum, PayEnum};
 use app\common\service\{
     ConfigService,
-    FileService,
-    wechat\WeChatConfigService,
-    wechat\WeChatMnpService,
-    wechat\WeChatOaService,
-    wechat\WeChatRequestService
 };
 use app\common\model\agricultural_machinery\UserService;
 use app\common\model\agricultural_machinery\ServiceCategory;
 use app\common\model\agricultural_machinery\ServiceScanLog;
+use app\common\model\agricultural_machinery\MechanicalCate;
 use app\common\model\ServiceCharge;
 use app\common\model\asset\AssetArea;
 use app\common\model\recharge\RechargeOrder;
@@ -83,6 +77,7 @@ class ServiceLogic extends BaseLogic
                 'agricultural_image' => $params['agricultural_image']??'',
                 'cate_id' => ','.$params['cate_id'].',',
                 'area_id' => ','.$params['area_id'].',',
+                'mechanical_cate_id' => ','.$params['mechanical_cate_id'].',',
                 'money' => $params['money'],
                 'content'=>$params['content']??'',
                 'order_id'=>0,
@@ -229,6 +224,16 @@ class ServiceLogic extends BaseLogic
         return $cate_list;
     }
 
+    public static function getsMechanicalCateLists($get){
+        $where=[];
+
+        if(isset($get['name'])){
+            $where[]=['name','like','%'.$get['name'].'%'];
+        }
+        $cate_list = MechanicalCate::where($where)->field('id,name')->order('sort desc,id asc')->select()->toArray();
+
+        return $cate_list;
+    }
     /**
      * @notes 续费订单
      * @param array $params

app/api/validate/ServiceValidate.php

@@ -46,6 +46,7 @@ class ServiceValidate extends BaseValidate
         'driving_image'=>'require',
         'agricultural_image'=>'require',
         'area_id'  => 'require|checkArea',
+        'mechanical_cate_id'=>'require',
         'images'=>'require',
         'money' => 'require|float|egt:0',
         'log_type'=> 'require|in:0,1,2,3',
@@ -65,6 +66,7 @@ class ServiceValidate extends BaseValidate
         'images.require'                        => '请上传服务图片',
         'agricultural_machinery_model.require'  => '农机型号必传',
         'area_id.require'                       => '地区信息必传',
+        'mechanical_cate_id.require'            => '机械分类必传',
         'money.require'                         =>'服务费用必传',
         'money.float'                           =>'服务费参数错误',
         'money.egt'                             =>'服务费参数规则错误',
@@ -74,11 +76,11 @@ class ServiceValidate extends BaseValidate
         'log_type.in'                               =>'类型log_type参数规则错误',
     ];
     protected $scene = [
-        'agricultural_machinery_operator' => ['name','mobile','type','cate_id','area_id','agricultural_machinery_model','driver_image','driving_image','agricultural_image'], //
+        'agricultural_machinery_operator' => ['name','mobile','type','cate_id','area_id','mechanical_cate_id','agricultural_machinery_model','driver_image','driving_image','agricultural_image'], //
         'info' => ['type'], //
         'cate'=>['type'],
         'serviceRenew'=>['type'],
-        'log'=>['log_type']
+        'log'=>['log_type'],
     ];
 
     /**