wugg 8 mesiacov pred
rodič
commit
4d45f58586

+ 2 - 0
app/admin/controller/Action.php

@@ -37,6 +37,8 @@ class Action extends Base{
             $list[] = $value;
         }
         menuAction($list, $menu);
+          $weight= array_column($menu,'weight');
+         array_multisort($weight, SORT_DESC, $menu);
         return app_show(0, "获取成功", array_values($menu));
     }
 

+ 2 - 1
app/admin/controller/InvCat.php

@@ -150,7 +150,8 @@ class InvCat extends Base{
         $count =Db::name("inv_cat")->where($condition)->count();
         $total=ceil($count/$size);
         $page = $page>=$total? intval($total):$page;
-        $list =Db::name("inv_cat")->where($condition)->order("id desc")->page($page,$size)->select()->toArray();
+        $list =Db::name("inv_cat")->where($condition)->order("status asc,id desc")->page($page,$size)->select()
+        ->toArray();
         foreach ($list as &$value){
             $value['tax'] = $value['tax']==''?[]:explode("、",$value['tax']);
         }

+ 1 - 1
app/common.php

@@ -560,7 +560,7 @@ if(!function_exists('menuAction')){
 			if($value['pid']==0){
 				$list[]=$value;
 			}else{
-				$menu=Db::name("admin_menu")->where(["id"=>$value['pid'],"is_del"=>0,"status"=>1])->field("id,menu_name,menu_img,menu_route,menu_url,pid,level,is_show,is_private,menu_type,status")->findOrEmpty();
+				$menu=Db::name("admin_menu")->where(["id"=>$value['pid'],"is_del"=>0,"status"=>1])->field("id,menu_name,menu_img,menu_route,menu_url,pid,level,is_show,weight,is_private,menu_type,status")->findOrEmpty();
 				if(empty($menu)) continue;
 				if(!isset($temp[$value['pid']]))$temp[$value['pid']]=$menu;
 				$temp[$value['pid']]['child'][]=$value;