Jonlin 6 лет назад
Родитель
Сommit
136cc10952

+ 3 - 2
application/admin/controller/Admins.php

@@ -133,6 +133,7 @@ class Admins extends Base
     {
     {
         if(request()->isAjax()){
         if(request()->isAjax()){
             $id = input('param.id/d');
             $id = input('param.id/d');
+            //return $id;
 
 
             try{
             try{
                 db('admins')->where('id', $id)->delete();
                 db('admins')->where('id', $id)->delete();
@@ -140,7 +141,7 @@ class Admins extends Base
                 return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
                 return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
             }
             }
 
 
-            return json(['code' => 1, 'data' => '', 'msg' => '删除客服成功']);
+            return json(['code' => 1, 'data' => '', 'msg' => '删除管理员成功']);
         }
         }
     }
     }
 
 
@@ -150,7 +151,7 @@ class Admins extends Base
         $operate = '<a href="' . url('admins/editadmin', ['id' => $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 .= '<a href="javascript:userDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
+        $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> ';
 
 
         return $operate;
         return $operate;

+ 29 - 0
application/admin/controller/Users.php

@@ -12,7 +12,14 @@ class Users extends Base
     public function index()
     public function index()
     {
     {
         if(request()->isAjax()){
         if(request()->isAjax()){
+            $param  = input('param.');
+            $limit  = $param['pageSize'];
+            $offset = (($param['pageNumber'] - 1) * $limit);
+            if (empty($param['searchText']) === false) {
+                $user_name = $param['searchText'];
+            }
 
 
+//            $result = db('users')->where('user_name',$user_name)->order('id', 'desc')->select();
             $result = db('users')->order('id', 'desc')->select();
             $result = db('users')->order('id', 'desc')->select();
             foreach($result as $key=>$vo){
             foreach($result as $key=>$vo){
                 // 优化显示头像
                 // 优化显示头像
@@ -74,6 +81,16 @@ class Users extends Base
                 return json(['code' => -2, 'data' => '', 'msg' => '该客服已经存在']);
                 return json(['code' => -2, 'data' => '', 'msg' => '该客服已经存在']);
             }
             }
 
 
+            $user_job_number = db('users')->field('id')->where('user_job_number', $param['user_job_number'])->find();
+            if(!empty($user_job_number)){
+                return json(['code' => -2, 'data' => '', 'msg' => '该工号已经存在']);
+            }
+
+            $user_email = db('users')->field('id')->where('user_email', $param['user_email'])->find();
+            if(!empty($user_email)){
+                return json(['code' => -2, 'data' => '', 'msg' => '该邮箱已经存在']);
+            }
+
             $param['user_pwd'] = md5($param['user_pwd'] . config('salt'));
             $param['user_pwd'] = md5($param['user_pwd'] . config('salt'));
             $param['online'] = 2; // 离线状态
             $param['online'] = 2; // 离线状态
 
 
@@ -112,6 +129,18 @@ class Users extends Base
                 return json(['code' => -1, 'data' => '', 'msg' => '该客服已经存在']);
                 return json(['code' => -1, 'data' => '', 'msg' => '该客服已经存在']);
             }
             }
 
 
+            // 检测用户修改的工号是否重复
+            $user_job_number = db('users')->where('user_job_number', $param['user_job_number'])->where('id', '<>', $param['id'])->find();
+            if(!empty($user_job_number)){
+                return json(['code' => -2, 'data' => '', 'msg' => '该工号已经存在']);
+            }
+
+            // 检测用户修改的邮箱是否重复
+            $user_email = db('users')->where('user_email', $param['user_email'])->where('id', '<>', $param['id'])->find();
+            if(!empty($user_email)){
+                return json(['code' => -2, 'data' => '', 'msg' => '该邮箱已经存在']);
+            }
+
             // 修改用户头像
             // 修改用户头像
             if(empty($param['user_avatar'])){
             if(empty($param['user_avatar'])){
                 unset($param['user_avatar']);
                 unset($param['user_avatar']);

+ 7 - 8
application/admin/view/admins/index.html

@@ -106,24 +106,23 @@
         $("#search").bind("click", initTable);
         $("#search").bind("click", initTable);
     });
     });
 
 
-    function userDel(id){
-        layer.confirm('确认删除此客服?', {icon: 3, title:'提示'}, function(index){
+    function adminDel(id) {
+        layer.confirm('确认删除管理员?', {icon: 3, title: '提示'}, function (index) {
             //do something
             //do something
-            $.getJSON("{:url('users/delUser')}", {'id' : id}, function(res){
-                if(1 == res.code){
-                    layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
+            $.getJSON("{:url('admins/delAdmin')}", {'id': id}, function (res) {
+                if (1 == res.code) {
+                    layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function () {
                         initTable();
                         initTable();
                     });
                     });
-                }else if(111 == res.code){
+                } else if (111 == res.code) {
                     window.location.reload();
                     window.location.reload();
-                }else{
+                } else {
                     layer.alert(res.msg, {title: '友情提示', icon: 2});
                     layer.alert(res.msg, {title: '友情提示', icon: 2});
                 }
                 }
             });
             });
 
 
             layer.close(index);
             layer.close(index);
         })
         })
-
     }
     }
 </script>
 </script>
 </body>
 </body>

+ 18 - 0
application/admin/view/users/adduser.html

@@ -28,6 +28,24 @@
                                 <input id="username" type="text" class="form-control" name="user_name" required="" aria-required="true">
                                 <input id="username" type="text" class="form-control" name="user_name" required="" aria-required="true">
                             </div>
                             </div>
                         </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服工号:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="userjobnumber" type="text" class="form-control" name="user_job_number" required="" aria-required="true">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服邮箱:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="useremail" type="text" class="form-control" name="user_email" required="" aria-required="true">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服电话:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="phone" type="text" class="form-control" name="phone" required="" aria-required="true">
+                            </div>
+                        </div>
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-sm-3 control-label">登录密码:</label>
                             <label class="col-sm-3 control-label">登录密码:</label>
                             <div class="input-group col-sm-4">
                             <div class="input-group col-sm-4">

+ 21 - 2
application/admin/view/users/edituser.html

@@ -28,6 +28,24 @@
                                 <input id="username" type="text" class="form-control" name="user_name" required="" aria-required="true" value="{$info['user_name']}">
                                 <input id="username" type="text" class="form-control" name="user_name" required="" aria-required="true" value="{$info['user_name']}">
                             </div>
                             </div>
                         </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服工号:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="userjobnumber" type="text" class="form-control" name="user_job_number" required="" aria-required="true" value="{$info['user_job_number']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服邮箱:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="useremail" type="text" class="form-control" name="user_email" required="" aria-required="true" value="{$info['user_email']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服电话:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="phone" type="text" class="form-control" name="phone" required="" aria-required="true" value="{$info['phone']}">
+                            </div>
+                        </div>
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-sm-3 control-label">登录密码:</label>
                             <label class="col-sm-3 control-label">登录密码:</label>
                             <div class="input-group col-sm-4">
                             <div class="input-group col-sm-4">
@@ -71,8 +89,9 @@
                         </div>
                         </div>
 
 
                         <div class="form-group">
                         <div class="form-group">
-                            <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                            <div class="col-sm-4 col-sm-offset-6" style="margin-left: 20%;">
+                                <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>
                             </div>
                             </div>
                         </div>
                         </div>
                     </form>
                     </form>

+ 4 - 1
application/admin/view/users/index.html

@@ -37,9 +37,12 @@
                 <div class="example">
                 <div class="example">
                     <table id="cusTable">
                     <table id="cusTable">
                         <thead>
                         <thead>
-                        <th data-field="id">客服ID</th>
+                        <!--<th data-field="id">客服ID</th>-->
                         <th data-field="user_name">客服名称</th>
                         <th data-field="user_name">客服名称</th>
+                        <th data-field="user_job_number">客服工号</th>
+                        <th data-field="user_email">客服邮箱</th>
                         <th data-field="user_avatar">客服头像</th>
                         <th data-field="user_avatar">客服头像</th>
+                        <th data-field="phone">客服电话</th>
                         <th data-field="group">所属组别</th>
                         <th data-field="group">所属组别</th>
                         <th data-field="status">客服状态</th>
                         <th data-field="status">客服状态</th>
                         <!--<th data-field="online">是否在线</th>-->
                         <!--<th data-field="online">是否在线</th>-->

+ 1 - 1
application/service/controller/Login.php

@@ -29,7 +29,7 @@ class Login extends Controller
             if(md5($password . config('salt')) != $user['user_pwd']){
             if(md5($password . config('salt')) != $user['user_pwd']){
                 return json(['code' => -2, 'data' => '', 'msg' => '密码错误']);
                 return json(['code' => -2, 'data' => '', 'msg' => '密码错误']);
             }
             }
-            
+
 
 
             // 登陆成功 生成token
             // 登陆成功 生成token
             $module = mt_rand(100000,999999);
             $module = mt_rand(100000,999999);

+ 4 - 56
application/service/controller/Message.php

@@ -21,9 +21,9 @@ class Message extends Base
         if(request()->isPost()){
         if(request()->isPost()){
 
 
             //客服id
             //客服id
-            $user_id = input('post.user_id');
+            $user_id = 2;
             //留言id
             //留言id
-            $message_id = input('post.message_id');
+            $message_id = 14;
 
 
             $user = db('users')->where('id', $user_id)->find();
             $user = db('users')->where('id', $user_id)->find();
             if(empty($user)){
             if(empty($user)){
@@ -37,65 +37,13 @@ class Message extends Base
             // 更新留言状态
             // 更新留言状态
             $param = [
             $param = [
                 'user_id' => $user_id,
                 'user_id' => $user_id,
+                'message_status' => 1,
                 'dealWith_time' => time()
                 'dealWith_time' => time()
             ];
             ];
             db('accountsmessage')->where('message_id', $message_id)->update($param);
             db('accountsmessage')->where('message_id', $message_id)->update($param);
 
 
-            return json(['code' => 1, 'data' => url('message/index'), 'msg' => '登录成功']);
+            return json(['code' => 1, 'data' => url('message/index'), 'msg' => '处理成功']);
         }
         }
     }
     }
 
 
-    // 获取聊天记录
-    public function getChatLog()
-    {
-        if(request()->isAjax()){
-
-            $param = input('param.');
-
-            $limit = 10; // 一次显示10 条聊天记录
-            $offset = ($param['page'] - 1) * $limit;
-
-            $logs = db('chat_log')->where(function($query) use($param){
-                $query->where('from_id', $param['uid'])->where('to_id', 'KF' . cookie('l_user_id'));
-            })->whereOr(function($query) use($param){
-                $query->where('from_id', 'KF' . cookie('l_user_id'))->where('to_id', $param['uid']);
-            })->limit($offset, $limit)->order('id', 'desc')->select();
-
-            $total =  db('chat_log')->where(function($query) use($param){
-                $query->where('from_id', $param['uid'])->where('to_id', 'KF' . cookie('l_user_id'));
-            })->whereOr(function($query) use($param){
-                $query->where('from_id', 'KF' . cookie('l_user_id'))->where('to_id', $param['uid']);
-            })->count();
-
-            foreach($logs as $key=>$vo){
-
-                $logs[$key]['type'] = 'user';
-                $logs[$key]['time_line'] = date('Y-m-d H:i:s', $vo['time_line']);
-
-                if($vo['from_id'] == 'KF' . cookie('l_user_id')){
-                    $logs[$key]['type'] = 'mine';
-                }
-            }
-
-            return json(['code' => 1, 'data' => $logs, 'msg' => intval($param['page']), 'total' => ceil($total / $limit)]);
-        }
-    }
-
-    // ip 定位
-    public function getCity()
-    {
-        $ip = input('param.ip');
-
-        $ip2region = new \Ip2Region();
-        $info = $ip2region->btreeSearch($ip);
-
-        $city = explode('|', $info['region']);
-
-        if(0 != $info['city_id']){
-            return json(['code' => 1, 'data' => $city['2'] . $city['3'] . $city['4'], 'msg' => 'ok']);
-        }else{
-
-            return json(['code' => 1, 'data' => $city['0'], 'msg' => 'ok']);
-        }
-    }
 }
 }

BIN
public/uploads/20190628/0f24febff80d0fac0975d6bbc15266f6.jpg


BIN
public/uploads/20190628/330a62e9fc212b46ef41e18e4f6b7981.jpg


BIN
public/uploads/20190628/83ce184aa0808cd430cb0be2976b1325.jpg