From 9aae41fd2049ffee18bf864e235f5f47433de92b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 26 May 2020 15:02:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ip=E5=B0=81=E7=A6=81=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AmericaIpForbitController.class.php | 7 +++---- .../Admin/View/AmericaIpForbit/add.html | 20 +++++++++---------- .../Admin/View/AmericaIpForbit/index.html | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Application/Admin/Controller/AmericaIpForbitController.class.php b/Application/Admin/Controller/AmericaIpForbitController.class.php index 621d2c53f..6f71f4f24 100644 --- a/Application/Admin/Controller/AmericaIpForbitController.class.php +++ b/Application/Admin/Controller/AmericaIpForbitController.class.php @@ -63,7 +63,7 @@ class AmericaIpForbitController extends ThinkController $xlsName = 'ip限制白名单'; $xlsCell = array( - "玩家账号", "区域", '状态', '添加人', '添加时间' + "玩家账号", '状态', '添加人', '添加时间' ); $map = []; @@ -95,7 +95,7 @@ class AmericaIpForbitController extends ThinkController for($i = 1; $i <= $pages; $i++) { $xlsData = M('forbit_ip','tab_') - ->field('user_account,area,status,admin_account,create_time') + ->field('user_account,status,admin_account,create_time') ->where($map) ->limit(($i-1)*$perSize ,$perSize) ->order('create_time DESC') @@ -192,7 +192,7 @@ class AmericaIpForbitController extends ThinkController $hav_firbit = M('forbit_ip','tab_')->where(['id'=>I('id')])->find(); addOperationLog(array( "op_type"=>2, - "key"=> $hav_firbit['user_account'], + "key"=> I('id'), "menu"=>"游戏-游戏管理-ip限制白名单-删除", "url"=>U("AmericaIpForbit/index") )); @@ -230,7 +230,6 @@ class AmericaIpForbitController extends ThinkController $insert['user_id'] = $hav_user['id']; $insert['user_account'] = I('account'); - $insert['area'] = I('area'); $insert['status'] = I('status'); $insert['admin_id'] = $auth['uid']; $insert['admin_account'] = $auth['username']; diff --git a/Application/Admin/View/AmericaIpForbit/add.html b/Application/Admin/View/AmericaIpForbit/add.html index 0503d6b09..1b9479ce2 100644 --- a/Application/Admin/View/AmericaIpForbit/add.html +++ b/Application/Admin/View/AmericaIpForbit/add.html @@ -43,16 +43,16 @@ - - 区域 - - - - - + + + + + + + + + + diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index 9cadb3b0a..9d28221c2 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -261,7 +261,7 @@ 玩家账号 - 区域 + 状态 @@ -289,7 +289,7 @@ {$data.user_account} - {$data.area} + 不限制限制 {$data.admin_account} {$data.create_time} From 32d9aebc24496d0a6c5af12f8131003f1d9c1241 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 26 May 2020 15:20:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ip=E5=B0=81=E7=A6=81=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/AmericaIpForbit/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index 9d28221c2..bf2e79e5b 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -193,7 +193,7 @@
-

ip限制白名单

+

苹果内购通知配置

说明：苹果内购白名单，名单中的用户支付成功可通知游戏

From a508094a688060548ae2d3c5c0d9e53354ce2c2d Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 26 May 2020 15:55:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ip=E5=B0=81=E7=A6=81=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/AmericaIpForbit/add.html | 4 ++-- .../Admin/View/AmericaIpForbit/index.html | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Application/Admin/View/AmericaIpForbit/add.html b/Application/Admin/View/AmericaIpForbit/add.html index 1b9479ce2..c5229ccdc 100644 --- a/Application/Admin/View/AmericaIpForbit/add.html +++ b/Application/Admin/View/AmericaIpForbit/add.html @@ -35,10 +35,10 @@ diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index bf2e79e5b..ae75d7eb9 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -194,7 +194,7 @@

苹果内购通知配置

-

说明：苹果内购白名单，名单中的用户支付成功可通知游戏

+

说明：苹果内购白名单，名单中的用户支付成功可通知游戏 重点：默认全部账户使用苹果内购通知不到账

@@ -226,11 +226,11 @@
批量限制 + style="width: 150px;background: #fff;color: #000;border:1px solid #000;">批量通知不到账
批量不限制 + style="width: 150px;background: #fff;color: #000;border:1px solid #000;">批量通知到账
{$data.user_account} - 不限制限制 + 通知到账通知不到账 {$data.admin_account} {$data.create_time} 删除 - 限制 + 通知不到账 - 不限制 + 通知到账 @@ -361,9 +361,9 @@ dataType: 'json', success: function (data) { if (data.code == 0) { - layer.msg("" + '批量限制失败' + ""); + layer.msg("" + '批量操作失败' + ""); } else { - layer.msg("" + '批量限制成功' + "") + layer.msg("" + '批量操作成功' + "") setTimeout(function(){ window.location.reload(); },1500); @@ -416,9 +416,9 @@ dataType: 'json', success: function (data) { if (data.code == 0) { - layer.msg("" + '批量不限制失败' + ""); + layer.msg("" + '批量操作失败' + ""); } else { - layer.msg("" + '批量不限制成功' + "") + layer.msg("" + '批量操作成功' + "") setTimeout(function(){ window.location.reload(); },1500);