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..c5229ccdc 100644 --- a/Application/Admin/View/AmericaIpForbit/add.html +++ b/Application/Admin/View/AmericaIpForbit/add.html @@ -35,24 +35,24 @@ - - 区域 - - - - - + + + + + + + + + + diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index 9cadb3b0a..ae75d7eb9 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -193,8 +193,8 @@