1

application/admin/controller/Admins.php

@@ -40,12 +40,19 @@ class Admins extends Base
                     }
                 }
                 // 优化显示状态
-                if (1 == $vo['status']) {
-                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
-                } else {
-                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+                if(1 == $vo['status']){
+                    $result[$key]['status'] = '<span style="color: #2fbe1b">启用</span>';
+                }else{
+                    $result[$key]['status'] = '<span style="color: red">禁用</span>';
                 }
 
+//                // 优化显示状态
+//                if (1 == $vo['status']) {
+//                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
+//                } else {
+//                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+//                }
+
                 // 上次登录时间
                 $result[$key]['last_login_time'] = empty($vo['last_login_time']) ? '' : date('Y-m-d H:i:s', $vo['last_login_time']);
 
@@ -174,12 +181,19 @@ class Admins extends Base
             $result = db('admingroup')->limit($offset, $limit)->select();
             foreach ($result as $key => $vo) {
                 // 优化显示状态
-                if (1 == $vo['status']) {
-                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
-                } else {
-                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+
+                if(1 == $vo['status']){
+                    $result[$key]['status'] = '<span style="color: #2fbe1b">启用</span>';
+                }else{
+                    $result[$key]['status'] = '<span style="color: red">禁用</span>';
                 }
 
+//                if (1 == $vo['status']) {
+//                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
+//                } else {
+//                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+//                }
+
                 // 上次登录时间
                 $result[$key]['addtime'] = date('Y-m-d H:i:s', $vo['addtime']);
 
@@ -366,10 +380,12 @@ class Admins extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('admins/editadmin', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
         $operate .= '<a href="javascript:adminDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+//        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         return $operate;
     }
@@ -378,10 +394,12 @@ class Admins extends Base
     private function makeBtnPower($id)
     {
         $operate = '<a href="' . url('admins/editpower', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
         $operate .= '<a href="javascript:powerDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+//        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         return $operate;
     }

application/admin/controller/Groups.php

@@ -17,17 +17,17 @@ class Groups extends Base
             foreach($result as $key=>$vo){
                 // 优化显示状态
                 if(1 == $vo['status']){
-                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
+                    $result[$key]['status'] = '<span style="color: #2fbe1b">启用</span>';
                 }else{
-                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+                    $result[$key]['status'] = '<span style="color: red">禁用</span>';
                 }
 
-                // 优化显示状态
-                if(1 == $vo['status']){
-                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
-                }else{
-                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
-                }
+//                // 优化显示状态
+//                if(1 == $vo['status']){
+//                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
+//                }else{
+//                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+//                }
 
                 // 统计分组人数
                 $result[$key]['users_num'] = db('users')->where('group_id', $vo['id'])->count();
@@ -138,10 +138,12 @@ class Groups extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('groups/editgroup', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        //$operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
         $operate .= '<a href="javascript:userGroup(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+//        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         //$operate .= '<a href="' . url('groups/manageUser') . '">';
         //$operate .= '<button type="button" class="btn btn-info btn-sm"><i class="fa fa-user-plus"></i> 管理组员</button></a>';

application/admin/controller/Sensitivec.php

@@ -157,10 +157,12 @@ class Sensitivec extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('sensitivec/editsensitive', ['sensitivewords_id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
         $operate .= '<a href="javascript:userDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+//        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         return $operate;
     }

application/admin/controller/System.php

@@ -474,7 +474,7 @@ class System extends Base
             for($i=0;$i<count($users);$i++){
                 $option = $option.'<option value="'.$users[$i]['id'].'">'.$users[$i]['user_name'].'</option>';
             }
-            $useroption = '<select class="selector_user" lay-verify="required" lay-filter="user_id">'.$option.'</select>';
+            $useroption = '<select class="selector_user" lay-verify="required" lay-filter="user_id" style="height: 30px;">'.$option.'</select>';
         }
         //所有客服组
         $groups = db('groups')->select();
@@ -484,7 +484,7 @@ class System extends Base
             for($j=0;$j<count($groups);$j++){
                 $option = $option.'<option value="'.$groups[$j]['id'].'">'.$groups[$j]['name'].'</option>';
             }
-            $groupoption = '<select class="selector_group" lay-verify="required" lay-filter="group_id">'.$option.'</select>';
+            $groupoption = '<select class="selector_group" lay-verify="required" lay-filter="group_id" style="height: 30px;">'.$option.'</select>';
         }
 
         $this->assign([
@@ -591,7 +591,8 @@ class System extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('system/detail', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 详情</button></a> ';
+//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 详情</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 详情</button></a> ';
 
         return $operate;
     }

application/admin/controller/Users.php

@@ -38,9 +38,9 @@ class Users extends Base
 
                 // 优化显示状态
                 if(1 == $vo['status']){
-                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
+                    $result[$key]['status'] = '<span style="color: #2fbe1b">启用</span>';
                 }else{
-                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+                    $result[$key]['status'] = '<span style="color: red">禁用</span>';
                 }
 
                 // 查询分组
@@ -257,16 +257,15 @@ class Users extends Base
     // 生成按钮
     private function makeBtn($id)
     {
-//        $operate = '<a href="' . url('users/edituser', ['id' => $id]) . '">';
-//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
-
 //        $operate = '<a href="javascript:resetPwd(' . $id . ')"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 重置密码</button></a>';
 
-        $operate = '<a style="margin-left:5px;" href="' . url('users/editUser', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate = '<a href="' . url('users/editUser', ['id' => $id]) . '">';
+//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
-        $operate .= '<a style="margin-left:5px;" href="javascript:userDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= '<a href="javascript:userDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
+//        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         //$operate .= '<a href="javascript:;">';
         //$operate .= '<button type="button" class="btn btn-info btn-sm"><i class="fa fa-institution"></i> 详情</button></a>';

application/admin/view/admins/addadmin.html

@@ -60,7 +60,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/admins/addpower.html

@@ -60,7 +60,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/admins/editadmin.html

@@ -60,7 +60,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/admins/editpower.html

@@ -70,7 +70,7 @@
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/admins/index.html

@@ -20,7 +20,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/admins/addadmin.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增管理员</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <!--搜索框开始-->
@@ -28,10 +28,10 @@
                 <div class="content clearfix m-b">
                     <div class="form-group">
                         <label>管理员名称：</label>
-                        <input type="text" class="form-control" id="username" name="user_name">
+                        <input type="text" class="form-control" id="username" name="user_name" style="height: 30px;">
                     </div>
                     <div class="form-group">
-                        <button class="btn btn-primary" type="button" style="margin-top:5px" id="search"><strong>搜 索</strong>
+                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px" id="search">搜索
                         </button>
                     </div>
                 </div>

application/admin/view/admins/power.html

@@ -20,7 +20,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/admins/addpower.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增角色</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <div class="example-wrap">

application/admin/view/groups/addgroup.html

@@ -40,7 +40,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/groups/editgroup.html

@@ -40,7 +40,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/groups/index.html

@@ -20,7 +20,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/groups/addgroup.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增客服组</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <!--搜索框开始-->

application/admin/view/sensitivec/addsensitive.html

@@ -52,7 +52,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/sensitivec/editsensitive.html

@@ -51,7 +51,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/sensitivec/index.html

@@ -28,13 +28,13 @@
         </div>
         <div class="ibox-content">
             <a id="add" href="/admin/sensitivec/addsensitive.html?type=2">
-                <button class="btn btn-primary" type="button" style="margin-top:10px"><strong>新增敏感词</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <form action="/admin/sensitivec/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right">
                 <div class="content clearfix m-b">
                     <div class="form-group" style="margin-left: 20px">
-                        <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i>全部删除</button></a>
+                        <a href="javascript:allDel()" class="btn" style="" ><button type="button" class="btn btn-danger btn-sm">全部删除</button></a>
                     </div>
                     <!--<div class="form-group">-->
                         <!--<a href="/static/admin/file/sensitivewords.xlsx" class="btn btn-primary"  >下载敏感词模板文件</a>-->
@@ -47,7 +47,7 @@
                         <!--<input type="submit" class="btn btn-primary"  value="导入">-->
                     <!--</div>-->
                     <div class="form-group">
-                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary">导入敏感词</button></a>
+                        <a href="javascript:leadingin()" class="btn" ><button type="button" class="btn btn-primary btn-sm">导入敏感词</button></a>
                     </div>
                 </div>
             </form>
@@ -60,8 +60,7 @@
                         <input style="display: none">
                     </div>
                     <div class="form-group">
-                        <button class="btn btn-primary" type="button" style="margin-top:5px" id="search"><strong>搜 索</strong>
-                        </button>
+                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:2px" id="search">搜索</button>
                     </div>
                 </div>
             </form>
@@ -221,7 +220,7 @@
 
 
     function leadingin(){
-        layer.confirm('<form action="/admin/sensitivec/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right"> <div class=""><input type="file" class="" id="insert"  name="excel" style="border: none;" /> </div><div class="" style="margin-top: 20px;"><input type="submit" id="daoru" class="btn btn-primary"  value="开始导入"></div><div class="" style="margin-top: 20px;"> <a href="/static/admin/file/sensitivewords.xlsx" style="color:black;" class=""><input type="button"  value="下载敏感词模板文件"></a></div></form>', {icon: 6, title:'导入敏感词'}, function(index){
+        layer.confirm('<form action="/admin/sensitivec/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right"> <div class=""><input type="file" class="" id="insert"  name="excel" style="border: none;" /> </div><div class="" style="margin-top: 20px;"><input type="submit" id="daoru" class="btn btn-primary btn-sm"  value="开始导入"></div><div class="" style="margin-top: 20px;"> <a href="/static/admin/file/sensitivewords.xlsx" style="color:black;" class=""><input type="button"  value="下载敏感词模板文件"></a></div></form>', {icon: 6, title:'导入敏感词'}, function(index){
             //do something
             $.getJSON("{:url('sensitivec/inserExcel')}", {'id' : id}, function(res){
                 if(1 == res.code){

application/admin/view/system/wordslog.html

@@ -12,6 +12,14 @@
     <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
     <link href="__JS__/layui/css/layui.css" rel="stylesheet">
 </head>
+<style>
+    dl dd{
+        height: 30px;
+    }
+    input.layui-input.layui-unselect {
+        height: 30px;
+    }
+</style>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
     <!-- Panel Other -->
@@ -35,38 +43,33 @@
                             <!--</select>-->
                         <!--</div>-->
                     <!--</div>-->
-                    &nbsp;&nbsp;
                     <div class="form-group">
-                        <label>聊天日期：</label>
-                        <input type="text" class="form-control" id="start" value="<?php echo date('Y-m-d',time()-604800);?>" style="width: 100px;"> --
-                        <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time());?>" style="width: 100px;">
+                        <label>聊天日期:</label>
+                        <input type="text" class="form-control" id="start" value="<?php echo date('Y-m-d',time()-604800);?>" style="width: 100px;height: 30px;"> --
+                        <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time());?>" style="width: 100px;height: 30px;">
                         <input type="hidden" id="now" value="<?php echo date('Y-m-d',time());?>">
                     </div>
-                    &nbsp;&nbsp;
-                    <div class="form-group">
+                    <div class="form-group" style="margin-left: 10px;">
                         <div class="input-group col-sm-4 layui-form" style="width: 100px;">
-                            <input type="hidden" id="user_id" value="0"/>
+                            <input type="hidden" id="user_id" value="0" style="height: 30px;"/>
                             {$useroption}
                         </div>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group" style="margin-left: 10px;">
                         <div class="input-group col-sm-4 layui-form" style="width: 120px;">
-                            <input type="hidden" id="group_id" value="0"/>
+                            <input type="hidden" id="group_id" value="0" style="height: 30px;"/>
                             {$groupoption}
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label>访客账号：</label>
-                        <input type="text" class="form-control" id="username" name="user_name" style="width: 120px;">
+                    <div class="form-group" style="margin-left: 10px;">
+                        <label>访客账号:</label>
+                        <input type="text" class="form-control" id="username" name="user_name" style="height: 30px;">
                     </div>
                     <div class="form-group">
-                        <button class="btn btn-primary" type="button" style="margin-top:5px" id="search">
-                            <strong>搜 索</strong>
-                        </button>
+                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px" id="search">搜索</button>
                     </div>
-                    <div class="form-group" style="margin-left:40px;margin-top:5px">
-                        <button class="btn btn-primary" type="button" id="toExcel" name="toExcel" value="0"><strong>导出Excel</strong>
-                        </button>
+                    <div class="form-group" style="margin-left:20px;margin-top:5px">
+                        <button class="btn btn-primary btn-sm" type="button" id="toExcel" name="toExcel" value="0">导出Excel</button>
                     </div>
                 </div>
             </form>

application/admin/view/users/adduser.html

@@ -131,7 +131,7 @@
 
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/users/edituser.html

@@ -132,9 +132,9 @@
 
 
                         <div class="form-group">
-                            <div class="col-sm-4 col-sm-offset-6" style="margin-left: 20%;">
+                            <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit" style="margin-left: 10%;">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/users/index.html

@@ -12,6 +12,14 @@
     <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
     <link href="__JS__/layui/css/myLayui.css" rel="stylesheet">
 </head>
+<style>
+    dl dd{
+        height: 30px;
+    }
+    input.layui-input.layui-unselect {
+        height: 30px;
+    }
+</style>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
     <!-- Panel Other -->
@@ -21,7 +29,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/users/adduser.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增客服</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <!--搜索框开始-->
@@ -32,8 +40,8 @@
                             <input type="hidden" id="group_id" value="0"/>
                             {$groupsoption}
                         </div>
-                    </div>&nbsp&nbsp&nbsp&nbsp&nbsp
-                    <div class="form-group">
+                    </div>
+                    <div class="form-group" style="margin-left: 10px">
                         <div class="input-group col-sm-4 layui-form" style="width: 70px;">
                             <input type="hidden" id="user" value="user_account"/>
                             <select lay-verify="required" lay-filter="user">
@@ -44,11 +52,10 @@
                     </div>
                     <div class="form-group">
                         <!--<label>客服名：</label>-->
-                        <input type="text" class="form-control" id="username" name="user_name">
+                        <input type="text" class="form-control" id="username" name="user_name" style="height: 30px;">
                     </div>
                     <div class="form-group">
-                        <button class="btn btn-primary" type="button" style="margin-top:5px" id="search"><strong>搜 索</strong>
-                        </button>
+                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px" id="search">搜索</button>
                     </div>
                 </div>
             </form>

application/service/controller/Login.php

@@ -19,9 +19,7 @@ class Login extends Controller
         //验证客服IP
         $settings = db('settings')->where('id',1)->find();
         if($settings['kf_white_list'] == 'on'){
-            //$ip = $_SERVER["REMOTE_ADDR"];
-            $ip = request()->ip();
-            return json(['code' => 0, 'data' => $ip, 'msg' => $ip]);
+            $ip = $_SERVER["REMOTE_ADDR"];
             //将ip地址转换成int型
             $intip = bindec(decbin(ip2long($ip)));
             $res = db('iplimit')->where('ip',$ip)->where('object',2)->find();