From 4ffcbef5e08e0c4c057c709198be714b7af03ca8 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Wed, 15 Mar 2023 01:15:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=8F=9C=E5=8D=95=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/merchant/system/auth/Menu.php | 6 +++---
 app/admin/view/merchant/system/auth/menu/add.html  | 2 +-
 app/common/controller/FormatList.php               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 @@
 			<td>
 				<select name="pid" lay-verify="required" lay-reqText="请选择父级菜单/节点">
 					<option value="0">作为顶级菜单/节点</option>
-					{volist name="$menus" id="v"}
+					{volist name="menus" id="v"}
 					<option value="{$v.id}" {eq name="pid" value="$v.id" }selected="" {/eq}>{$v.title} </option>
 					{/volist}
 				</select>
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中*/