fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit 9b07597f0cd87119642d7ddec0f2797fb49720bf 2 parents e797ecf4 44c6a699

Merge branch 'gray' into 'master' 

Gray



See merge request !1524
Inline Side-by-side
Showing 4 changed files with 28 additions and 17 deletions
... ... @@ -51,8 +51,8 @@ const _formatFilterUrl = (params, filter) => {
opt.union_type = '100000000013130';
_.each(filter.classify, (item) => {
_.each(item.subs, sub => {
_.each(_.get(filter, 'classify', []), (item) => {
_.each(_.get(item, 'subs', {}), sub => {
sub.url = listParamsProcess.generatePathUrl(_.merge({}, opt, {[item.dataType]: sub.dataId}));
});
});
... ...
... ... @@ -5,9 +5,11 @@
<div class="goods-container">
{{> mip-filter}}
{{> mip-product-list}}
<div class="all-goods">
<a href="{{jumpUrls.curUrl}}">点击查看全部商品</a>
</div>
{{#if list}}
<div class="all-goods">
<a href="{{jumpUrls.curUrl}}">点击查看全部商品</a>
</div>
{{/if}}
</div>
{{> mip-footer}}
</div>
... ...
... ... @@ -50,18 +50,23 @@
{{> mip-product-list list=defaultGoods}}
</div>
</div>
<div class="all-goods">
<a href="{{allGoodsUrl}}">点击查看全部商品</a>
</div>
{{#if defaultGoods}}
<div class="all-goods">
<a href="{{allGoodsUrl}}">点击查看全部商品</a>
</div>
{{/if}}
</div>
{{!--shop-tab: 最新--}}
<div class="new-goods">
{{> mip-product-list list=newGoods}}
<div class="all-goods">
<a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
</div>
{{#if newGoods}}
<div class="all-goods">
<a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
</div>
{{/if}}
</div>
</mip-vd-tabs>
<a href="{{allGoodsUrl}}" class="all-goods-tab">
... ...
... ... @@ -44,9 +44,11 @@
{{/ defaultGoods}}
</div>
</div>
<div class="all-goods">
<a href="{{allGoodsUrl}}">点击查看全部商品</a>
</div>
{{#if defaultGoods.list}}
<div class="all-goods">
<a href="{{allGoodsUrl}}">点击查看全部商品</a>
</div>
{{/if}}
</div>
{{!--shop-tab: 最新--}}
... ... @@ -55,9 +57,11 @@
{{> mip-product-list}}
{{/ newGoods}}
<div class="all-goods">
<a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
</div>
{{#if newGoods.list}}
<div class="all-goods">
<a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
</div>
{{/if}}
</div>
</mip-vd-tabs>
<a href="{{allGoodsUrl}}" class="all-goods-tab">
... ...