Merge branch 'dev3.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.2

src/web/templates/admin/rolesecondmenu.html

@@ -13,6 +13,7 @@
             <li><a href="/admin/rolesecondmenu"><i class="fa fa-dashboard"></i> 角色二级菜单管理</a></li>
         </ol>
     </section>
+    <br>
     <!-- Main content -->
     <section class="content">
         <div class="row">

src/web/templates/admin/secondmenu.html

@@ -11,6 +11,7 @@
             <small><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal-info" onclick="formReset()">新增二级菜单</button></small>
         </h1>
         <ol class="breadcrumb">
+            <li><a href="/admin/menu"><i class="fa fa-dashboard"></i> 菜单管理</a></li>
             <li><a href="/admin/secondmenu?id={{._id}}"><i class="fa fa-dashboard"></i> 二级菜单管理</a></li>
         </ol>
     </section>
@@ -85,7 +86,7 @@
 {{template "footer"}}
 
 <script>
-    menuActive("user")
+    menuActive("secondmenu")
     $(function () {
         ttable=$('#dataTable').DataTable({
             "paging"      : true,