From 2450bfde729afd8623e0849a6e7aac437d6b1dd1 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 30 Oct 2020 17:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81--=E6=B7=BB=E5=8A=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E7=9B=AE=E5=BF=AB=E6=8D=B7=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index 4c288a2..3c62395 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -34,18 +34,14 @@ class GoodsActivityController extends AdminController
         $marketId = Auth::getMarket();
         $build = new \App\Models\v3\GoodsActivity();
         if ($marketId){
-            //$build = new \App\Models\v3\Goods();
             $build =  $build::where('market_id',$marketId);
             $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
         }else{
-            //$build = new GoodsActivity();
             $storeList = StoreModel::getStoreArray([['market_id','=',$marketId]]);
         }
         return Grid::make($build, function (Grid $grid) use($storeList){
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]);
-            // 店铺
-            // $storeList = StoreModel::getStoreArray();
             // 商品类目
             $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]);
             //市场
@@ -71,10 +67,10 @@ class GoodsActivityController extends AdminController
                 $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->goods_category_id->display(function ($goodsCategoryId){
+                $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
+                return empty($item) ? '' : $item->title;
+            });
             $grid->column('expire_time_text');
             $grid->column('sales');
             $grid->column('on_sale')->switch();
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index d14d9ce..349505c 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -41,8 +41,6 @@ class GoodsController extends AdminController
         return Grid::make($build, function (Grid $grid) use($storeList){
             // 二级分类
             $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]);
-            // 店铺
-            // $storeList = StoreModel::getStoreArray();
             // 商品类目
             $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]);
 
@@ -55,7 +53,7 @@ class GoodsController extends AdminController
                 $id = $this->id;
                 $banners = GoodsBannersModel::getArray([['goods_id','=',$id],['type','=',1]]);
                 return $banners;
-                })->image('', 50);
+                })->image('', 50)->width('5%');
             $grid->name->editable();
             $grid->price->editable();
             $grid->original_price->editable();
@@ -81,12 +79,13 @@ class GoodsController extends AdminController
             // $grid->category_id->display(function ($categoryId) use($categoryList){
             //     return isset($categoryList[$categoryId]) ? $categoryList[$categoryId] : '';
             // });
+            $grid->goods_category_id->select($goodsCategoryList);
             // $grid->goods_category_id->display(function ($goodsCategoryId) use($goodsCategoryList){
             //     return isset($goodsCategoryList[$goodsCategoryId]) ? $goodsCategoryList[$goodsCategoryId] : '';
             // });
             
             // 简介
-            $grid->content->width(200);
+            $grid->content->width(150);
 
             $grid->on_sale->switch();