From 9aae41fd2049ffee18bf864e235f5f47433de92b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 26 May 2020 15:02:30 +0800
Subject: [PATCH] =?UTF-8?q?ip=E5=B0=81=E7=A6=81=E9=9A=90=E8=97=8F=E5=8C=BA?=
 =?UTF-8?q?=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 @@
                             </span>
                         </td>
                     </tr>
-                    <tr>
-                     <td class="l">区域</td>
-                        <td class="r">
-                           <select name="area" id="area">
-                            <option value="">请选择区域</option>
-                                <option  value="美国">美国</option>
-                           </select>
-                        </td>
-                       
-                    </tr>
+<!--                    <tr>-->
+<!--                     <td class="l">区域</td>-->
+<!--                        <td class="r">-->
+<!--                           <select name="area" id="area">-->
+<!--                            <option value="">请选择区域</option>-->
+<!--                                <option  value="美国">美国</option>-->
+<!--                           </select>-->
+<!--                        </td>-->
+<!--                       -->
+<!--                    </tr>-->
 
                 </tbody>
             </table>
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 @@
 
           <th >玩家账号</th>
 
-          <th >区域</th>
+<!--          <th >区域</th>-->
 
           <th >状态</th>
 
@@ -289,7 +289,7 @@
             <tr>
               <td ><input class="ids" type="checkbox" value="{$data.id}" name="ids[]"></td>
               <td >{$data.user_account}</td>
-              <td>{$data.area}</td>
+<!--              <td>{$data.area}</td>-->
               <td ><if condition="$data.status eq 1">不限制<else/>限制</if></td>
               <td >{$data.admin_account}</td>
               <td >{$data.create_time}</td>