Merge branch 'feature/guangDetail' into 'release/6.1'

样式调整，过滤空数据



See merge request !907

@@ -19,7 +19,7 @@
             </span>
         </p>
         {{else}}
-            <a class="go-detail" href="{{url}}">查看详情&nbsp;<span class="iconfont">&#xe604;</span></a>
+            <a class="go-detail" href="{{url}}">查看详情&nbsp;<span class="iconfont detail-arr">&#xe604;</span></a>
         {{/unlessor}}
     </div>
 </div>
\ No newline at end of file

@@ -377,6 +377,10 @@ $focus-size: 42px;
                     right: 30px;
                 }
 
+                .detail-arr {
+                    vertical-align: text-top;
+                }
+
                 .iconfont {
                     font-size: 12px;
                 }
@@ -811,7 +815,7 @@ $focus-size: 42px;
                 position: relative;
                 width: 275px;
                 margin-left: 0;
-                height: 140px;
+                height: 130px;
                 padding: 0 15px;
 
                 .price {
@@ -819,19 +823,9 @@ $focus-size: 42px;
                 }
 
                 .go-detail {
-                    display: block;
-                    background-color: #444;
-                    color: #fff;
-                    border-radius: 20px;
-                    height: 40px;
-                    line-height: 40px;
-                    text-align: center;
-                    float: right;
-                    width: 130px;
-                    font-size: 20px;
-                    position: absolute;
-                    right: 10px;
-                    bottom: 10px;
+                    right: 15px;
+                    bottom: 0;
+                    line-height: 50px;
                 }
             }
 

@@ -494,6 +494,10 @@ const pushGoodsInfo = (finalDetail, goodsList, isApp) => {
                 }
             });
 
+            finalDetail[key].relatedReco.goods = _.remove(finalDetail[key].relatedReco.goods, (obj) => {
+                return obj;
+            });
+
             let moreNum = _.get(finalDetail[key], 'relatedReco.goods.length', 0);
 
             finalDetail[key].relatedReco.moreNum = moreNum - 4 > 0 ? moreNum - 4 : 0; // 改成第一屏幕最多展示4个