Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

在layout-nx页面中增加全局搜索按钮



See merge request !478

@@ -84,6 +84,9 @@
                     <i class="layui-icon layui-icon-refresh-3"></i>
                 </a>
             </li>
+            <li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索">
+                <a href="javascript:;" layadmin-event="globalSearch"><i><img src="/src/style/img/search.png"/></i></a>
+            </li>
             <li class="layui-nav-item layui-hide-xs" lay-unselect>
                 <a href="javascript:;" layadmin-event="fullscreen">
                     <i class="layui-icon layui-icon-screen-full"></i>