Merge branch 'goods_price_1009'

app/Admin/Controllers/v3/GoodsActivityController.php

@@ -52,6 +52,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();
@@ -72,7 +73,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');
 
@@ -138,8 +138,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;
                 });

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()]);
@@ -261,7 +261,7 @@ class GoodsController extends AdminController
                     })
                     ->saving(function ($v) {
                         return $v == 1 ? 1 : 0;
-                    });
+                    })->default(1);
 
                 $form->disableResetButton();
                 $form->disableViewCheck();