diff --git a/app/admin/controller/merchant/system/auth/Menu.php b/app/admin/controller/merchant/system/auth/Menu.php index 24b50a9..3ec11a9 100644 --- a/app/admin/controller/merchant/system/auth/Menu.php +++ b/app/admin/controller/merchant/system/auth/Menu.php @@ -42,7 +42,7 @@ class Menu extends BaseController */ function Lst(){ // 查出商户所有菜单数据 - $data = $this->menu->Search([], 1); + $data = $this->menu->getList([], 1); to_assign(0,'',$data['list']); } @@ -62,9 +62,9 @@ class Menu extends BaseController View::assign('detail', $detail); } // 查出商户所有菜单数据 - $data = $this->menu->Search([], 1); + $data = $this->menu->getList([], 1); $menus = $format->DropDownMenu($data['list']); - + View::assign('id', $id); View::assign('pid', $pid); View::assign('menus',$menus); diff --git a/app/admin/view/merchant/system/auth/menu/add.html b/app/admin/view/merchant/system/auth/menu/add.html index 2b494c5..e1d2acc 100644 --- a/app/admin/view/merchant/system/auth/menu/add.html +++ b/app/admin/view/merchant/system/auth/menu/add.html @@ -11,7 +11,7 @@ diff --git a/app/common/controller/FormatList.php b/app/common/controller/FormatList.php index d7bd668..5fffb83 100644 --- a/app/common/controller/FormatList.php +++ b/app/common/controller/FormatList.php @@ -64,8 +64,8 @@ class FormatList $level++; foreach ($data as $k => $v) { if ($v['pid'] == $pid) { - $v['title'] = ''; if ($pid != 0) { + $v['title'] = isset($v['title'])?$v['title']:''; $v['title'] = $space[$level] . $v['title']; } /*将该类别的数据放入list中*/