Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

application/admin/controller/Users.php

@@ -135,6 +135,7 @@ class Users extends Base
         if(request()->isAjax()){
 
             $param = input('post.');
+            unset($param['file']); // 删除layui头像上传隐藏字段
 
             if(empty($param['group_id'])){
                 return json(['code' => -2, 'data' => '', 'msg' => '请选择分组']);
@@ -145,6 +146,7 @@ class Users extends Base
             $where['id'] = $param['id'];
             $addar['group_id'] = $param['group_id'];
             $addar['status'] = $param['status'];
+            $addar['user_avatar'] = $param['user_avatar'];
           
             try{
                 db('users')->where('id', $param['id'])->update($addar);

application/admin/view/system/wordslog.html

@@ -17,18 +17,13 @@
     <!-- Panel Other -->
     <div class="ibox float-e-margins">
         <div class="ibox-title">
-            <h5>历史会话</h5>
+            <h5 style="font-weight: 600;">历史会话</h5>
         </div>
         <div class="ibox-content">
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <div class="content clearfix m-b">
-                    <div class="form-group">
-                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
-                            <input type="hidden" id="user_id"/>
-                        {$useroption}
-                        </div>
-                    </div>
+
                     <!--<div class="form-group">-->
                         <!--<label class="col-sm-3 control-label">选择权限：</label>-->
                         <!--<input type="hidden" id="group_id" name="group_id"/>-->
@@ -40,12 +35,6 @@
                             <!--</select>-->
                         <!--</div>-->
                     <!--</div>-->
-                    <div class="form-group">
-                        <div class="input-group col-sm-4 layui-form" style="width: 120px;">
-                            <input type="hidden" id="group_id"/>
-                        {$groupoption}
-                        </div>
-                    </div>
                     &nbsp;&nbsp;
                     <div class="form-group">
                         <label>聊天日期：</label>
@@ -53,6 +42,18 @@
                         <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time());?>" style="width: 100px;">
                     </div>
                     &nbsp;&nbsp;
+                    <div class="form-group">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="user_id"/>
+                            {$useroption}
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="input-group col-sm-4 layui-form" style="width: 120px;">
+                            <input type="hidden" id="group_id"/>
+                            {$groupoption}
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label>访客名称：</label>
                         <input type="text" class="form-control" id="username" name="user_name" style="width: 120px;">
@@ -193,7 +194,7 @@
 
         $("#toExcel").on("click", function () {
             $("#toExcel").val(1);
-            var url = "{:url('system/toexcel')}" + "?pageNumber=1&pageSize=100&toExcel=1";
+            var url = "{:url('system/wordsLog')}" + "?pageNumber=1&pageSize=100&toExcel=1";
             window.open(url);
             return false;
         });

application/admin/view/users/edituser.html

@@ -25,6 +25,10 @@
                         <div class="form-group layui-form-item form-inline" style="height: 60px;">
                             <input type="hidden" name="user_avatar" id="user_avatar"/>
                             <label class="col-sm-3 control-label">客服头像：</label>
+                            <div class="input-group col-sm-2">
+                                <button type="button" class="layui-btn layui-btn-small" id="up-avatar">
+                                    <i class="layui-icon"></i>上传图片</button>
+                            </div>
                             <div class="input-group col-sm-3" id="avatar">
                                 <img src="{$info['user_avatar']}" width="40px" height="40px"/>
                             </div>

application/service/controller/Login.php

@@ -51,11 +51,11 @@ class Login extends Controller
             'expire_time' => time()
         ];
         db('users')->where('id', $user['id'])->update($param);
-        $user = db('users')->field('id,user_account,user_name,user_avatar,phone,group_id,token')->where('id', $user['id'])->select();
+        //$user = db('users')->field('id,user_account,user_name,user_avatar,phone,group_id,token')->where('id', $user['id'])->select();
+        $user = db('users')->where('id', $user['id'])->select();
         $group = db('groups')->where('id', $user[0]['group_id'])->find();
         $user[0]['group'] = $group['name'];
 
-
         $this->assign([
             'token' => $token,
             'user_name' => $user[0]['user_name'],

application/service/controller/Services.php

@@ -86,38 +86,33 @@ class Services extends Base
 
             //$user_id = input("param.user_id/s");
             $user_name = input("param.user_name/s");
-            $user_job_number = input("param.user_job_number/s");
             $user_email = input("param.user_email/s");
             $phone = input("param.phone/s");
-            $user_avatar = input("param.user_avatar/s");
+            $signature = input("param.signature/s");
+            $fullname = input("param.fullname/s");
 
-            $username = db('users')->where('user_name', $user_name)->where('id', '<>', $user_id)->find();
-            if(!empty($username)){
-                return json(['code' => -1, 'data' => '', 'msg' => '该客服已经存在']);
-            }
-
-            $userjobnumber = db('users')->where('user_job_number', $user_job_number)->where('id', '<>', $user_id)->find();
-            if(!empty($userjobnumber)){
-                return json(['code' => -2, 'data' => '', 'msg' => '该工号已经存在']);
-            }
+//            $username = db('users')->where('user_name', $user_name)->where('id', '<>', $user_id)->find();
+//            if(!empty($username)){
+//                return json(['code' => -1, 'data' => '', 'msg' => '该客服已经存在']);
+//            }
 
-            $useremail = db('users')->where('user_email', $user_email)->where('id', '<>', $user_id)->find();
-            if(!empty($useremail)){
-                return json(['code' => -3, 'data' => '', 'msg' => '该邮箱已经存在']);
-            }
+//            $useremail = db('users')->where('user_email', $user_email)->where('id', '<>', $user_id)->find();
+//            if(!empty($useremail)){
+//                return json(['code' => -3, 'data' => '', 'msg' => '该邮箱已经存在']);
+//            }
 
 
             // 更新客服信息
             $param = [
                 'user_name' => $user_name,
-                'user_job_number' => $user_job_number,
                 'user_email' => $user_email,
-                'user_avatar' => $user_avatar,
+                'signature' => $signature,
+                'fullname' => $fullname,
                 'phone' => $phone
             ];
             db('users')->where('id', $user_id)->update($param);
 
-            return json(['code' => 1, 'data' => url('service/index'), 'msg' => '修改成功']);
+            return json(['code' => 1, 'data' => '', 'msg' => '修改成功']);
         }
     }