zxb пре 6 година
родитељ
комит
1c6c5e0a68

+ 16 - 0
app/admin/controller/JiamengController.php

@@ -615,5 +615,21 @@ class JiamengController extends AdminBaseController{
         }
     }
 
+    //2020-05-06 显示类目分类。
+    public function showcategory(){
+        
+        $cates = Db::name('category')->select();
+        $catelist = array();
+        foreach($cates as $k=>$v){
+            $catelist[$v['id']] = $v['catname'];
+        }
+
+      
+        $this->assign('catelist',$catelist);
+        $this->assign('page','');
+        return $this->fetch();
+
+    }
+
 }
 ?>

+ 4 - 0
public/themes/admin_simpleboot3/admin/rbac/index.html

@@ -37,7 +37,11 @@
 								<span class="btn btn-xs btn-primary disabled">{:lang('EDIT')}</span>
 								<span class="btn btn-xs btn-danger disabled">{:lang('DELETE')}</span>
 							<else />
+
 								<a class="btn btn-xs btn-primary" href="{:url('Rbac/authorize',array('id'=>$vo['id']))}">{:lang('ROLE_SETTING')}</a>
+
+								<!-- <a class="btn btn-xs btn-primary" href="{:url('jiameng/showcategory',array('id'=>$vo['id']))}">类目设置</a> -->
+
 								<!-- <a href="javascript:openIframeDialog('{:url('rbac/member',array('id'=>$vo['id']))}','成员管理');">成员管理</a>| -->
 								<a class="btn btn-xs btn-primary" href="{:url('Rbac/roleedit',array('id'=>$vo['id']))}">{:lang('EDIT')}</a>
 								<a class="btn btn-xs btn-danger js-ajax-delete" class="" href="{:url('Rbac/roledelete',array('id'=>$vo['id']))}">{:lang('DELETE')}</a>

+ 43 - 1
public/themes/admin_simpleboot3/admin/user/add.html

@@ -29,12 +29,28 @@
 				<label for="input-user_email" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('ROLE')}</label>
 				<div class="col-md-6 col-sm-10">
 					<foreach name="roles" item="vo">
+						<label class="checkbox-inline" id="role_id">
+                             
+								<input value="{$vo.id}" type="checkbox" name="role_id[]" <if condition="cmf_get_current_admin_id() neq 1 && $vo['id'] eq 1">disabled="true"</if>>{$vo.name}
+
+
+						</label>
+					</foreach>
+				</div>
+			</div>
+           
+           <div class="form-group" id="showcategory" style="display: none;">
+				<label for="input-user_email" class="col-sm-2 control-label"><span class="form-required"></span>类目</label>
+				<div class="col-md-6 col-sm-10">
+			
+					<foreach name="catelist" item="vo" key="k">
 						<label class="checkbox-inline">
-							<input value="{$vo.id}" type="checkbox" name="role_id[]" <if condition="cmf_get_current_admin_id() neq 1 && $vo['id'] eq 1">disabled="true"</if>>{$vo.name}
+							<input value="{$k}" type="checkbox" name="role_id[]" <if condition="cmf_get_current_admin_id() neq 1 && $vo['id'] eq 1">disabled="true"</if>>{$vo}
 						</label>
 					</foreach>
 				</div>
 			</div>
+
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
 					<button type="submit" class="btn btn-primary js-ajax-submit">{:lang('ADD')}</button>
@@ -43,5 +59,31 @@
 		</form>
 	</div>
 	<script src="__STATIC__/js/admin.js"></script>
+	<script>
+
+		$('#role_id input').each(function(index,element){
+				
+				 //通过判断是否是最好的一个节点,并且等于编辑人员“3”,就默认显示,否则隐藏
+			
+			   if(index==0 && $(this).attr('value')==3){
+			   	  $('#showcategory').show();
+			   };   
+
+			  $(this).click(function(){
+			  	   if($(this).attr('value')==3){
+			  	      $('#showcategory').show();
+			       }else{
+			  	     $('#showcategory').hide();
+			       }
+			  });
+			  
+              
+		});
+
+		
+
+	</script>
+
+
 </body>
 </html>

+ 2 - 2
vendor/thinkcmf/cmf-app/src/admin/controller/RbacController.php

@@ -231,7 +231,7 @@ class RbacController extends AdminBaseController
      * @return mixed
      */
     public function authorize()
-    {
+    {          
         $content = hook_one('admin_rbac_authorize_view');
 
         if (!empty($content)) {
@@ -272,7 +272,7 @@ class RbacController extends AdminBaseController
         $tree->init($result);
 
         $category = $tree->getTree(0, $str);
-
+        //var_dump($result);die();
         $this->assign("category", $category);
         $this->assign("roleId", $roleId);
         return $this->fetch();

+ 9 - 0
vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php

@@ -108,6 +108,15 @@ class UserController extends AdminBaseController
 
         $roles = Db::name('role')->where('status', 1)->order("id DESC")->select();
         $this->assign("roles", $roles);
+
+        //显示类目
+        $cates = Db::name('category')->select();
+        $catelist = array();
+        foreach($cates as $k=>$v){
+            $catelist[$v['id']] = $v['catname'];
+        }
+        $this->assign('catelist',$catelist);
+        //var_dump($catelist);die;
         return $this->fetch();
     }
 

+ 1 - 1
vendor/thinkcmf/cmf-app/src/portal/controller/IndexController.php

@@ -17,7 +17,7 @@ class IndexController extends HomeBaseController
 
     // 首页
     public function index()
-    {
+    {   
         return $this->fetch(":index");
     }