From 72cfd9ec64c705e4f89ddabd80ada8d239f3a3e6 Mon Sep 17 00:00:00 2001 From: jbRotk <2436953959@qq.com> Date: Thu, 6 Feb 2020 16:57:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E8=B4=B9=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ToolController.class.php | 7 + Application/Admin/View/Tool/payset.html | 120 +++++++++++++++++- 2 files changed, 120 insertions(+), 7 deletions(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 7f8dd1d22..86afa7aee 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -28,6 +28,13 @@ class ToolController extends ThinkController { $map_['name']=array("in",'wei_xin,wei_xin_app,weixin'); M('tool','tab_')->where($map_)->setField('status','0'); } + if (!is_numeric($config['channel_rate'])) { + $this->error('请输入正确的渠道费率'); + } + if ($config['channel_rate'] > 100) { + $this->error('渠道费率最大值为100%'); + } + $config['channel_rate'] = round($config['channel_rate'], 2); $flag = M('Tool','tab_')->where($map)->setField($data); if($flag !== false){ $config['status']=$_POST['status']; diff --git a/Application/Admin/View/Tool/payset.html b/Application/Admin/View/Tool/payset.html index 6ce600f37..52a7ee57a 100644 --- a/Application/Admin/View/Tool/payset.html +++ b/Application/Admin/View/Tool/payset.html @@ -216,7 +216,6 @@ - 启用状态 @@ -237,7 +236,19 @@ - + + + 渠道费率 + + + + + + % + + + + @@ -329,8 +340,19 @@ - + + + 渠道费率 + + + + + % + + + + @@ -423,7 +445,19 @@ - + + + 渠道费率 + + + + + + % + + + + @@ -690,7 +724,19 @@ + + + 渠道费率 + + + + + % + + + + @@ -809,7 +855,19 @@ - + + + 渠道费率 + + + + + + % + + + + @@ -927,7 +985,19 @@ - + + + 渠道费率 + + + + + + % + + + + @@ -1078,7 +1148,19 @@ - + + + 渠道费率 + + + + + + % + + + + @@ -1275,7 +1357,19 @@ + + 渠道费率 + + + + + + % + + + + @@ -1365,7 +1459,19 @@ + + 渠道费率 + + + + + + % + + + + From 5d315d41825bd794b9797ec8399a00283631cf2a Mon Sep 17 00:00:00 2001 From: jbRotk <2436953959@qq.com> Date: Fri, 7 Feb 2020 14:50:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 10 +++- Application/Admin/View/Promote/belong.html | 25 +++++++++ .../Admin/View/Promote/belong_add.html | 54 +++++++++++++------ .../Admin/View/Promote/belong_edit.html | 37 ++++++++++++- Data/update.sql | 6 +++ 5 files changed, 114 insertions(+), 18 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 08cc2bd37..a94784d64 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -1223,6 +1223,10 @@ class PromoteController extends ThinkController $map['pb.can_view_recharge'] = I('can_view_recharge'); } + if (!is_null(I('company_type', null))) { + $map['pb.company_type'] = I('company_type'); + } + if (!is_null(I('company_id', null))) { $map['p.company_id'] = I('company_id'); } @@ -1265,7 +1269,7 @@ class PromoteController extends ThinkController $this->display(); } - public function belong_add($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null) + public function belong_add($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null, $company_type = null) { if (IS_POST) { if (empty($promote_id)) { @@ -1276,6 +1280,7 @@ class PromoteController extends ThinkController 'company_belong' => $company_belong, 'company_relation' => $company_relation, 'can_view_recharge' => $can_view_recharge, + 'company_type' => $company_type, 'verify_status' => 0, 'remark' => $remark, 'applicant_id' => getAdmin(), @@ -1302,7 +1307,7 @@ class PromoteController extends ThinkController } } - public function belong_edit($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null) + public function belong_edit($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null, $company_type = null) { if (IS_POST) { if (empty($promote_id)) { @@ -1313,6 +1318,7 @@ class PromoteController extends ThinkController 'company_belong' => $company_belong, 'company_relation' => $company_relation, 'can_view_recharge' => $can_view_recharge, + 'company_type' => $company_type, 'verify_status' => 0, 'remark' => $remark, 'applicant_id' => getAdmin(), diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html index 20a550f41..9678510a2 100644 --- a/Application/Admin/View/Promote/belong.html +++ b/Application/Admin/View/Promote/belong.html @@ -81,6 +81,13 @@ +
+ +
无 + - - - - - - - 工会关系： - - - + + 工会关系： + + + + + + + + + + + + 工会类型： + + + + + + + + + 充值信息查看权限： diff --git a/Application/Admin/View/Promote/belong_edit.html b/Application/Admin/View/Promote/belong_edit.html index f39d3750a..ee3b035c9 100644 --- a/Application/Admin/View/Promote/belong_edit.html +++ b/Application/Admin/View/Promote/belong_edit.html @@ -64,7 +64,12 @@ 工会归属： - + + + @@ -84,6 +94,11 @@ 工会关系： +