Jonlin 6 anos atrás
pai
commit
bb293c1e34

+ 34 - 4
application/admin/controller/Admins.php

@@ -230,14 +230,44 @@ class Admins extends Base
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
-            return json(['code' => 1, 'data' => '', 'msg' => '编辑管理员成功']);
+            return json(['code' => 1, 'data' => '', 'msg' => '编辑权限组成功']);
         }
-
         $id = input('param.id/d');
-        $info = db('admingroup')->where('group_id', $id)->find();
+        $menu = db('menu')->where('p_id',0)->select();
+        $menulist = db('menu')->where('p_id','<>',0)->select();
+        $adminmenu = db('admingrouppower')->where('group_id', $id)->select();
+        for($i=0;$i<count($menu);$i++){
+            $n = 0;
+            for($a=0;$a<count($adminmenu);$a++){
+                if($menu[$i]['id'] == $adminmenu[$a]['menu_id']){
+                    $n = 1;
+                }
+            }
+            if($n == 1){
+                $menu[$i]['power'] = 1;
+            }else{
+                $menu[$i]['power'] = 0;
+            }
+            for($j=0;$j<count($menulist);$j++){
+                $num = 0;
+                for($b=0;$b<count($adminmenu);$b++){
+                    if($menulist[$j]['id'] == $adminmenu[$b]['menu_id']){
+                        $num = 1;
+                    }
+                }
+                if($num == 1){
+                    $menulist[$j]['power'] = 1;
+                }else{
+                    $menulist[$j]['power'] = 0;
+                }
+                if($menu[$i]['id'] == $menulist[$j]['p_id']){
+                    $menu[$i]['menulist'][$j] = $menulist[$j];
+                }
+            }
+        }
 
         $this->assign([
-            'info' => $info,
+            'info' => $menu,
             'status' => config('kf_status')
         ]);
         return $this->fetch();

+ 1 - 0
application/admin/controller/Base.php

@@ -19,6 +19,7 @@ class Base extends Controller
                 }
             }
         }
+
         $this->assign([
             'version' => config('version'),
             'socket' =>config('socket'),

+ 11 - 31
application/admin/view/admins/editpower.html

@@ -12,53 +12,33 @@
     <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
 </head>
 <style>
-    input{
-        margin-top: 5px;
+    .layui-unselect.layui-form-checkbox.layui-form-checked {
+        margin-top: 20px;
+    }
+    .layui-unselect.layui-form-checkbox{
+        margin-top: 20px;
     }
 </style>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
-        <div class="col-sm-8">
+        <div class="col-sm-8" style="width: 75%;">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>编辑权限组</h5>
                 </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>-->
-                        {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 >
+                        <h5>选择权限:</h5>
+                        {if !empty($info)}
+                        {foreach name="info" item="vo" key="key"}
+                        <input type="checkbox" name="{$vo['id']}" title="{$vo['name_cn']}" {if$vo['power']==1} checked {/if} >
                             {foreach name="$vo['menulist']" item="vo" key="key"}
-                            <input type="checkbox" name="{$vo['id']}" title="{$vo['name_cn']}" @if($is_rollball=='1') checked @endif >
+                            <input type="checkbox" name="{$vo['id']}" title="{$vo['name_cn']}" {if$vo['power']==1} checked {/if} >
                             {/foreach}
                         <br>
                         {/foreach}
                         {/if}
-
-                        <!--<input type="checkbox" name="is_rollball" title="是否滚球" @if($is_rollball=='1') checked @endif >-->
                     </form>
                 </div>
             </div>

+ 1 - 1
application/service/controller/Message.php

@@ -26,7 +26,7 @@ class Message extends Base
             'data'=>$message
         ];
 
-        return json_encode($data);
+        return json_encode($data,JSON_UNESCAPED_UNICODE);
     }
 
     // 处理留言