1

application/admin/controller/Admins.php

@@ -19,7 +19,7 @@ class Admins extends Base
 //        $admin_id = explode('/',base64_decode($token))['2'];
 //        $adminInfo = db('admins')->where('id', $admin_id)->find();
 
-        if(request()->isAjax()){
+        if (request()->isAjax()) {
 
             $param = input('param.');
 
@@ -32,11 +32,11 @@ class Admins extends Base
             }
 
             $result = db('admins')->where($where)->limit($offset, $limit)->select();
-            foreach($result as $key=>$vo){
+            foreach ($result as $key => $vo) {
                 // 优化显示状态
-                if(1 == $vo['status']){
+                if (1 == $vo['status']) {
                     $result[$key]['status'] = '<span class="label label-primary">启用</span>';
-                }else{
+                } else {
                     $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
                 }
 
@@ -44,7 +44,7 @@ class Admins extends Base
                 $result[$key]['last_login_time'] = empty($vo['last_login_time']) ? '' : date('Y-m-d H:i:s', $vo['last_login_time']);
 
                 // 生成操作按钮
-                if(1 != $vo['id']){
+                if (1 != $vo['id']) {
                     $result[$key]['operate'] = $this->makeBtn($vo['id']);
                 }
             }
@@ -62,20 +62,20 @@ class Admins extends Base
     // 添加管理员
     public function addAdmin()
     {
-        if(request()->isPost()){
+        if (request()->isPost()) {
 
             $param = input('post.');
 
             $has = db('admins')->field('id')->where('user_name', $param['user_name'])->find();
-            if(!empty($has)){
+            if (!empty($has)) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该管理员已经存在']);
             }
 
             $param['password'] = md5($param['password'] . config('salt'));
 
-            try{
+            try {
                 db('admins')->insert($param);
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
@@ -92,26 +92,26 @@ class Admins extends Base
     // 编辑管理员
     public function editAdmin()
     {
-        if(request()->isAjax()){
+        if (request()->isAjax()) {
 
             $param = input('post.');
 
             // 检测用户修改的管理员是否重复
             $has = db('admins')->where('user_name', $param['user_name'])->where('id', '<>', $param['id'])->find();
-            if(!empty($has)){
+            if (!empty($has)) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该管理员已经存在']);
             }
 
             // 修改用户密码
-            if(empty($param['password'])){
+            if (empty($param['password'])) {
                 unset($param['password']);
-            }else{
+            } else {
                 $param['password'] = md5($param['password'] . config('salt'));
             }
 
-            try{
+            try {
                 db('admins')->where('id', $param['id'])->update($param);
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
@@ -131,13 +131,13 @@ class Admins extends Base
     // 删除管理员
     public function delAdmin()
     {
-        if(request()->isAjax()){
+        if (request()->isAjax()) {
             $id = input('param.id/d');
             //return $id;
 
-            try{
+            try {
                 db('admins')->where('id', $id)->delete();
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
@@ -148,7 +148,7 @@ class Admins extends Base
     // 权限组
     public function power()
     {
-        if(request()->isAjax()){
+        if (request()->isAjax()) {
 
             $param = input('param.');
 
@@ -156,11 +156,11 @@ class Admins extends Base
             $offset = ($param['pageNumber'] - 1) * $limit;
 
             $result = db('admingroup')->limit($offset, $limit)->select();
-            foreach($result as $key=>$vo){
+            foreach ($result as $key => $vo) {
                 // 优化显示状态
-                if(1 == $vo['status']){
+                if (1 == $vo['status']) {
                     $result[$key]['status'] = '<span class="label label-primary">启用</span>';
-                }else{
+                } else {
                     $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
                 }
 
@@ -168,7 +168,7 @@ class Admins extends Base
                 $result[$key]['addtime'] = date('Y-m-d H:i:s', $vo['addtime']);
 
                 // 生成操作按钮
-                if(0 != $vo['group_id']){
+                if (0 != $vo['group_id']) {
                     $result[$key]['operate'] = $this->makeBtnPower($vo['group_id']);
                 }
             }
@@ -183,20 +183,20 @@ class Admins extends Base
     }
 
     // 添加权限组
-    public function addPower()
+    public function addpower()
     {
-        if(request()->isPost()){
+        if (request()->isPost()) {
 
             $param = input('post.');
 
             $has = db('admingroup')->field('group_id')->where('group_name', $param['group_name'])->find();
-            if(!empty($has)){
+            if (!empty($has)) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该权限组已经存在']);
             }
 
-            try{
+            try {
                 db('admingroup')->insert($param);
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
@@ -211,22 +211,22 @@ class Admins extends Base
     }
 
     // 编辑权限组
-    public function editPower()
+    public function editpower()
     {
-        if(request()->isAjax()){
+        if (request()->isAjax()) {
 
             $param = input('post.');
             //return $param;
 
             // 检测用户修改的权限组是否重复
             $has = db('admingroup')->where('group_name', $param['group_name'])->where('group_id', '<>', $param['group_id'])->find();
-            if(!empty($has)){
+            if (!empty($has)) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该权限组已经存在']);
             }
 
-            try{
+            try {
                 db('admingroup')->where('group_id', $param['group_id'])->update($param);
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
@@ -246,13 +246,13 @@ class Admins extends Base
     // 删除权限组
     public function delPower()
     {
-        if(request()->isAjax()){
+        if (request()->isAjax()) {
             $id = input('param.id/d');
             //return $id;
 
-            try{
+            try {
                 db('admingroup')->where('group_id', $id)->delete();
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
@@ -271,7 +271,6 @@ class Admins extends Base
 
         return $operate;
     }
-<<<<<<< HEAD
 
     // 生成权限组操作按钮
     private function makeBtnPower($id)
@@ -285,6 +284,3 @@ class Admins extends Base
         return $operate;
     }
 }
-=======
-}
->>>>>>> d7221b8b22f990bd668469d6f4bdea47bec592b5

application/admin/view/admins/editpower.html

@@ -11,6 +11,11 @@
     <link href="__JS__/layui/css/layui.css" rel="stylesheet">
     <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
 </head>
+<style>
+    input{
+        margin-top: 5px;
+    }
+</style>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
@@ -21,28 +26,39 @@
                 </div>
                 <div class="ibox-content">
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('admins/editpower')}">
-                        <input type="hidden" value="{$info['group_id']}" name="group_id"/>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">权限组名称：</label>
-                            <div class="input-group col-sm-4">
-                                <input id="group_name" type="text" class="form-control" name="group_name" required="" aria-required="true" value="{$info['group_name']}">
-                            </div>
-                        </div>
-                        <div class="form-group layui-form-item">
-                            <label class="col-sm-3 control-label">是否启用：</label>
-                            <div class="input-group col-sm-6">
-                                {if !empty($status)}
-                                {foreach name="status" item="vo" key="key"}
-                                <input type="radio" name="status" value="{$key}" title="{$vo}" {if $key eq $info['status']}checked{/if}>
-                                {/foreach}
-                                {/if}
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
-                            </div>
-                        </div>
+                        <!--<input type="hidden" value="{$info['group_id']}" name="group_id"/>-->
+                        <!--<div class="form-group">-->
+                            <!--<label class="col-sm-3 control-label">权限组名称：</label>-->
+                            <!--<div class="input-group col-sm-4">-->
+                                <!--<input id="group_name" type="text" class="form-control" name="group_name" required="" aria-required="true" value="{$info['group_name']}">-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="form-group layui-form-item">-->
+                            <!--<label class="col-sm-3 control-label">是否启用：</label>-->
+                            <!--<div class="input-group col-sm-6">-->
+                                <!--{if !empty($status)}-->
+                                <!--{foreach name="status" item="vo" key="key"}-->
+                                <!--<input type="radio" name="status" value="{$key}" title="{$vo}" {if $key eq $info['status']}checked{/if}>-->
+                                <!--{/foreach}-->
+                                <!--{/if}-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="form-group">-->
+                            <!--<div class="col-sm-4 col-sm-offset-6">-->
+                                <!--<button class="btn btn-primary" type="submit">提交</button>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        {if !empty($menu)}
+                        {foreach name="menu" item="vo" key="key"}
+                        <input type="checkbox" name="{$vo['id']}" title="{$vo['name_cn']}" @if($is_rollball=='1') checked @endif >
+                            {foreach name="$vo['menulist']" item="vo" key="key"}
+                            <input type="checkbox" name="{$vo['id']}" title="{$vo['name_cn']}" @if($is_rollball=='1') checked @endif >
+                            {/foreach}
+                        <br>
+                        {/foreach}
+                        {/if}
+
+                        <!--<input type="checkbox" name="is_rollball" title="是否滚球" @if($is_rollball=='1') checked @endif >-->
                     </form>
                 </div>
             </div>

application/service/controller/Message.php

@@ -19,8 +19,14 @@ class Message extends Base
             }
         }
         $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->select();
-        //print_r($message);
-        return $message;
+
+        $data = [
+            'status'=>1,
+            'msg'=>'成功',
+            'data'=>$message
+        ];
+
+        return json_encode($data);
     }
 
     // 处理留言