From c28b5927469af4cb92e239f09d54b4df8e836791 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Sat, 10 Oct 2020 16:22:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/GoodsActivityController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index 2886353..3157db0 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -189,7 +189,9 @@ class GoodsActivityController extends AdminController
                     $form->image('cover_img')->autoUpload()->required();
                 }
                 $form->select('type')->options(GoodsActivityModel::$_TYPE)->default('flash_sale');
-                $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->rules('after:now',['after'=>'活动结束时间必须大于当前时间！'])->help($form->model()->expire_time_text);
+                $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->rules('after:now',['after'=>'活动结束时间必须大于当前时间！'])->customFormat(function ($v) {
+                    return date('Y-m-d H:i:s',$v);
+                });
             });
             $form->column(6, function (Form $form) {
                 $form->currency('price')->required()->floatTwo()->symbol('￥');

From cbe5a3bf9a01e93cd27a5e484b926a767a65f6e8 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Sat, 10 Oct 2020 16:57:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E6=97=B6=EF=BC=8C=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index 3157db0..04725bf 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -60,7 +60,7 @@ class GoodsActivityController extends AdminController
                 $item = MarketModel::getMarketInfo($marketId,'name');
                 return empty($item) ? '' : $item->name;
             });
-            $grid->column('store_id')->display(function($storeId){
+            $grid->column('store_id')->width('10%')->display(function($storeId){
                 $item = StoreModel::getStoreInfo($storeId,'name');
                 return empty($item) ? '' : $item->name;
             });
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index 316a161..6abda62 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -72,7 +72,7 @@ class GoodsController extends AdminController
             $grid->column('market_id')->display(function($marketId) use($marketList){
                 return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
             });
-            $grid->store_id->display(function ($storeId) use($storeList){
+            $grid->store_id->width('10%')->display(function ($storeId) use($storeList){
                 return isset($storeList[$storeId]) ? $storeList[$storeId] : '';
             });
             $grid->category_id->select($categoryList);
diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php
index 78649a0..e957a64 100644
--- a/app/Admin/Controllers/v3/StoreController.php
+++ b/app/Admin/Controllers/v3/StoreController.php
@@ -43,7 +43,7 @@ class StoreController extends AdminController
 
             $grid->id->sortable();
             $grid->logo_url->image('',50);
-            $grid->name;
+            $grid->name->width('15%');
 
             $grid->market_id->display(function ($marketId) use($marketList){
                 return isset($marketList[$marketId]) ? $marketList[$marketId] : '';