1

application/admin/controller/Users.php

@@ -110,12 +110,17 @@ class Users extends Base
             if(empty($param['group_id'])){
                 return json(['code' => -3, 'data' => '', 'msg' => '请选择分组']);
             }
+            // 检测密码
+            $n = preg_match_all("/^[a-zA-Z\d_]{6,}$/",$param['user_pwd'],$array);
+            if($n != 1){
+                return json(['code' => -8, 'data' => '', 'msg' => '密码长度不够，请重新输入']);
+            }
             // 检测头像
 //            if(empty($param['user_avatar'])){
 //                return json(['code' => -4, 'data' => '', 'msg' => '请上传头像']);
 //            }
 
-            $param['user_pwd'] = md5('123456' . config('salt'));
+            $param['user_pwd'] = md5($param['user_pwd'] . config('salt'));
             $param['online'] = 2; // 离线状态
 
             try{
@@ -143,13 +148,38 @@ class Users extends Base
             $param = input('post.');
             unset($param['file']); // 删除layui头像上传隐藏字段
 
+            // 检测客服工号
+            if(!empty($param['user_job_number'])){
+                $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' => '该工号已经存在']);
+                }
+            }
+            if(empty($param['group_id'])){
+                return json(['code' => -3, 'data' => '', 'msg' => '请选择分组']);
+            }
+            // 检测密码
+            if(!empty($param['user_pwd'])){
+                $n = preg_match_all("/^[a-zA-Z\d_]{6,}$/",$param['user_pwd'],$array);
+                if($n != 1){
+                    return json(['code' => -8, 'data' => '', 'msg' => '密码长度不够，请重新输入']);
+                }
+            }
+
             if(empty($param['group_id'])){
                 return json(['code' => -2, 'data' => '', 'msg' => '请选择分组']);
             }
 
             $addar = array();
-            $where = array();
-            $where['id'] = $param['id'];
+            $addar['user_name'] = $param['user_name'];
+            $addar['user_job_number'] = $param['user_job_number'];
+            if(!empty($param['user_pwd'])){
+                $addar['user_pwd'] = md5($param['user_pwd'] . config('salt'));
+            }
+            $addar['user_email'] = $param['user_email'];
+            $addar['phone'] = $param['phone'];
+            $addar['fullname'] = $param['fullname'];
+            $addar['signature'] = $param['signature'];
             $addar['group_id'] = $param['group_id'];
             $addar['status'] = $param['status'];
             if(!empty($param['user_avatar'])){
@@ -230,9 +260,9 @@ class Users extends Base
 //        $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 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 = '<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 style="margin-left:5px;" href="javascript:userDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';

application/admin/view/users/adduser.html

@@ -40,6 +40,22 @@
                 <div class="ibox-content">
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('users/adduser')}">
 
+                        <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-1">
+                                <button type="button" class="layui-btn layui-btn-small" id="up-avatar">
+                                    <i class="layui-icon"></i>上传图片</button>
+                            </div>
+                            <span>建议上传180px*180px</span>
+
+                            <button type="button" class="layui-btn layui-btn-small" id="" onclick="checkImg()">选择图片</button>
+
+                            <div class="input-group col-sm-3" id="avatar">
+                                <img src="" id="onChoiceImg" height="40px">
+                            </div>
+                        </div>
+
                         <div class="form-group">
                             <label class="col-sm-3 control-label">客服账号 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
@@ -58,6 +74,12 @@
                                 <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">登录密码 <span style="color: red;">*</span>：</label>
+                            <div class="input-group col-sm-4">
+                                <input id="password" type="text" class="form-control" name="user_pwd" required="" aria-required="true" placeholder="密码长度不得低于6位">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">客服邮箱：</label>
                             <div class="input-group col-sm-4">
@@ -77,9 +99,9 @@
                             </div>
                         </div>
                         <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">
-                                <input id="password" type="text" class="form-control" name="user_pwd" required="" aria-required="true" value="123456" disabled="disabled">
+                                <input id="signature" type="text" class="form-control" name="signature" aria-required="true">
                             </div>
                         </div>
                         <div class="form-group">
@@ -106,21 +128,6 @@
                                 {/if}
                             </div>
                         </div>
-                        <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-1">
-                                <button type="button" class="layui-btn layui-btn-small" id="up-avatar">
-                                    <i class="layui-icon"></i>上传图片</button>
-                            </div>
-                            <span>建议上传180px*180px</span>
-
-                            <button type="button" class="layui-btn layui-btn-small" id="" onclick="checkImg()">选择图片</button>
-
-                            <div class="input-group col-sm-3" id="avatar">
-                                <img src="" id="onChoiceImg" height="40px">
-                            </div>
-                        </div>
 
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">

application/admin/view/users/edituser.html

@@ -64,39 +64,45 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">客服昵称：</label>
+                            <label class="col-sm-3 control-label">客服昵称 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
-                                <input id="user_name" type="text" class="form-control" name="user_name" required="" aria-required="true" value="{$info['user_name']}" disabled="disabled">
+                                <input id="user_name" type="text" class="form-control" name="user_name" required="" aria-required="true" value="{$info['user_name']}">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">客服工号：</label>
+                            <label class="col-sm-3 control-label">客服工号 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
-                                <input id="user_job_number" type="text" class="form-control" name="user_job_number" required="" aria-required="true" value="{$info['user_job_number']}" disabled="disabled">
+                                <input id="user_job_number" 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="password" type="text" class="form-control" name="user_pwd" aria-required="true" placeholder="重新输入则为修改">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">客服邮箱：</label>
                             <div class="input-group col-sm-4">
-                                <input id="user_email" type="text" class="form-control" name="user_email" required="" aria-required="true" value="{$info['user_email']}" disabled="disabled">
+                                <input id="user_email" type="text" class="form-control" name="user_email" 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']}" disabled="disabled">
+                                <input id="phone" type="text" class="form-control" name="phone" aria-required="true" value="{$info['phone']}">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">真实姓名：</label>
                             <div class="input-group col-sm-4">
-                                <input id="fullname" type="text" class="form-control" name="fullname" required="" aria-required="true" value="{$info['fullname']}" disabled="disabled">
+                                <input id="fullname" type="text" class="form-control" name="fullname" aria-required="true" value="{$info['fullname']}">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">个性签名：</label>
                             <div class="input-group col-sm-4">
-                                <input id="signature" type="text" class="form-control" name="signature" required="" aria-required="true" value="{$info['signature']}" disabled="disabled">
+                                <input id="signature" type="text" class="form-control" name="signature" aria-required="true" value="{$info['signature']}">
                             </div>
                         </div>
                         <div class="form-group">
@@ -127,7 +133,7 @@
 
                         <div class="form-group">
                             <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>
+                                <!--<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>