From e949f924345d6208fb852c255b9f39511cb7ca68 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 13 May 2020 10:15:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ip=E9=99=90=E5=88=B6=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AmericaIpForbitController.class.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Application/Admin/Controller/AmericaIpForbitController.class.php b/Application/Admin/Controller/AmericaIpForbitController.class.php index 6962e50c6..621d2c53f 100644 --- a/Application/Admin/Controller/AmericaIpForbitController.class.php +++ b/Application/Admin/Controller/AmericaIpForbitController.class.php @@ -120,6 +120,13 @@ class AmericaIpForbitController extends ThinkController } fclose($fp); + addOperationLog(array( + "op_type"=>3, + "key"=> getNowDate(), + "menu"=>"游戏-游戏管理-ip限制白名单-导出", + "url"=>U("AmericaIpForbit/index") + )); + $getData = $_GET; unset($getData['id']); unset($getData['xlsname']); @@ -147,6 +154,23 @@ class AmericaIpForbitController extends ThinkController $is_change = M('forbit_ip','tab_')->where(['id'=>['in',$id]])->save(['status'=>$status]); if ($is_change) { + if (I('status')) { + addOperationLog(array( + "op_type"=>1, + "key"=> getNowDate(), + "menu"=>"游戏-游戏管理-ip限制白名单-开启", + "url"=>U("AmericaIpForbit/index") + )); + } else{ + addOperationLog(array( + "op_type"=>1, + "key"=> getNowDate(), + "menu"=>"游戏-游戏管理-ip限制白名单-关闭", + "url"=>U("AmericaIpForbit/index") + )); + } + + $this->ajaxReturn(['code'=>1]); } else { $this->ajaxReturn(['code'=>0]); @@ -165,6 +189,14 @@ class AmericaIpForbitController extends ThinkController $is_del = $is_change = M('forbit_ip','tab_')->where(['id'=>['in',$id]])->delete(); if ($is_del) { + $hav_firbit = M('forbit_ip','tab_')->where(['id'=>I('id')])->find(); + addOperationLog(array( + "op_type"=>2, + "key"=> $hav_firbit['user_account'], + "menu"=>"游戏-游戏管理-ip限制白名单-删除", + "url"=>U("AmericaIpForbit/index") + )); + $this->ajaxReturn(['code'=>1]); } else { $this->ajaxReturn(['code'=>0]); @@ -208,6 +240,14 @@ class AmericaIpForbitController extends ThinkController $is_insert = M('forbit_ip','tab_')->add($insert); if ($is_insert) { + + addOperationLog(array( + "op_type"=>0, + "key"=> I('account'), + "menu"=>"游戏-游戏管理-ip限制白名单-新增", + "url"=>U("AmericaIpForbit/index") + )); + $this->success('添加成功',U('AmericaIpForbit/index')); } else { $this->error('添加失败'); From a4cbd2e314bf504abf5a7bbe5fdfccf5d23aa962 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 18 May 2020 15:50:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=80=E6=88=B7=E7=BD=91=E7=82=B9?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=85=AC=E5=8F=B8=E6=9F=A5=E8=AF=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/PromoteCompany/view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html index 8b16d5be3..a8d745481 100644 --- a/Application/Admin/View/PromoteCompany/view.html +++ b/Application/Admin/View/PromoteCompany/view.html @@ -159,9 +159,9 @@ - 开户网点： + 账户名： - + From 982a7f4c1b1d8f9710477b73eece5ccc669fab54 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 19 May 2020 09:19:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PartnerController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index c583e27f2..646731001 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -62,7 +62,7 @@ class PartnerController extends ThinkController //获取分页数据 $query = $model->alias('p') ->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account, - p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type") + p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type,p.has_game_evidence,p.is_sign_contract") ->where($map) ->order("id desc"); if($is_export){ @@ -143,8 +143,8 @@ class PartnerController extends ThinkController $parseData = array(); foreach ($partners as $key =>$value) { $value['game'] = $parseGames[$value['id']]; - $value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有'; - $value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否'; + $value['has_game_evidence'] = $value['has_game_evidence'] ? '有' : '没有'; + $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否'; $value['channel_rate'] *= 100; $value['invoice_rate'] *= 100; if ($value['settlement_type'] == 0) { From 9c1a12296d4b2862eeb47cf39ab9cedb66d620ce Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 19 May 2020 09:36:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PartnerController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 646731001..d3b151de3 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -143,7 +143,7 @@ class PartnerController extends ThinkController $parseData = array(); foreach ($partners as $key =>$value) { $value['game'] = $parseGames[$value['id']]; - $value['has_game_evidence'] = $value['has_game_evidence'] ? '有' : '没有'; + $value['has_game_evidence'] = $value['has_game_evidence'] ? '是' : '否'; $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否'; $value['channel_rate'] *= 100; $value['invoice_rate'] *= 100;