From 6c85f0c76beefd8d5b2f3d4bcdb3df6ecbe5a533 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 12 Jun 2019 22:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/view/default/public/user_menu.html     |  6 +++---
 application/service/NavigationService.php        | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/application/index/view/default/public/user_menu.html b/application/index/view/default/public/user_menu.html
index e550264a1..d61ab06b9 100755
--- a/application/index/view/default/public/user_menu.html
+++ b/application/index/view/default/public/user_menu.html
@@ -6,16 +6,16 @@
         {{foreach $user_left_menu as $k=>$v}}
           {{if $v.is_show eq 1}}
             {{if empty($v['item'])}}
-              <li class="{{if isset($v['contains']) and (in_array(strtolower($controller_name.$action_name), $v['contains']) or (isset($params['pluginscontrol']) and isset($params['pluginsaction']) and in_array(strtolower($params['pluginscontrol'].$params['pluginsaction']), $v['contains'])))}} am-active{{/if}}" >
+              <li class="{{if isset($v['contains']) and ((in_array(strtolower($controller_name.$action_name), $v['contains']) and isset($v['is_system']) and $v['is_system'] eq 1 and !isset($params['pluginscontrol'])) or (isset($params['pluginscontrol']) and isset($params['pluginsaction']) and in_array(strtolower($params['pluginscontrol'].$params['pluginsaction']), $v['contains']) and (!isset($v['is_system']) or $v['is_system'] neq 1)))}} am-active{{/if}}" >
                 <a href="{{$v.url}}">{{if !empty($v['icon'])}}<i class="{{$v.icon}}"></i>{{/if}} {{$v.name}}</a>
               </li>
             {{else /}}
               <li>
-                <a class="am-cf fw-700 user-item-parent" data-am-collapse="{target: '#collapse-nav-{{$k}}'}">{{if !empty($v['icon'])}}<i class="{{$v.icon}}"></i>{{/if}} {{$v.name}}<span class="am-icon-angle-down am-fr am-margin-right"></span></a>
+                <a class="am-cf user-item-parent" data-am-collapse="{target: '#collapse-nav-{{$k}}'}">{{if !empty($v['icon'])}}<i class="{{$v.icon}}"></i>{{/if}} {{$v.name}}<span class="am-icon-angle-down am-fr am-margin-right"></span></a>
                 <ul class="am-list am-collapse user-sidebar-sub am-in" id="collapse-nav-{{$k}}">
                   {{foreach $v.item as $vs}}
                     {{if $vs.is_show eq 1}}
-                      <li class="{{if isset($vs['contains']) and (in_array(strtolower($controller_name.$action_name), $vs['contains']) or (isset($params['pluginscontrol']) and isset($params['pluginsaction']) and in_array(strtolower($params['pluginscontrol'].$params['pluginsaction']), $vs['contains'])))}} am-active{{/if}}">
+                      <li class="{{if isset($vs['contains']) and ((in_array(strtolower($controller_name.$action_name), $vs['contains']) and isset($vs['is_system']) and $vs['is_system'] eq 1 and !isset($params['pluginscontrol'])) or (isset($params['pluginscontrol']) and isset($params['pluginsaction']) and in_array(strtolower($params['pluginscontrol'].$params['pluginsaction']), $vs['contains']) and (!isset($vs['is_system']) or $vs['is_system'] neq 1)))}} am-active{{/if}}">
                         <a href="{{$vs.url}}" class="am-cf">{{if !empty($vs['icon'])}}<i class="{{$vs.icon}}"></i>{{/if}} {{$vs.name}}</a>
                       </li>
                     {{/if}}
diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php
index 4eb16c600..86827624d 100755
--- a/application/service/NavigationService.php
+++ b/application/service/NavigationService.php
@@ -692,6 +692,7 @@ class NavigationService
         // contains    包含的子页面（包括自身）
         // icon        icon类
         // item        二级数据
+        // is_system   是否系统内置菜单（0否, 1是）扩展数据可空或0
 
         // 菜单列表
         $data = [
@@ -701,11 +702,13 @@ class NavigationService
                 'is_show'   =>  1,
                 'contains'  =>  ['userindex'],
                 'icon'      =>  'am-icon-home',
+                'is_system' =>  1,
             ],
             'business' => [
                 'name'      =>  '业务管理',
                 'is_show'   =>  1,
                 'icon'      =>  'am-icon-cube',
+                'is_system' =>  1,
                 'item'      =>  [
                     [
                         'name'      =>  '订单管理',
@@ -713,6 +716,7 @@ class NavigationService
                         'is_show'   =>  1,
                         'contains'  =>  ['orderindex', 'orderdetail', 'ordercomments'],
                         'icon'      =>  'am-icon-th-list',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '订单售后',
@@ -720,6 +724,7 @@ class NavigationService
                         'is_show'   =>  1,
                         'contains'  =>  ['orderaftersaleindex', 'orderaftersaleaftersale'],
                         'icon'      =>  'am-icon-puzzle-piece',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '我的收藏',
@@ -727,6 +732,7 @@ class NavigationService
                         'contains'  =>  ['userfavorgoods'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-heart-o',
+                        'is_system' =>  1,
                     ],
                 ]
             ],
@@ -734,6 +740,7 @@ class NavigationService
                 'name'      =>  '资料管理',
                 'is_show'   =>  1,
                 'icon'      =>  'am-icon-user',
+                'is_system' =>  1,
                 'item'      =>  [
                     [
                         'name'      =>  '个人资料',
@@ -741,6 +748,7 @@ class NavigationService
                         'contains'  =>  ['personalindex', 'personalsaveinfo'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-gear',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '我的地址',
@@ -748,6 +756,7 @@ class NavigationService
                         'contains'  =>  ['useraddressindex', 'useraddresssaveinfo'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-street-view',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '安全设置',
@@ -755,6 +764,7 @@ class NavigationService
                         'contains'  =>  ['safetyindex', 'safetyloginpwdinfo', 'safetymobileinfo', 'safetynewmobileinfo', 'safetyemailinfo', 'safetynewemailinfo'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-user-secret',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '我的消息',
@@ -762,6 +772,7 @@ class NavigationService
                         'contains'  =>  ['messageindex'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-bell-o',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '我的足迹',
@@ -769,6 +780,7 @@ class NavigationService
                         'contains'  =>  ['usergoodsbrowseindex'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-lastfm',
+                        'is_system' =>  1,
                     ],
                     [
                         'name'      =>  '问答/留言',
@@ -776,6 +788,7 @@ class NavigationService
                         'contains'  =>  ['answerindex'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-question',
+                        'is_system' =>  1,
                     ],
                 ]
             ],
@@ -783,6 +796,7 @@ class NavigationService
                 'name'      =>  '财产中心',
                 'is_show'   =>  1,
                 'icon'      =>  'am-icon-trophy',
+                'is_system' =>  1,
                 'item'      =>  [
                     [
                         'name'      =>  '我的积分',
@@ -790,6 +804,7 @@ class NavigationService
                         'contains'  =>  ['userintegralindex'],
                         'is_show'   =>  1,
                         'icon'      =>  'am-icon-fire',
+                        'is_system' =>  1,
                     ],
                 ]
             ],
@@ -799,6 +814,7 @@ class NavigationService
                 'contains'  =>  ['userlogout'],
                 'is_show'   =>  1,
                 'icon'      =>  'am-icon-power-off',
+                'is_system' =>  1,
             ],
         ];
 
-- 
GitLab