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 @@
%
%
-%
%
%
-%