From 39f7b4265378cef0e59797d12389ec0138758c28 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 28 Sep 2021 09:52:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/AgentProductController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php
index 1d7b059..3179394 100644
--- a/app/AdminAgent/Controllers/AgentProductController.php
+++ b/app/AdminAgent/Controllers/AgentProductController.php
@@ -51,7 +51,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', '频道')

From ef7450631a79faff63d3c2fc826b4cbfe59c5872 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 28 Sep 2021 09:53:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84use?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/AgentProductController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php
index 3179394..8a18e3a 100644
--- a/app/AdminAgent/Controllers/AgentProductController.php
+++ b/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
 {

From 578287bb6f6e31028843d13db34a83310e91abc2 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 28 Sep 2021 10:23:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?info=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/OrderController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php
index 8dc3a80..7a5481d 100644
--- a/app/Http/Controllers/Api/OrderController.php
+++ b/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) {