Merge branch 'gray' into 'master'

Gray



See merge request !1524

@@ -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}}
+        {{#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>
+
+                {{#if defaultGoods}}
                     <div class="all-goods">
                         <a href="{{allGoodsUrl}}">点击查看全部商品</a>
                     </div>
+                {{/if}}
             </div>
 
             {{!--shop-tab: 最新--}}
             <div class="new-goods">
                 {{> mip-product-list list=newGoods}}
 
+                {{#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>
+                {{#if defaultGoods.list}}
                     <div class="all-goods">
                         <a href="{{allGoodsUrl}}">点击查看全部商品</a>
                     </div>
+                {{/if}}
             </div>
 
             {{!--shop-tab: 最新--}}
@@ -55,9 +57,11 @@
                     {{> mip-product-list}}
                 {{/ newGoods}}
 
+                {{#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">