Merge branch 'goods_copy'

app/Admin/Controllers/v3/GoodsActivityController.php

@@ -90,7 +90,7 @@ class GoodsActivityController extends AdminController
             });
             // 每页10条
             $grid->paginate(10);
-            // $grid->actions([new GoodsActivityCopy()]);
+            $grid->actions([new GoodsActivityCopy()]);
             $grid->tools([new GoodsActivitySetting()]);
         });
     }
@@ -187,7 +187,7 @@ class GoodsActivityController extends AdminController
                 $form->currency('price')->required()->floatTwo()->symbol('￥');
                 $form->currency('original_price')->required()->floatTwo()->symbol('￥');
                 $form->currency('vip_price')->required()->floatTwo()->symbol('￥');
-                $form->text('goods_unit')->help('如：斤，个，盒，500克，1000克，1500克等');
+                $form->text('goods_unit')->help('如：50克，100克，250克，500克，1000克，1500克等');
                 $form->radio('is_infinite')->options(['关闭','开启'])->default(1);
                 $form->number('inventory')->required()->attribute('min', 0)->default(1);
                 $form->number('restrict_num')->attribute('min', 0)->default(1)->help('0表示不限购，单笔订单限购数量');

app/Admin/Controllers/v3/GoodsController.php

@@ -217,7 +217,7 @@ class GoodsController extends AdminController
                 $form->currency('price')->required()->symbol('￥');
                 $form->currency('original_price')->required()->symbol('￥');
                 $form->currency('vip_price')->required()->symbol('￥');
-                $form->text('goods_unit')->help('如：斤，个，盒，500克，1000克，1500克等');
+                $form->text('goods_unit')->help('如：50克，100克，250克，500克，1000克，1500克等');
                 $form->radio('is_infinite')->options(['关闭','开启'])->default(1);
                 $form->number('inventory')->required()->attribute('min', 0)->default(1);
                 $form->number('restrict_num')->attribute('min', 0)->default(0)->help('0表示不限购');