From 9c65f61271ac4594077beb56a53b48bad9054f78 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Tue, 14 Mar 2023 22:33:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djs=E4=B8=80=E5=A4=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/merchant/system/merchant/intention/lst.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/admin/view/merchant/system/merchant/intention/lst.html b/app/admin/view/merchant/system/merchant/intention/lst.html index 0bb3754..1a8661f 100644 --- a/app/admin/view/merchant/system/merchant/intention/lst.html +++ b/app/admin/view/merchant/system/merchant/intention/lst.html @@ -25,7 +25,7 @@
- + @@ -288,7 +288,9 @@ , range: ['#start-date', '#end-date'] ,done: function(value, date, endDate){ switchDateForm(true); - + + $('#both').removeClass('layui-btn-primary') + $('#both').siblings().addClass('layui-btn-primary') active['reload'] ? active['reload'].call(this) : ''; } }); From 1a5ad63673bab6b2f22cb9994bd7f554634a7455 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Wed, 15 Mar 2023 00:54:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2js=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchant/system/merchant/MerchantType.php | 32 ++- app/admin/route/merchant/menu.php | 82 ------ app/admin/route/merchant/merchant.php | 246 ------------------ .../merchant/system/merchant/type/add.html | 29 ++- .../merchant/system/merchant/type/edit.html | 31 ++- .../merchant/system/merchant/type/index.html | 1 - .../merchant/system/merchant/type/read.html | 72 ++++- .../model/merchant/system/Relevance.php | 4 +- .../merchant/system/merchant/MerchantType.php | 4 +- 9 files changed, 140 insertions(+), 361 deletions(-) delete mode 100644 app/admin/route/merchant/menu.php delete mode 100644 app/admin/route/merchant/merchant.php diff --git a/app/admin/controller/merchant/system/merchant/MerchantType.php b/app/admin/controller/merchant/system/merchant/MerchantType.php index 5bdfa13..0cc3dc4 100644 --- a/app/admin/controller/merchant/system/merchant/MerchantType.php +++ b/app/admin/controller/merchant/system/merchant/MerchantType.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace app\admin\controller\merchant\system\merchant; use app\admin\BaseController; +use app\admin\controller\merchant\system\auth\Menu; use app\common\model\merchant\system\merchant\MerchantType as MerchantTypeModel; use app\common\model\merchant\system\auth\Menu as MenuModel; use app\common\controller\FormatList; @@ -81,8 +82,12 @@ class MerchantType extends BaseController // 给菜单权限附加选中状态 foreach($data['list'] as $k=>$item) { - if (in_array($item['id'], $checked_list['list'][0]['auth_ids'])) { - $data['list'][$k]['checked'] = true; + foreach ($checked_list['list'] as $auth) { + if (in_array($item['id'], $auth['auth_ids'])) { + if ($item['pid']>0 && $item['title']!='权限') + $data['list'][$k]['checked'] = true; + $data['list'][$k]['spread'] = true; + } } } @@ -146,9 +151,30 @@ class MerchantType extends BaseController $param = get_params(); $id = isset($param['id']) ? (int)$param['id'] : 0; - $detail = $this->merchant->Find($id); + $detail = $this->merchant->getDetail($id); if (!empty($detail)) { + // 查出商户所有菜单数据权限 tree + $menu = app()->make(MenuModel::class); + $data = $menu->getList([],1); + + // 获取已有权限 + $checked_list = $this->merchant->getList(['mer_type_id'=>$id]); + + // 给菜单权限附加选中状态 + $list = []; + foreach($data['list'] as $k=>$item) { + foreach ($checked_list['list'] as $auth) { + if (in_array($item['id'], $auth['auth_ids'])) { + if ($item['pid']>0 && $item['title']!='权限') + $data['list'][$k]['checked'] = true; + $data['list'][$k]['spread'] = true; + array_push($list, $data['list'][$k]); + } + } + } + $format = app()->make(FormatList::class); + View::assign('dataTree', $format->FormatCategory($list)); View::assign('detail', $detail); return view($this->path['read']); } else { diff --git a/app/admin/route/merchant/menu.php b/app/admin/route/merchant/menu.php deleted file mode 100644 index c1ef28e..0000000 --- a/app/admin/route/merchant/menu.php +++ /dev/null @@ -1,82 +0,0 @@ - -// +---------------------------------------------------------------------- - -use think\facade\Route; -use app\common\middleware\AdminAuthMiddleware; -use app\common\middleware\AdminTokenMiddleware; -use app\common\middleware\AllowOriginMiddleware; -use app\common\middleware\LogMiddleware; - -Route::group(function () { - - //权限管理 - // Route::group('system/menu', function () { - // Route::get('lst', '/getList')->name('systemMenuGetLst')->option([ - // '_alias' => '平台菜单/权限列表', - // ]); - // Route::get('create/form', '/createForm')->name('systemMenuCreateForm')->option([ - // '_alias' => '平台菜单/权限添加表单', - // '_auth' => false, - // '_form' => 'systemMenuCreate', - // ]); - // Route::get('update/form/:id', '/updateForm')->name('systemMenuUpdateForm')->option([ - // '_alias' => '平台菜单/权限编辑表单', - // '_auth' => false, - // '_form' => 'systemMenuUpdate', - // ]); - // Route::post('create', '/create')->name('systemMenuCreate')->option([ - // '_alias' => '平台菜单/权限添加', - // ]); - // Route::post('update/:id', '/update')->name('systemMenuUpdate')->option([ - // '_alias' => '平台菜单/权限编辑', - // ]); - // Route::delete('delete/:id', '/delete')->name('systemMenuDelete')->option([ - // '_alias' => '平台菜单/权限删除', - // ]); - // })->prefix('admin.system.auth.Menu')->option([ - // '_path' => '/setting/menu', - // '_auth' => true, - // ]); - - //商户权限管理 - Route::group('merchant/menu', function () { - Route::get('lst', '/getList')->name('systemMerchantMenuGetLst')->append(['merchant' => 1])->option([ - '_alias' => '商户菜单/权限列表', - ]); - Route::get('create/form', '/createForm')->name('systemMerchantMenuCreateForm')->append(['merchant' => 1])->option([ - '_alias' => '商户菜单/权限添加表单', - '_auth' => false, - '_form' => 'systemMerchantMenuCreate', - ]); - Route::get('update/form/:id', '/updateForm')->name('systemMerchantMenuUpdateForm')->append(['merchant' => 1])->option([ - '_alias' => '商户菜单/权限编辑表单', - '_auth' => false, - '_form' => 'systemMerchantMenuUpdate', - ]); - Route::post('create', '/create')->name('systemMerchantMenuCreate')->append(['merchant' => 1])->option([ - '_alias' => '商户菜单/权限添加', - ]); - Route::post('update/:id', '/update')->name('systemMerchantMenuUpdate')->append(['merchant' => 1])->option([ - '_alias' => '商户菜单/权限编辑', - ]); - Route::delete('delete/:id', '/delete')->name('systemMerchantMenuDelete')->append(['merchant' => 1])->option([ - '_alias' => '商户菜单/权限删除', - ]); - })->prefix('admin.system.auth.Menu')->option([ - '_path' => '/merchant/system', - '_auth' => true, - ]); - -}); -// ->middleware(AllowOriginMiddleware::class) -// ->middleware(AdminTokenMiddleware::class, true) -// ->middleware(AdminAuthMiddleware::class) -// ->middleware(LogMiddleware::class); diff --git a/app/admin/route/merchant/merchant.php b/app/admin/route/merchant/merchant.php deleted file mode 100644 index 72a9505..0000000 --- a/app/admin/route/merchant/merchant.php +++ /dev/null @@ -1,246 +0,0 @@ - -// +---------------------------------------------------------------------- - -use think\facade\Route; - -Route::group(function () { - - //商户分类 - Route::group('system/merchant', function () { - Route::get('category/lst', '/lst')->name('systemMerchantCategoryLst')->option([ - '_alias' => '商户分类列表', - ]); - Route::get('category_lst', '/lst')->option([ - '_alias' => '商户分类列表', - '_auth' => false, - ]); - Route::post('category', '/create')->name('systemMerchantCategoryCreate')->option([ - '_alias' => '商户分类添加', - ]); - Route::get('category/form', '/createForm')->name('systemMerchantCategoryCreateForm')->option([ - '_alias' => '商户分类添加表单', - '_auth' => false, - '_form' => 'systemMerchantCategoryCreate', - ]); - Route::delete('category/:id', '/delete')->name('systemMerchantCategoryDelete')->option([ - '_alias' => '商户分类删除', - ]); - Route::post('category/:id', '/update')->name('systemMerchantCategoryUpdate')->option([ - '_alias' => '商户分类编辑', - ]); - Route::get('category/form/:id', '/updateForm')->name('systemMerchantCategoryUpdateForm')->option([ - '_alias' => '商户分类编辑表单', - '_auth' => false, - '_form' => 'systemMerchantCategoryUpdate', - ]); - Route::get('category/options', '/getOptions')->option([ - '_alias' => '商户分类筛选', - '_auth' => false, - ]); - })->prefix('admin.system.merchant.MerchantCategory')->option([ - '_path' => '/merchant/classify', - '_auth' => true, - ]); - - //申请列表 - Route::group('merchant/intention', function () { - Route::get('lst', '/lst')->name('systemMerchantIntentionLst')->option([ - '_alias' => '列表', - ]); - Route::post('status/:id', '/switchStatus')->name('systemMerchantIntentionStatus')->option([ - '_alias' => '审核', - ]); - Route::delete('delete/:id', '/delete')->name('systemMerchantIntentionDelete')->option([ - '_alias' => '删除', - ]); - Route::get('mark/:id/form', '/form')->name('systemMerchantIntentionMarkForm')->option([ - '_alias' => '备注', - '_auth' => false, - '_form' => 'systemMerchantIntentionMark', - ]); - Route::get('status/:id/form', '/statusForm')->name('systemMerchantIntentionStatusForm')->option([ - '_alias' => '申请商户', - '_auth' => false, - '_form' => 'systemMerchantIntentionStatus', - ]); - - Route::post('mark/:id', '/mark')->name('systemMerchantIntentionMark')->option([ - '_alias' => '备注', - ]); - Route::get('excel', '/excel'); - })->prefix('admin.system.merchant.MerchantIntention')->option([ - '_path' => '/merchant/application', - '_auth' => true, - ]); - - //商户管理 - Route::group('system/merchant', function () { - Route::get('create/form', '.Merchant/createForm')->name('systemMerchantCreateForm')->option([ - '_alias' => '商户列表', - ]); - Route::get('count', '.Merchant/count')->name('systemMerchantCount')->option([ - '_alias' => '商户列表统计', - ]); - Route::get('lst', '.Merchant/lst')->name('systemMerchantLst')->option([ - '_alias' => '商户列表', - ]); - Route::post('create', '.Merchant/create')->name('systemMerchantCreate')->option([ - '_alias' => '商户添加', - ]); - Route::get('update/form/:id', '.Merchant/updateForm')->name('systemMerchantUpdateForm')->option([ - '_alias' => '商户编辑表单', - '_auth' => false, - '_form' => 'systemMerchantUpdate', - ]); - Route::post('update/:id', '.Merchant/update')->name('systemMerchantUpdate')->option([ - '_alias' => '商户编辑', - ]); - Route::post('status/:id', '.Merchant/switchStatus')->name('systemMerchantStatus')->option([ - '_alias' => '商户修改推荐', - ]); - Route::post('close/:id', '.Merchant/switchClose')->name('systemMerchantClose')->option([ - '_alias' => '商户开启/关闭', - ]); - Route::delete('delete/:id', '.Merchant/delete')->name('systemMerchantDelete')->option([ - '_alias' => '商户删除', - ]); - Route::post('password/:id', '.MerchantAdmin/password')->name('systemMerchantAdminPassword')->option([ - '_alias' => '商户修改密码', - ]); - Route::get('password/form/:id', '.MerchantAdmin/passwordForm')->name('systemMerchantAdminPasswordForm')->option([ - '_alias' => '商户修改密码表单', - '_auth' => false, - '_form' => 'systemMerchantAdminPassword', - ]); - Route::post('login/:id', '.Merchant/login')->name('systemMerchantLogin')->option([ - '_alias' => '商户登录', - ]); - Route::get('changecopy/:id/form', '.Merchant/changeCopyNumForm')->name('systemMerchantChangeCopyForm')->option([ - '_alias' => '修改采集商品次数表单', - '_auth' => false, - '_form' => 'systemMerchantChangeCopy', - ]); - Route::post('changecopy/:id', '.Merchant/changeCopyNum')->name('systemMerchantChangeCopy')->option([ - '_alias' => '修改采集商品次数', - ]); - })->prefix('admin.system.merchant')->option([ - '_path' => '/merchant/list', - '_auth' => true, - '_append'=> [ - [ - '_name' =>'uploadImage', - '_path' =>'/merchant/list', - '_alias' => '上传图片', - '_auth' => true, - ], - [ - '_name' =>'systemAttachmentLst', - '_path' =>'/merchant/list', - '_alias' => '图片列表', - '_auth' => true, - ], - ] - ]); - - // 店铺类型 - Route::group('merchant/type', function () { - Route::get('lst', '/lst')->name('systemMerchantTypeLst')->option([ - '_alias' => '列表', - ]); - Route::post('create', '/create')->name('systemMerchantTypeCreate')->option([ - '_alias' => '添加', - ]); - Route::post('update/:id', '/update')->name('systemMerchantTypeUpdate')->option([ - '_alias' => '编辑', - ]); - Route::delete('delete/:id', '/delete')->name('systemMerchantTypeDelete')->option([ - '_alias' => '删除', - ]); - Route::get('mark/:id', '/markForm')->name('systemMerchantTypeMarkForm')->option([ - '_alias' => '备注', - '_auth' => false, - '_form' => 'systemMerchantTypeMark', - ]); - Route::post('mark/:id', '/mark')->name('systemMerchantTypeMark')->option([ - '_alias' => '备注', - ]); - - Route::get('detail/:id', '/detail')->name('systemMerchantTypeDetail')->option([ - '_alias' => '备注', - ]); - - Route::get('options', '/options')->option([ - '_alias' => '筛选', - '_auth' => false, - ]); - Route::get('mer_auth', '/mer_auth')->option([ - '_alias' => '权限', - '_auth' => false, - ]); - })->prefix('admin.system.merchant.MerchantType')->option([ - '_path' => '/merchant/type', - '_auth' => true, - ]); - - //保证金 - Route::group('margin', function () { - //缴纳记录 - Route::get('lst', 'merchant.MerchantMargin/lst')->name('systemMerchantMarginLst')->option([ - '_alias' => '缴纳记录', - ]); - //扣费记录 - Route::get('list/:id', 'merchant.MerchantMargin/getMarginLst')->name('systemMarginList')->option([ - '_alias' => '扣费记录', - ]); - - //扣除保证金 - Route::get('set/:id/form', 'merchant.MerchantMargin/setMarginForm')->name('systemMarginSetForm')->option([ - '_alias' => '扣除保证金表单', - '_auth' => false, - '_form' => 'systemMarginSet', - ]); - Route::post('set', 'merchant.MerchantMargin/setMargin')->name('systemMarginSet')->option([ - '_alias' => '扣除保证金', - ]); - - //退款申请 - Route::get('refund/lst', 'financial.Financial/getMarginLst')->name('systemMarginRefundList')->option([ - '_alias' => '退款申请列表', - ]); - Route::get('refund/show/:id', 'financial.Financial/refundShow')->name('systemMarginRefundShow')->option([ - '_alias' => '退款申请详情', - ]); - - //审核 - Route::get('refund/status/:id/form', 'financial.Financial/statusForm')->name('systemMarginRefundSwitchStatusForm')->option([ - '_alias' => '审核表单', - '_auth' => false, - '_form' => 'systemMarginRefundSwitchStatus', - ]); - Route::post('refund/status/:id', 'financial.Financial/switchStatus')->name('systemMarginRefundSwitchStatus')->append(['type' => 1])->option([ - '_alias' => '审核', - ]); - - //备注 - Route::get('refund/mark/:id/form', 'financial.Financial/markMarginForm')->name('systemMarginRefundMarkForm')->option([ - '_alias' => '备注表单', - '_auth' => false, - '_form' => 'systemMarginRefundMark', - ]); - Route::post('refund/mark/:id', 'financial.Financial/mark')->name('systemMarginRefundMark')->option([ - '_alias' => '备注', - ]); - })->prefix('admin.system.')->option([ - '_path' => '/merchant/deposit_list', - '_auth' => true, - ]); - -}); diff --git a/app/admin/view/merchant/system/merchant/type/add.html b/app/admin/view/merchant/system/merchant/type/add.html index 1c3ab9d..c2721af 100644 --- a/app/admin/view/merchant/system/merchant/type/add.html +++ b/app/admin/view/merchant/system/merchant/type/add.html @@ -20,14 +20,14 @@ 店铺类型名称* + autocomplete="off" placeholder="请输入商品名称" class="layui-input" value=""> 店铺类型要求 - + @@ -38,15 +38,15 @@
- - + +
- + 单位：元 @@ -64,7 +64,7 @@ 其它说明 - + @@ -116,7 +116,6 @@ //监听提交 form.on('submit(webform)', function (data) { - console.log(data.field); // data.field.content = tinyMCE.editors['container_content'].getContent(); if (data.field == '') { layer.msg('请先完善店铺类型'); @@ -132,10 +131,18 @@ //获得选中的节点 var checkData = tree.getChecked('id'); - var list = new Array(); - list = getChecked_list(checkData); - data.field.auth = list - tool.post('/admin/merchant/type/add', data.field, callback); + var list = getChecked_list(checkData); + + var params = new Object(); + params.id = data.field.id + params.type_name = data.field.type_name + params.type_info = data.field.type_info + params.is_margin = data.field.is_margin + params.margin = data.field.margin + params.description = data.field.description + params.auth = list + + tool.post('/admin/merchant/type/add', params, callback); return true; }); diff --git a/app/admin/view/merchant/system/merchant/type/edit.html b/app/admin/view/merchant/system/merchant/type/edit.html index 4d26c5c..ca00224 100644 --- a/app/admin/view/merchant/system/merchant/type/edit.html +++ b/app/admin/view/merchant/system/merchant/type/edit.html @@ -56,7 +56,7 @@ 店铺权限*
-
+
@@ -103,8 +103,6 @@ var tree = layui.tree ,layer = layui.layer ,util = layui.util - ,spread = true - //模拟数据 ,data = getData(); //开启复选框 @@ -112,12 +110,15 @@ elem: '#test7' ,data: data ,showCheckbox: true - ,id:'id',//菜单id + ,id:'id'//菜单id + // ,click: function(obj){ + // var data = obj.data; //获取当前点击的节点数据 + // } }); + //监听提交 form.on('submit(webform)', function (data) { - console.log(data.field); // data.field.content = tinyMCE.editors['container_content'].getContent(); if (data.field == '') { layer.msg('请先完善店铺类型'); @@ -133,12 +134,20 @@ //获得选中的节点 var checkData = tree.getChecked('id'); - var list = new Array(); - list = getChecked_list(checkData); - data.field.auth = list - tool.put('/admin/merchant/type/edit', data.field, callback); + var list = getChecked_list(checkData); - return true; + var params = new Object(); + params.id = data.field.id + params.type_name = data.field.type_name + params.type_info = data.field.type_info + params.is_margin = data.field.is_margin + params.margin = data.field.margin + params.description = data.field.description + params.auth = list + + tool.put('/admin/merchant/type/edit', params, callback); + + return false; }); // 获取选中节点的id @@ -191,7 +200,7 @@ } //所有保存到数据节点的变量都成为`dataBox`对象的属性 - console.log(dataBox.admin); + // console.log(dataBox.admin) return dataBox.admin; } diff --git a/app/admin/view/merchant/system/merchant/type/index.html b/app/admin/view/merchant/system/merchant/type/index.html index 59a1285..bbf57da 100644 --- a/app/admin/view/merchant/system/merchant/type/index.html +++ b/app/admin/view/merchant/system/merchant/type/index.html @@ -104,7 +104,6 @@ //监听表格行工具事件 table.on('tool(store_product)', function(obj) { - console.log(obj.data); var data = obj.data; if (obj.event === 'read') { tool.side('/admin/merchant/type/read?id='+obj.data.id); diff --git a/app/admin/view/merchant/system/merchant/type/read.html b/app/admin/view/merchant/system/merchant/type/read.html index 1145f28..4d69900 100644 --- a/app/admin/view/merchant/system/merchant/type/read.html +++ b/app/admin/view/merchant/system/merchant/type/read.html @@ -32,15 +32,15 @@ 店铺权限 - - +
+
其它说明 - + @@ -60,4 +60,68 @@
{/block} - \ No newline at end of file + +{block name="script"} + + +{/block} \ No newline at end of file diff --git a/app/common/model/merchant/system/Relevance.php b/app/common/model/merchant/system/Relevance.php index af30c35..a3c3fc6 100644 --- a/app/common/model/merchant/system/Relevance.php +++ b/app/common/model/merchant/system/Relevance.php @@ -364,7 +364,9 @@ class Relevance extends Model */ public function batchInsert(array $data) { - return Relevance::insertAll($data); + $rows = Relevance::insertAll($data); + + return $rows; } diff --git a/app/common/model/merchant/system/merchant/MerchantType.php b/app/common/model/merchant/system/merchant/MerchantType.php index 0b3ba68..ce344ed 100644 --- a/app/common/model/merchant/system/merchant/MerchantType.php +++ b/app/common/model/merchant/system/merchant/MerchantType.php @@ -98,13 +98,13 @@ class MerchantType extends Model * * @return array|object */ - function Find(int $id) + function getDetail(int $id) { if (empty($id)) { throw new ValidateException('未传递参数'); return []; } - $row = self::where('mer_type_id', $id)->field('mer_type_id as id,type_name,margin,type_info,description,is_margin,create_time,update_time')->find(); + $row = self::search(['mer_type_id'=>$id])->find(); return $row; } From 4ffcbef5e08e0c4c057c709198be714b7af03ca8 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Wed, 15 Mar 2023 01:15:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=96=B9=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 @@ 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中*/