From c3e1e30b15d764dd0237c63b3a3013041e621d05 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Thu, 24 Sep 2020 17:01:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE--=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/GoodsActivityController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 505e24b..a5a4391 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/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()]); }); } From 77b716532c5968debade8ece26449fe7494fd864 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Thu, 24 Sep 2020 17:23:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= 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 a5a4391..1309627 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -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('如：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表示不限购，单笔订单限购数量'); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index a5a3d1e..33fb12e 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/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表示不限购'); From 96461603da6aa35949570875bcb27bcb68a868e8 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Thu, 24 Sep 2020 17:32:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D--?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/GoodsActivityController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 1309627..23d78a1 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -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('如：250克，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表示不限购，单笔订单限购数量');