From 362f419100cc24d96aacc4f1037e331e56374d05 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 9 Jan 2019 14:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=AE=A1=E7=90=86=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E8=A7=84=E5=88=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/public/menu.html        | 18 ++++++++++++++----
 application/service/NavigationService.php      |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/application/admin/view/default/public/menu.html b/application/admin/view/default/public/menu.html
index 5c4a68e33..3fae22038 100755
--- a/application/admin/view/default/public/menu.html
+++ b/application/admin/view/default/public/menu.html
@@ -2,23 +2,33 @@
 	<div class="am-offcanvas-bar admin-offcanvas-bar">
 		<ul class="am-list admin-sidebar-list common-left-menu">
 			<li>
-				<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/index/init')}}" class="common-left-menu-active"><span class="iconfont icon-shouye"></span> 首页</a>
+				<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/index/init')}}" class="common-left-menu-active">
+					<span class="iconfont icon-shouye"></span>
+					<span class="nav-name">首页</span>
+				</a>
 			</li>
 			{{foreach $left_menu as $v}}
 				{{if empty($v['item'])}}
 					<li>
-						<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/'.strtolower($v['control']).'/'.strtolower($v['action']))}}">{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}} {{$v.name}}</a>
+						<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/'.strtolower($v['control']).'/'.strtolower($v['action']))}}">
+							{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}}
+							<span class="nav-name">{{$v.name}}</span>
+						</a>
 					</li>
 				{{else /}}
 					<li class="admin-parent">
 						<a data-type="menu" class="am-cf" data-am-collapse="{target: '#power-menu-{{$v.id}}'}">
-							{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}} {{$v.name}}
+							{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}}
+							<span class="nav-name">{{$v.name}}</span>
 							<i class="am-icon-angle-down am-fr am-margin-right left-menu-more-ico-rotate"></i>
 						</a>
 						<ul class="am-list am-collapse admin-sidebar-sub" id="power-menu-{{$v.id}}">
 							{{foreach $v.item as $vs}}
 								<li>
-									<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/'.strtolower($vs['control']).'/'.strtolower($vs['action']))}}">{{if !empty($vs['icon'])}}<span class="{{$vs.icon}}"></span>{{/if}} {{$vs.name}}</a>
+									<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/'.strtolower($vs['control']).'/'.strtolower($vs['action']))}}">
+										{{if !empty($vs['icon'])}}<span class="{{$vs.icon}}"></span>{{/if}}
+										<span class="nav-name">{{$vs.name}}</span>
+									</a>
 								</li>
 							{{/foreach}}
 						</ul>
diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php
index f8e1391f0..6628225e4 100755
--- a/application/service/NavigationService.php
+++ b/application/service/NavigationService.php
@@ -257,6 +257,7 @@ class NavigationService
                     [
                         'checked_type'      => 'length',
                         'key_name'          => 'name',
+                        'checked_data'      => '2,16',
                         'is_checked'        => 1,
                         'error_msg'         => '导航名称格式 2~16 个字符',
                     ],