Authored by 王涛

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

【911】我的收藏夹导航栏增加搜索按钮



See merge request !687
... ... @@ -27,6 +27,9 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
reloadFariteResList();
}
});
$('#keyword').unbind('click').on('click', function () {
reloadFariteResList();
})
//回车搜索收藏夹
$('#fav_keyword_id').keydown(function (e) {
if (e.keyCode === 13) {
... ... @@ -34,6 +37,9 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
loadFavoriteList(parentId)
}
});
$('#fav_keyword').unbind('click').on('click', function () {
loadFavoriteList();
})
//到达首页
$("#tofavorite_home").on("click", function () {
$(".favorite-cards").show();
... ...
... ... @@ -20,6 +20,14 @@
placeholder="关键字,回车搜索" type="text">
</div>
</div>
<div class="layui-inline favorite-cards">
<div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
<button type="button" id="fav_keyword"
class="layui-btn layui-btn-normal layui-btn-normal">
搜索
</button>
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
... ... @@ -36,7 +44,8 @@
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline">
<select id="fav_reslist_resListBizTypes" lay-filter="fav_reslist_resListBizTypes"
<select id="fav_reslist_resListBizTypes"
lay-filter="fav_reslist_resListBizTypes"
name="label">
<option value="">=选择业务=</option>
</select>
... ... @@ -53,6 +62,14 @@
</select>
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
<button type="button" id="keyword"
class="layui-btn layui-btn-normal layui-btn-normal">
搜索
</button>
</div>
</div>
</div>
</form>
<div class="favorites-header-btngroup">
... ... @@ -62,10 +79,12 @@
lay-direction="4" lay-skin="primary" lay-tips="新建收藏夹"></i>
</li>
<li class="favorite-reslist"><i class="layui-icon layui-icon-addition icon-addres"
id="add_favorite_res" lay-direction="4" lay-direction="4"
id="add_favorite_res" lay-direction="4"
lay-direction="4"
lay-skin="primary" lay-tips="添加资源"></i></li>
<li class="favorite-reslist"><i class="layui-icon layui-icon-delete icon-delres"
id="del_favorite_res" lay-direction="4" lay-direction="4"
id="del_favorite_res" lay-direction="4"
lay-direction="4"
lay-skin="primary" lay-tips="移除资源"></i></li>
<!--<li><i class="layui-icon layui-icon-prev icon-goback" id="backto_favorite_card" lay-direction="4" lay-tips="返回收藏夹" lay-direction="4" lay-skin="primary"></i></li>-->
</ul>
... ...