1

application/admin/controller/Kfnotice.php

@@ -79,6 +79,13 @@ class Kfnotice extends Base
                 $adminKey[$nowadmin['id']] = $nowadmin;
             }
 
+            //客服
+            $users = db('users')->select();
+            $userKey = [] ;
+            foreach ($users as $nowuser){
+                $userKey[$nowuser['id']] = $nowuser;
+            }
+
 
             foreach ($result as $key => $vo) {
                 $vo->readtime = empty($vo->readtime) ? '' : date('Y-m-d H:i:s', $vo->readtime);
@@ -86,6 +93,8 @@ class Kfnotice extends Base
                 $result[$key] = array_merge($vo->toArray(), ['operate' => $this->makeBtn($vo->id)]);
                 $result[$key]['admin_name'] =  isset($adminKey[$vo['admin_id']]) ? $adminKey[$vo['admin_id']]['user_name'] : '-err' ;
 
+                $result[$key]['user_name'] =  isset($userKey[$vo['uid']]) ? $userKey[$vo['uid']]['user_name'] : $result[$key]['uid'] ;
+
 
                 $date = explode(' ',$vo->ctime);
                 $year = explode('-',$vo->ctime);

application/admin/view/iplimit/edit.html

@@ -25,7 +25,7 @@
                         <div class="form-group">
                             <label class="col-sm-3 control-label">访问ip：</label>
                             <div class="input-group col-sm-4">
-                                <input class="form-control" name="ip" required="" aria-required="true" value="{if !empty($info['ip'])} {$info['ip']}{else}{$info['start_ip']}-{$info['end_ip']}{/if}">
+                                <input class="form-control" name="ip" required="" aria-required="true" value="{$info['ip']}">
                             </div>
                         </div>
                         <div class="form-group">

application/admin/view/kfnotice/index.html

@@ -114,7 +114,7 @@
                     <table id="cusTable">
                         <thead>
                         <th data-field="title">标题</th>
-                        <th data-field="uid">收件人</th>
+                        <th data-field="user_name">收件人</th>
                         <th data-field="sendtype">发送状态</th>
                         <th data-field="ctime">创建时间</th>
                         <th data-field="sendtime">发送时间</th>

application/index/controller/Register.php

@@ -103,7 +103,6 @@ class Register extends Common
         $ip = ($ip) ? $ip : $_SERVER["REMOTE_ADDR"];
         //将ip地址转换成int型
         $intip = bindec(decbin(ip2long($ip)));
-        //return $ip.$intip;
         $res = db('iplimit')->where('ip',$ip)->where('object',1)->find();
         $result = db('iplimit')->where('start_ip','<=',$intip)->where('end_ip','>=',$intip)->where('object',1)->find();
         if(!empty($res) || !empty($result)){