From da7bbeface38de491982b387d08f5eb6940f2c15 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Sun, 17 Nov 2024 16:13:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=95=86=E5=93=81=E8=AE=A9?= =?UTF-8?q?=E5=88=A9=E6=AF=94=E4=BE=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/goods/SubsidyLogic.php | 4 +-- app/admin/validate/goods/SubsidyValidate.php | 8 +++--- app/admin/view/goods/subsidy/add.html | 26 ++++++++++---------- app/admin/view/goods/subsidy/edit.html | 26 ++++++++++---------- app/admin/view/goods/subsidy/lists.html | 6 ++--- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/app/admin/logic/goods/SubsidyLogic.php b/app/admin/logic/goods/SubsidyLogic.php index e2f84419..acc9cbbc 100755 --- a/app/admin/logic/goods/SubsidyLogic.php +++ b/app/admin/logic/goods/SubsidyLogic.php @@ -23,7 +23,7 @@ class SubsidyLogic extends Logic Db::startTrans(); GoodsSubsidy::create([ 'profit' => str_replace('%', '', $post['profit']), - 'discount' => str_replace('%', '', $post['discount']), +// 'discount' => str_replace('%', '', $post['discount']), 'subsidy' => str_replace('%', '', $post['subsidy']), ]); Db::commit(); @@ -48,7 +48,7 @@ class SubsidyLogic extends Logic Db::startTrans(); GoodsSubsidy::update([ 'profit' => str_replace('%', '', $post['profit']), - 'discount' => str_replace('%', '', $post['discount']), +// 'discount' => str_replace('%', '', $post['discount']), 'subsidy' => str_replace('%', '', $post['subsidy']), ], ['id' => $post['id']]); Db::commit(); diff --git a/app/admin/validate/goods/SubsidyValidate.php b/app/admin/validate/goods/SubsidyValidate.php index 07c44f29..8ca64ad3 100755 --- a/app/admin/validate/goods/SubsidyValidate.php +++ b/app/admin/validate/goods/SubsidyValidate.php @@ -9,13 +9,13 @@ class SubsidyValidate extends Validate protected $rule = [ 'profit' => 'require', - 'discount' => 'require', +// 'discount' => 'require', 'subsidy' => 'require', ]; protected $message = [ - 'profit.require' => '商家利润比例参数不能为空', - 'discount.require' => '商品让利比例参数不能为空', - 'subsidy.require' => '商品全返比例参数不能为空', + 'profit.require' => '商家折扣比例参数不能为空', +// 'discount.require' => '商品让利比例参数不能为空', + 'subsidy.require' => '商品最高返补比例参数不能为空', ]; } \ No newline at end of file diff --git a/app/admin/view/goods/subsidy/add.html b/app/admin/view/goods/subsidy/add.html index ce77313e..17b62daa 100755 --- a/app/admin/view/goods/subsidy/add.html +++ b/app/admin/view/goods/subsidy/add.html @@ -11,30 +11,30 @@
- +
- +

%

-
- -
-
- -

%

-
-
-
+ + + + + + + + +
- +
- +

%

diff --git a/app/admin/view/goods/subsidy/edit.html b/app/admin/view/goods/subsidy/edit.html index 52995b5f..75e42d9f 100755 --- a/app/admin/view/goods/subsidy/edit.html +++ b/app/admin/view/goods/subsidy/edit.html @@ -13,30 +13,30 @@
- +
- +

%

-
- -
-
- -

%

-
-
-
+ + + + + + + + +
- +
- +

%

diff --git a/app/admin/view/goods/subsidy/lists.html b/app/admin/view/goods/subsidy/lists.html index 76045e7b..1c169162 100755 --- a/app/admin/view/goods/subsidy/lists.html +++ b/app/admin/view/goods/subsidy/lists.html @@ -254,9 +254,9 @@ //列表 like.tableLists('#like-table-lists', '{:url("goods.subsidy/lists")}', [ {field: 'id', width: 60, title: 'ID', sort: true} - , {field: 'profit', title: '商家利润比例', align: "center"} - , {field: 'discount', title: '商品让利比例', align: "center"} - , {field: 'subsidy', title: '商品全返比例', align: "center"} + , {field: 'profit', title: '商家折扣比例', align: "center"} + // , {field: 'discount', title: '商品让利比例', align: "center"} + , {field: 'subsidy', title: '商品最高返补比例', align: "center"} , {fixed: 'right', title: '操作', align: 'center', width: 300, toolbar: '#subsidy-operation'} ]);