fe / yohobuywap-node · Commits

Go to a project

Authored by 郝肖肖
Commit 73515bde9b157e56b4e8e8c6ccb68835fcf6afa0 2 parents dc5c3b50 26e843e3

Merge branch 'feature/shopSort' into release/5.2

Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
... ... @@ -515,6 +515,7 @@ const getShopData = (req, shopId, uid, isApp) => {
return Promise.all([
searchModel.getFilterSearchData({
shop_id: shopId,
type: 'default',//默认
brand: brandData.join(','),
order: '0',
channel: channel
... ...
... ... @@ -121,9 +121,9 @@
<div class="discount-area first" id="navlist2">
<ul id="list-nav" class="home-sub-nav list-nav pos-list clearfix">
<li data-bp-id="shop_listnav_new_1" class="new active buriedpoint first-li-more">
<li data-bp-id="shop_listnav_default_1" class="default active buriedpoint first-li-more">
<a href="javascript:void(0);">
<span class="spanTest">最新</span>
<span class="spanTest">默认</span>
<span class="iconfont up cur hide">&#xe615;</span>
<span class="iconfont down cur">&#xe616;</span>
</a>
... ... @@ -191,9 +191,9 @@
</ul>
<div id="pos-list" class='hide'>
<ul class="home-sub-nav pos-list">
<li class="new active buriedpoint first-li-more" data-bp-id="shop_poslist_new_1">
<li class="default active buriedpoint first-li-more" data-bp-id="shop_listnav_default_1">
<a href="javascript:void(0);">
<span class="spanTest">最新</span>
<span class="spanTest">默认</span>
<span class="iconfont cur">&#xe616;</span>
<b></b>
</a>
... ... @@ -230,7 +230,6 @@
<ul>
<li class='active default' data-bp-id='shop_listnav_default_1'>默认</li>
<li class='new' data-bp-id='shop_listnav_new_1'>最新</li>
<li class='sale' data-bp-id='shop_listnav_sale_1'>销量</li>
</ul>
</div>
</div>
... ...
... ... @@ -92,9 +92,9 @@
<div>
<ul id="list-nav" class="list-nav clearfix">
<li class="new active buriedpoint first-li-more" data-bp-id="shop_listnav_new_1">
<li class="default active buriedpoint first-li-more" data-bp-id="shop_listnav_default_1">
<a href="javascript:void(0);">
<span class="nav-txt">最新</span>
<span class="nav-txt">默认</span>
<span class="iconfont up cur hide">&#xe615;</span>
<span class="iconfont down cur">&#xe616;</span>
</a>
... ...