diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php
index 5de9282..a804442 100644
--- a/app/Admin/Controllers/v3/GoodsNewController.php
+++ b/app/Admin/Controllers/v3/GoodsNewController.php
@@ -25,10 +25,14 @@ class GoodsNewController extends AdminController
     protected function grid()
     {
         return Grid::make(new  GoodsNew(), function (Grid $grid) {
+           
+            // 二级分类
+            $categoryList = CategoryModel::getArray([['parent_id','>',0]],[0=>'选择分类']);
+
             $grid->id->sortable();
             $grid->cover_img_url->image('',50);
-            $grid->name;
-            $grid->price;
+            $grid->name->editable();
+            $grid->price->editable();
             $grid->column('market_id')->display(function($marketId){
                 $item = MarketModel::getMarketInfo($marketId,'name');
                 return empty($item) ? '' : $item->name;
@@ -37,15 +41,15 @@ class GoodsNewController extends AdminController
                 $store = StoreModel::getStoreInfo($storeId,'name');
                 return empty($store) ? '' : $store->name;
             });
-            $grid->category_id->display(function ($categoryId){
-                $item = CategoryModel::getInfo($categoryId,'title');
-                return empty($item) ? '' : $item->title;
-            });
+            $grid->category_id->select($categoryList);
+            // ->display(function ($categoryId){
+            //     $item = CategoryModel::getInfo($categoryId,'title');
+            //     return empty($item) ? '选择分类' : $item->title;
+            // });
             $grid->goods_category_id->display(function ($goodsCategoryId){
                 $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
                 return empty($item) ? '' : $item->title;
             });
-            
 
             $grid->sort->sortable();
             $grid->on_sale->switch();
@@ -55,7 +59,7 @@ class GoodsNewController extends AdminController
                 $filter->like('name');
             });
 
-            $grid->model()->orderBy('id', 'desc');
+            $grid->model()->orderBy('category_id', 'asc');
             // 每页10条
             $grid->paginate(10);
         });
@@ -160,7 +164,7 @@ class GoodsNewController extends AdminController
             $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
                 // $form->select('market_id')->required()->options($marketList);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
-                $form->select('goods_category_id')->required();
+                $form->select('goods_category_id');
                 $form->select('store_id')->required()->options($storeList);
                 $form->text('name')->required()->maxLength(20);
                 $form->image('cover_img')->required();
@@ -212,13 +216,13 @@ class GoodsNewController extends AdminController
                 $form->disableEditingCheck();
                 $form->disableCreatingCheck();
             });
-            $form->saved(function (Form $form){
-                $storeId = $form->input('store_id');
+            // $form->saved(function (Form $form){
+                // $storeId = $form->input('store_id');
                
                 // 商品所属市场，根据店铺查询市场
-                $info = StoreModel::getStoreInfo($storeId,'market_id');
-                $form->market_id = $info->market_id;
-            });
+                // $info = StoreModel::getStoreInfo($storeId,'market_id');
+                // $form->market_id = $info->market_id;
+            // });
         });
     }