From caa7c1ccf068e4ab6ae4ec7925fc0aafbd521783 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 10 Sep 2020 10:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=94=A8=E7=BA=BF=E4=B8=8A=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B7=BB=E5=8A=A0=E5=A4=B1=E8=B4=A5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/GoodsActivityController.php | 4 ++--
 app/Admin/Controllers/v3/GoodsController.php         | 2 +-
 app/Admin/Controllers/v3/GoodsNewController.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index 45bbf6c..af66991 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -8,7 +8,7 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
 use App\Models\v3\Market as MarketModel;
-use App\Models\v3\Store as StoreModel;
+use App\Models\v3\StoreNew as StoreModel;
 use App\Models\v3\Category as CategoryModel;
 use App\Models\v3\GoodsActivity as GoodsActivityModel;
 use Dcat\Admin\Form\NestedForm;
@@ -136,7 +136,7 @@ class GoodsActivityController extends AdminController
 
             $form->column(6, function (Form $form) use($storeList,$categoryList ){
                 $form->text('goods_id')->default(0)->help('输入正常商品id，用于关联商品。');
-                // $form->select('market_id')->required()->options($marketList);
+                $form->hidden('market_id')->default(0);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
                 $form->select('goods_category_id');
                 $form->select('store_id')->required()->options($storeList);
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index 4f67bf1..acecc4d 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -159,7 +159,7 @@ class GoodsController extends AdminController
             // $marketList = MarketModel::getMarketArray();
 
             $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
-                // $form->select('market_id')->required()->options($marketList);
+                $form->hidden('market_id')->default(0);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
                 $form->select('goods_category_id')->required();
                 $form->select('store_id')->required()->options($storeList);
diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php
index 6404c91..043c22d 100644
--- a/app/Admin/Controllers/v3/GoodsNewController.php
+++ b/app/Admin/Controllers/v3/GoodsNewController.php
@@ -165,7 +165,7 @@ class GoodsNewController extends AdminController
             // $marketList = MarketModel::getMarketArray();
 
             $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
-                // $form->select('market_id')->required()->options($marketList);
+                //  $form->hidden('market_id')->default(0);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
                 $form->select('goods_category_id');
                 $form->select('store_id')->required()->options($storeList);