1

application/admin/controller/Users.php

@@ -124,44 +124,25 @@ class Users extends Base
             $addar = array();
             $where = array();
             $where['id'] = $param['id'];
-            $userspw = db('users')->where($where)->field("user_pwd")->find();
-            $newpwd = md5($param['new_pwd'] . config('salt'));//新密码
-            $oldpwd = md5($param['user_pwd'] . config('salt'));//旧密码
-            $rules = '/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/';
-            $useremail = $param['user_email'];
-            $phone = $param['phone'];
+//            $rules = '/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/';
+//            $useremail = $param['user_email'];
+//            $phone = $param['phone'];
+
+//            if(!preg_match($rules,$useremail)){
+//                return json(['code' => -9, 'data' => '', 'msg' => '请输入正确的邮箱']);
+//            }
+//
+//            if(!preg_match("/^1[34578]\d{9}$/", $phone)){
+//                return json(['code' => -10, 'data' => '', 'msg' => '请输入正确的手机号码']);
+//            }
             
-            // 检测用户新密码与原密码是否重复
-            if(!empty($param['new_pwd'])){
-                if($oldpwd != $userspw['user_pwd']){
-                    return json(['code' => -8, 'data' => '', 'msg' => '原密码不对']);
-                }
-
-                if($newpwd==$userspw['user_pwd']){
-                    return json(['code' => -3, 'data' => '', 'msg' => '新密码与原密码一致']);
-                }
-
-                if($param['renew_pwd'] != $param['new_pwd']){
-                    return json(['code' => -7, 'data' => '', 'msg' => '新密码与确认密码不一致']);
-                }
-                $addar['user_pwd'] = md5($param['new_pwd'] . config('salt'));
-            }
-
-            if(!preg_match($rules,$useremail)){
-                return json(['code' => -9, 'data' => '', 'msg' => '请输入正确的邮箱']);
-            }
-
-            if(!preg_match("/^1[34578]\d{9}$/", $phone)){
-                return json(['code' => -10, 'data' => '', 'msg' => '请输入正确的手机号码']);
-            }
-            
-            if(!empty($param['user_avatar'])){
-                $addar['user_avatar'] = $param['user_avatar'];
-            }
-            $addar['fullname'] = $param['fullname'];
-            $addar['user_email'] = $param['user_email'];
-            $addar['phone'] = $param['phone'];
-            $addar['signature'] = $param['signature'];
+//            if(!empty($param['user_avatar'])){
+//                $addar['user_avatar'] = $param['user_avatar'];
+//            }
+//            $addar['fullname'] = $param['fullname'];
+//            $addar['user_email'] = $param['user_email'];
+//            $addar['phone'] = $param['phone'];
+//            $addar['signature'] = $param['signature'];
             $addar['group_id'] = $param['group_id'];
             $addar['status'] = $param['status'];
           
@@ -170,10 +151,8 @@ class Users extends Base
             }catch(\Exception $e){
                 return json(['code' => -6, 'data' => '', 'msg' => $e->getMessage()]);
             }
-
             return json(['code' => 1, 'data' => '', 'msg' => '编辑客服成功']);
         }
-
         $id = input('param.id/d');
         $info = db('users')->where('id', $id)->find();
 
@@ -184,7 +163,8 @@ class Users extends Base
         ]);
         return $this->fetch('edituser');
     }
-
+    
+    //重置密码为123456
     public function resetPwd(){
         if(request()->isAjax()){
             $id = input('param.id/d');

application/admin/view/admins/editpower.html

@@ -40,7 +40,7 @@
                             <div style="margin:5px 20px;">
                                 {foreach name="$vo['menulist']" item="vo" key="key"}
                                 <input type="hidden" name="{$vo['name_cn']}" value="0">
-                                <input class="menulist" type="checkbox" name="{$vo['name_cn']}" value="{$vo['id']}" {if$vo['power']==1} checked {/if} >{$vo['name_cn']}
+                                <input class="menulist"  type="checkbox" name="{$vo['name_cn']}" value="{$vo['id']}" {if$vo['power']==1} checked {/if} >{$vo['name_cn']}
                                 {/foreach}
                             </div>
                         </div>

application/admin/view/users/edituser.html

@@ -25,16 +25,18 @@
                         <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>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">客服账号：</label>
+                            <div class="input-group col-sm-4">
+                                <input id="user_account" type="text" class="form-control" name="user_account" required="" aria-required="true" value="{$info['user_account']}" disabled="disabled">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服名称：</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">
                             </div>
@@ -48,43 +50,25 @@
                         <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']}">
+                                <input id="user_email" type="text" class="form-control" name="user_email" required="" aria-required="true" value="{$info['user_email']}" disabled="disabled">
                             </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']}">
+                                <input id="phone" type="text" class="form-control" name="phone" required="" aria-required="true" value="{$info['phone']}" disabled="disabled">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名：</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']}">
+                                <input id="fullname" type="text" class="form-control" name="fullname" required="" aria-required="true" value="{$info['fullname']}" disabled="disabled">
                             </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']}">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">原&nbsp;密&nbsp;码：</label>
-                            <div class="input-group col-sm-4">
-                                <input id="user_pwd" type="text" class="form-control" name="user_pwd" placeholder="请输入原密码">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">新&nbsp;密&nbsp;码：</label>
-                            <div class="input-group col-sm-4">
-                                <input id="new_pwd" type="text" class="form-control" name="new_pwd" placeholder="请输入新密码">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">确认密码：</label>
-                            <div class="input-group col-sm-4">
-                                <input id="renew_pwd" type="text" class="form-control" name="renew_pwd" placeholder="请再次输入新密码">
+                                <input id="signature" type="text" class="form-control" name="signature" required="" aria-required="true" value="{$info['signature']}" disabled="disabled">
                             </div>
                         </div>
                         <div class="form-group">

application/service/controller/Login.php

@@ -17,10 +17,10 @@ class Login extends Controller
     public function doLogin()
     {
 
-        $userName = input('post.username');
+        $userAccount = input('post.username');
         $password = input('post.password');
 
-        $user = db('users')->where('user_name', $userName)->find();
+        $user = db('users')->where('user_account', $userAccount)->find();
         if(empty($user)){
             return json(['code' => -1, 'data' => '', 'msg' => '客服不存在']);
         }
@@ -46,7 +46,8 @@ class Login extends Controller
 
         $this->assign([
             'token' => $token,
-            'user_name' => $userName
+            'user_name' => $user[0]['user_name'],
+            'user_account' => $userAccount
         ]);
 
         return json(['code' => 1, 'data' => ['user' => $user[0]], 'msg' => '登录成功']);