Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

app/AdminAgent/Controllers/AgentProductController.php

@@ -3,7 +3,6 @@
 namespace App\AdminAgent\Controllers;
 
 use App\AdminAgent\Forms\LoadSupplierSpec;
-use App\AdminAgent\Renderable\SelectAgentCloudProduct;
 use App\AdminAgent\Renderable\SelectGuide;
 use App\AdminAgent\Renderable\SelectProduct;
 use App\AdminAgent\Repositories\AgentProduct;
@@ -20,7 +19,6 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
-use Dcat\Admin\Widgets\Modal;
 
 class AgentProductController extends AdminController
 {
@@ -51,7 +49,7 @@ class AgentProductController extends AdminController
             $grid->column('price');
             $grid->column('original_price');
             $grid->column('sale');
-            $grid->column('stock')->editable();
+            $grid->column('stock');
 
 			$channels = Channel::where('agent_id', $agent_id)->pluck('name', 'id')->toArray();
 			$grid->column('channel_id', '频道')

app/Http/Controllers/Api/OrderController.php

@@ -154,7 +154,7 @@ class OrderController extends Controller
 			return $this->error('产品已下架或库存不足');
 		}
 
-		$order_info = $formData['info'];
+		$order_info = $formData['info'] ?? [];
 
 		//0:单品销售；1:组合销售
 		if ($ap->type == 0) {