Jonlin 6 éve
szülő
commit
6eac798beb

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

@@ -112,6 +112,10 @@ class Admins extends Base
                 return json(['code' => -1, 'data' => '', 'msg' => '该管理员已经存在']);
             }
 
+            if ($param['group_id'] == 0) {
+                return json(['code' => -2, 'data' => '', 'msg' => '请选择分组']);
+            }
+
             // 修改用户密码
             if (empty($param['password'])) {
                 unset($param['password']);
@@ -122,7 +126,7 @@ class Admins extends Base
             try {
                 db('admins')->where('id', $param['id'])->update($param);
             } catch (\Exception $e) {
-                return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
+                return json(['code' => -3, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
             return json(['code' => 1, 'data' => '', 'msg' => '编辑管理员成功']);
@@ -130,9 +134,11 @@ class Admins extends Base
 
         $id = input('param.id/d');
         $info = db('admins')->where('id', $id)->find();
+        $admingroup = db('admingroup')->select();
 
         $this->assign([
             'info' => $info,
+            'admingroup' => $admingroup,
             'status' => config('kf_status')
         ]);
         return $this->fetch('editadmin');
@@ -178,7 +184,7 @@ class Admins extends Base
                 $result[$key]['addtime'] = date('Y-m-d H:i:s', $vo['addtime']);
 
                 // 生成操作按钮
-                if (0 != $vo['group_id']) {
+                if (1 != $vo['group_id']) {
                     $result[$key]['operate'] = $this->makeBtnPower($vo['group_id']);
                 }
             }

+ 6 - 5
application/admin/controller/Menu.php

@@ -65,6 +65,7 @@ class Menu extends Base
                 return json(['code' => -2, 'data' => '', 'msg' => '请选择父级菜单']);
             }
             $info = array();
+            $powerinfo = array();
             $info['name_cn'] = $param['name'];
             $info['p_id'] = $param['p_id'];
             $info['sort'] = $param['sort'];
@@ -73,22 +74,22 @@ class Menu extends Base
             }else{
                 $info['url'] = $param['url'];
             }
+            $admingroup = db('admingroup')->where('group_name', '超级管理员')->find();
             try {
-                db('menu')->insert($info);
+                $menu_id = db('menu')->insertGetId($info);
+                $powerinfo['group_id'] = $admingroup['group_id'];
+                $powerinfo['menu_id'] = $menu_id;
+                db('admingrouppower')->insert($powerinfo);
             } catch (\Exception $e) {
                 return json(['code' => -3, 'data' => '', 'msg' => $e->getMessage()]);
             }
-
             return json(['code' => 1, 'data' => '', 'msg' => '添加菜单成功']);
         }
-
         $pmenu = db('menu')->where('p_id',0)->select();
-
         $this->assign([
             'pmenu' => $pmenu,
             'status' => config('kf_status')
         ]);
-
         return $this->fetch();
     }
 

+ 20 - 40
application/admin/controller/Users.php

@@ -66,37 +66,36 @@ class Users extends Base
 
             $param = input('post.');
             unset($param['file']); // 删除layui头像上传隐藏字段
-            // 检测头像
-            if(empty($param['user_avatar'])){
-                return json(['code' => -1, 'data' => '', 'msg' => '请上传头像']);
-            }
 
-            if(empty($param['group_id'])){
-                return json(['code' => -4, 'data' => '', 'msg' => '请选择分组']);
+            // 检测账号
+            if(!empty($param['user_account'])){
+                $user = db('users')->where('user_account', $param['user_account'])->find();
+                if(!empty($user)){
+                    return json(['code' => -1, 'data' => '', 'msg' => '该账号已存在']);
+                }
             }
-
-            $has = db('users')->field('id')->where('user_name', $param['user_name'])->find();
-            if(!empty($has)){
-                return json(['code' => -2, 'data' => '', 'msg' => '该客服已经存在']);
+            // 检测客服工号
+            if(!empty($param['user_job_number'])){
+                $user_job_number = db('users')->where('user_job_number', $param['user_job_number'])->find();
+                if(!empty($user_job_number)){
+                    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' => '该工号已经存在']);
+            if(empty($param['group_id'])){
+                return json(['code' => -3, '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' => '该邮箱已经存在']);
+            // 检测头像
+            if(empty($param['user_avatar'])){
+                return json(['code' => -4, 'data' => '', 'msg' => '请上传头像']);
             }
 
-            $param['user_pwd'] = md5($param['user_pwd'] . config('salt'));
+            $param['user_pwd'] = md5('123456' . config('salt'));
             $param['online'] = 2; // 离线状态
 
             try{
                 db('users')->insert($param);
             }catch(\Exception $e){
-                return json(['code' => -3, 'data' => '', 'msg' => $e->getMessage()]);
+                return json(['code' => -5, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
             return json(['code' => 1, 'data' => '', 'msg' => '添加客服成功']);
@@ -124,25 +123,6 @@ class Users extends Base
             $addar = array();
             $where = array();
             $where['id'] = $param['id'];
-//            $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['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'];
           
@@ -163,7 +143,7 @@ class Users extends Base
         ]);
         return $this->fetch('edituser');
     }
-    
+
     //重置密码为123456
     public function resetPwd(){
         if(request()->isAjax()){

+ 17 - 0
application/admin/view/admins/editadmin.html

@@ -34,6 +34,20 @@
                                 <input id="password" type="text" class="form-control" name="password" placeholder="重新输入则为修改">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">选择角色:</label>
+                            <input type="hidden" id="group_id" name="group_id"/>
+                            <div class="input-group col-sm-4 layui-form">
+                                <select lay-verify="required" lay-filter="group">
+                                    <option value="0">请选择分组</option>
+                                    {if !empty($admingroup)}
+                                    {foreach name="admingroup" item="vo"}
+                                    <option value="{$vo['group_id']}" {if $vo['group_id'] eq $info['group_id']}selected{/if}>{$vo['group_name']}</option>
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </div>
+                        </div>
                         <div class="form-group layui-form-item">
                             <label class="col-sm-3 control-label">是否启用:</label>
                             <div class="input-group col-sm-6">
@@ -68,6 +82,9 @@
 
     layui.use(['form', 'upload'], function(){
         var form = layui.form;
+        form.on('select(group)', function(value){
+            $("#group_id").val(value.value);
+        });
     });
 
     var index = '';

+ 1 - 1
application/admin/view/admins/index.html

@@ -43,7 +43,7 @@
                         <thead>
                         <th data-field="id">管理员ID</th>
                         <th data-field="user_name">管理员名称</th>
-                        <th data-field="group_name">管理员权限</th>
+                        <th data-field="group_name">管理员角色</th>
                         <th data-field="last_login_ip">上次登录ip</th>
                         <th data-field="last_login_time">上次登录时间</th>
                         <th data-field="status">状态</th>

+ 4 - 4
application/admin/view/admins/power.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>权限组列表</title>
+    <title>角色列表</title>
     <link rel="shortcut icon" href="favicon.ico">
     <link href="__CSS__/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="__CSS__/font-awesome.min.css?v=4.4.0" rel="stylesheet">
@@ -16,7 +16,7 @@
     <!-- Panel Other -->
     <div class="ibox float-e-margins">
         <div class="ibox-title">
-            <h5>权限组列表</h5>
+            <h5>角色列表</h5>
         </div>
         <div class="ibox-content">
             <a href="/admin/admins/addpower.html">
@@ -27,8 +27,8 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <th data-field="group_id">权限组ID</th>
-                        <th data-field="group_name">权限组名称</th>
+                        <th data-field="group_id">角色ID</th>
+                        <th data-field="group_name">角色名称</th>
                         <th data-field="addtime">创建时间</th>
                         <th data-field="status">状态</th>
                         <th data-field="operate">操作</th>

+ 7 - 1
application/admin/view/users/adduser.html

@@ -22,6 +22,12 @@
                 <div class="ibox-content">
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('users/adduser')}">
 
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">客服账号:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="useraccount" type="text" class="form-control" name="user_account" 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">
@@ -49,7 +55,7 @@
                         <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" required="" aria-required="true">
+                                <input id="password" type="text" class="form-control" name="user_pwd" required="" aria-required="true" value="123456" disabled="disabled">
                             </div>
                         </div>
                         <div class="form-group">

BIN
public/uploads/20190710/1eb365abe937b3fb5b8b942f39280fd3.jpg


BIN
public/uploads/20190710/a3e8d4459b52936b0fd485d1c9bc34a9.jpg


BIN
public/uploads/20190710/ec3cbab461a84c1f6405d0c64fee66b5.jpg