1

app/data/controller/api/auth/Purchase.php

@@ -355,29 +355,31 @@ class Purchase extends Auth
             'desc.require' => '报价说明必须填写',
             'desc.max:250' => '报价说明最多250',
         ], 'post');
-//        if($request['is_edit']){
-//            $data=$this->_vali([
-//                'id.require' => '参数有误',
-//                'amount.require' => '报价有误',
-//                'amount.float' => '报价有误',
-//                'images.array' => '图片有误',
-//                'images.max:9' => '图片最多9张',
-//                'date.require' => '货期必须',
-//                'desc.max:250' => '描述最多250',
-//            ], 'post');
-//        }else {
-//            $data = $this->_vali([
-//                'id.require' => '参数有误',
-//                'amount.float' => '报价有误',
-//                'date.require' => '货期必须',
-//                //'date.integer' => '货期有误',
-//                'desc.max:250' => '描述最多250',
-//                'is_have.in:1,0' => '是否有货有误',
-////                'images.array' => '图片有误',
-////                'images.max:9' => '图片最多9张',
-//                'images.require' => '参数有误',
-//            ], 'post');
-//        }
+        if($request['is_edit']){
+            $data=$this->_vali([
+                'id.require' => '参数有误',
+                'amount.require' => '报价必须填写',
+                'amount.float' => '报价有误',
+//            'images.array' => '图片有误',
+                'images.max:9' => '图片最多9张',
+//            'images.require' => '参数有误',
+//            'date.require' => '货期必须',
+                'desc.require' => '报价说明必须填写',
+                'desc.max:250' => '报价说明最多250',
+            ], 'post');
+        }else {
+            $data = $this->_vali([
+                'id.require' => '参数有误',
+                // 'amount.require' => '报价有误',
+                'amount.float' => '报价有误',
+//            'images.array' => '图片有误',
+                'images.max:9' => '图片最多9张',
+//            'images.require' => '参数有误',
+//            'date.require' => '货期必须',
+                'desc.require' => '报价说明必须填写',
+                'desc.max:250' => '报价说明最多250',
+            ], 'post');
+        }
         $model=ShopPurchaseItem::findOrFail($data['id']);
         $user=$this->getUser();
         if($model['offer_id']){

app/data/controller/api/auth/ShipEngineMaintenance.php

@@ -7,6 +7,7 @@ use app\data\model\DataUserAcceptance;
 use app\data\model\DataUserRepair;
 use app\data\model\DataUserRepairOffer;
 use think\admin\Storage;
+use think\db\Where;
 use think\exception\HttpResponseException;
 use think\admin\Controller;
 use hg\apidoc\annotation\Title;
@@ -156,11 +157,17 @@ class ShipEngineMaintenance extends Auth
     public function repairoffer(){
         $user = $this->getUser();
         if (!$user['is_maintenance']) $this->error('不是维修工，无法报价');
+
         $data = $this->_vali([
             'id.require'=>'id必须',
             'price.default'=>'0'
 //            'imgs.require'=>'图片及资质证明必须'
         ]);
+        if(input('imgs')){
+            $array['imgs'] = input('imgs');
+        }else{
+            DataUserRepairOffer::mk()->where(['repair_id'=>$data['id'],'offer_id'=>$this->uuid])->find()?$this->error('图片及资质证明必须'):'';
+        }
         DataUserRepair::mk()
             ->where('is_del',1)
             ->whereIn('status','1,2')
@@ -172,7 +179,6 @@ class ShipEngineMaintenance extends Auth
             'price'=>$data['price']
 //            'imgs'=>$data['imgs'],
         ];
-        input('imgs')?$array['imgs'] = input('imgs'):'';
         if (DataUserRepairOffer::mk()->insert($array) && DataUserRepair::mk()->where('id',$data['id'])->update(['status'=>2,'update_at'=>date('Y-m-d H:i:s')])){
             $this->success('成功');
         }