From 05722f96f118bf5c1fc0380be609f3825fca035c Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 9 Oct 2020 09:55:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8--?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=8E=9F=E4=BB=B7?=
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 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index e7db06f..bc7e37a 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -51,6 +51,7 @@ class GoodsActivityController extends AdminController
             $grid->column('cover_img')->image('',50);
             $grid->column('name')->editable();
             $grid->column('price')->editable();
+            $grid->column('original_price')->editable();
             $grid->column('goods_unit')->editable();
             $grid->column('type_text');
             $grid->column('inventory')->editable();
@@ -71,7 +72,6 @@ class GoodsActivityController extends AdminController
             //     return empty($item) ? '' : $item->title;
             // });
             $grid->column('expire_time_text');
-            $grid->column('sort');
             $grid->column('on_sale')->switch();
             $grid->model()->orderby('id','desc');
         
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index 7f87119..e26ac37 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -56,6 +56,7 @@ class GoodsController extends AdminController
                 })->image('', 50);
             $grid->name->editable();
             $grid->price->editable();
+            $grid->original_price->editable();
             $grid->column('goods_unit','单位')->editable();
             $grid->column('spec','规格')->display(function($spec){
                 $item = '';
@@ -85,7 +86,6 @@ class GoodsController extends AdminController
             // 简介
             $grid->content->width(200);
 
-            $grid->sort->sortable();
             $grid->on_sale->switch();
 
             $grid->actions([new GoodsCopy(),new GoodsImage(),new GoodsSpec()]);

From 7a1b8603b55fc6802f96e626618f3dbc89ebdbcf Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 9 Oct 2020 10:00:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=A7=84=E6=A0=BC=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index bc7e37a..7fd9363 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -137,8 +137,10 @@ class GoodsActivityController extends AdminController
                
                 $show->width(6)->field('spec')->as(function ($value){
                     $text = '';
-                    foreach ($value as $v){
-                        $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                    if(!empty($value) && is_array($value)){
+                        foreach ($value as $v){
+                            $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                        }
                     }
                     return $text;
                 });
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index e26ac37..316a161 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -261,7 +261,7 @@ class GoodsController extends AdminController
                     })
                     ->saving(function ($v) {
                         return $v == 1 ? 1 : 0;
-                    });
+                    })->default(1);
 
                 $form->disableResetButton();
                 $form->disableViewCheck();