Merge branch 'goods_add'

app/Admin/Controllers/v3/GoodsController.php

@@ -42,6 +42,7 @@ class GoodsController extends AdminController
             $storeList = StoreModel::getStoreArray();
             // 商品类目
             $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]);
+
             //市场
             $marketList = MarketModel::getMarketArray();
 
@@ -72,9 +73,12 @@ class GoodsController extends AdminController
             // $grid->category_id->display(function ($categoryId) use($categoryList){
             //     return isset($categoryList[$categoryId]) ? $categoryList[$categoryId] : '';
             // });
-            $grid->goods_category_id->display(function ($goodsCategoryId) use($goodsCategoryList){
-                return isset($goodsCategoryList[$goodsCategoryId]) ? $goodsCategoryList[$goodsCategoryId] : '';
-            });
+            // $grid->goods_category_id->display(function ($goodsCategoryId) use($goodsCategoryList){
+            //     return isset($goodsCategoryList[$goodsCategoryId]) ? $goodsCategoryList[$goodsCategoryId] : '';
+            // });
+            
+            // 简介
+            $grid->content->width(200);
 
             $grid->sort->sortable();
             $grid->on_sale->switch();