1

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

@@ -164,44 +164,45 @@ class Purchase extends Controller
         $data=$this->_vali([
             'real_name.require'=>'联系人不能为空',
             'mobile.require'=>'联系方式不能为空',
-            'standard_tech.require'=>'生产技术标准必须',
-            'standard_check.require'=>'生产验收标准必须',
+//            'standard_tech.require'=>'生产技术标准必须',
+//            'standard_check.require'=>'生产验收标准必须',
             'post_time.require'=>'交货时间不能为空',
             'post_address.require'=>'交货单地址不能为空',
             'item.require'=>'商品参数不能为空',
             //'file.array'=>'图片视频有误',
         ]);
-        $data['file'] = json_decode($request['file'],true);
         $data['item'] = json_decode($request['item'],true);
-        foreach ($data['file']??[] as $image){
-            $validate->failException()->check($image,[
-                'type|图片类型'=>['require','in:image,video'],
-                'src|图片链接'=>['require','url'],
-            ]);
+        if(input('file')){
+            $data['file'] = json_decode($request['file'],true);
+            foreach ($data['file']??[] as $image){
+                $validate->failException()->check($image,[
+                    'type|图片类型'=>['require','in:image,video'],
+                    'src|图片链接'=>['require','url'],
+                ]);
+            }
         }
         foreach ($data['item'] as $item){
             $validate->failException()->check($item,[
                 'name|名称'=>['require'],
                 'spec|规格'=>['require'],
                 'number|数量'=>['require','integer'],
-              //  'enclosure|附件'=>['array',],
+                //  'enclosure|附件'=>['array',],
             ]);
-//            if(!empty($item['enclosure'])){
-//                foreach ($item['enclosure'] as $enclosure){
-//                    $validate->failException()->check($enclosure,[
-//                        'filename|文件名'=>['require'],
-//                        'fileurl|文件地址'=>['require','url',],
-//                    ]);
-//                }
-//            }
+            //            if(!empty($item['enclosure'])){
+            //                foreach ($item['enclosure'] as $enclosure){
+            //                    $validate->failException()->check($enclosure,[
+            //                        'filename|文件名'=>['require'],
+            //                        'fileurl|文件地址'=>['require','url',],
+            //                    ]);
+            //                }
+            //            }
         }
-
         $purchase_data = [
             'admin_id'=>$admin_id->id,
             'real_name'=>$data['real_name'],
             'mobile'=>$data['mobile'],
-            'standard_tech'=>$data['standard_tech'],
-            'standard_check'=>$data['standard_check'],
+//            'standard_tech'=>$data['standard_tech'],
+//            'standard_check'=>$data['standard_check'],
             'post_time'=>$data['post_time'],
             'post_address'=>$data['post_address'],
             'longitude'=>$admin_id->merchant->longitude,
@@ -209,6 +210,8 @@ class Purchase extends Controller
             'create_time'=>date('Y-m-d H:i:s'),
             'file'=>$data['file']??[],
         ];
+        input('standard_tech')?$purchase_data['standard_tech']=input('standard_tech'):'';
+        input('standard_check')?$purchase_data['standard_check']=input('standard_check'):'';
         Db::startTrans();
         try {
             if($request['id']) {
@@ -268,14 +271,15 @@ class Purchase extends Controller
             'item.array'=>'商品必须是数组',
         ]);
 
-        $data['file'] = json_decode($request['file'],true);
         $data['item'] = json_decode($request['item'],true);
-
-        foreach ($data['file']??[] as $image){
-            $validate->failException()->check($image,[
-                'type|图片类型'=>['require','in:image,video'],
-                'src|图片链接'=>['require','url'],
-            ]);
+        if(input('file')){
+            $data['file'] = json_decode($request['file'],true);
+            foreach ($data['file']??[] as $image){
+                $validate->failException()->check($image,[
+                    'type|图片类型'=>['require','in:image,video'],
+                    'src|图片链接'=>['require','url'],
+                ]);
+            }
         }
         foreach ($data['item'] as $item){
             $validate->failException()->check($item,[
@@ -345,21 +349,22 @@ class Purchase extends Controller
         $data=$this->_vali([
             'real_name.require'=>'联系人不能为空',
             'mobile.require'=>'联系方式不能为空',
-            'standard_tech.require'=>'生产技术标准',
-            'standard_check.require'=>'生产验收标准',
+//            'standard_tech.require'=>'生产技术标准',
+//            'standard_check.require'=>'生产验收标准',
             'post_time.require'=>'交货时间不能为空',
             'post_address.require'=>'交货单地址不能为空',
             'item.require'=>'商品参数不能为空',
           //  'file.array'=>'图片必须是数组',
         ]);
-        $data['file'] = json_decode($request['file'],true);
         $data['item'] = json_decode($request['item'],true);
-
-        foreach ($data['file']??[] as $image){
-            $validate->failException()->check($image,[
-                'type|图片类型'=>['require','in:image,video'],
-                'src|图片链接'=>['require','url'],
-            ]);
+        if(input('file')) {
+            $data['file'] = json_decode($request['file'],true);
+            foreach ($data['file'] ?? [] as $image) {
+                $validate->failException()->check($image, [
+                    'type|图片类型' => ['require', 'in:image,video'],
+                    'src|图片链接' => ['require', 'url'],
+                ]);
+            }
         }
         foreach ($data['item'] as $item){
             $validate->failException()->check($item,[
@@ -381,8 +386,8 @@ class Purchase extends Controller
             'admin_id'=>$admin_id->id,
             'real_name'=>$data['real_name'],
             'mobile'=>$data['mobile'],
-            'standard_tech'=>$data['standard_tech'],
-            'standard_check'=>$data['standard_check'],
+//            'standard_tech'=>$data['standard_tech'],
+//            'standard_check'=>$data['standard_check'],
             'post_time'=>$data['post_time'],
             'post_address'=>$data['post_address'],
             'longitude'=>$admin_id->merchant->longitude,
@@ -390,6 +395,8 @@ class Purchase extends Controller
             'file'=>$data['file']??[],
             'create_time'=>date('Y-m-d H:i:s')
         ];
+        input('standard_tech')?$purchase_data['standard_tech']=input('standard_tech'):'';
+        input('standard_check')?$purchase_data['standard_check']=input('standard_check'):'';
         Db::startTrans();
         try {
             if($request['id']){