Merge branch 'gray' into 'master'

Gray



See merge request !611

@@ -26,7 +26,7 @@
             var isWechat = /micromessenger/i.test(navigator.userAgent || '');
             var isWechat = /micromessenger/i.test(navigator.userAgent || '');
             if (isWechat) {
             if (isWechat) {
                 document.title =document.title.replace(' | Yoho!Buy有货 | 潮流购物逛不停', '');
                 document.title =document.title.replace(' | Yoho!Buy有货 | 潮流购物逛不停', '');
-                (function () { if (typeof (WeixinJSBridge) == "undefined") { document.addEventListener("WeixinJSBridgeReady", function (a) { setTimeout(function () { WeixinJSBridge.invoke("setFontSizeCallback", { fontSize: 0 }, function (b) { }) }, 0) }) } else { setTimeout(function () { WeixinJSBridge.invoke("setFontSizeCallback", { fontSize: 0 }, function (a) { }) }, 0) } })();
+                (function(){function setWechatSize(){if(typeof WeixinJSBridge!=="undefined"&&WeixinJSBridge.invoke){WeixinJSBridge.invoke("setFontSizeCallback",{fontSize:0},function(){})}}if(typeof WeixinJSBridge!=="undefined"){setTimeout(setWechatSize,0)}else{document.addEventListener("WeixinJSBridgeReady",function(){setTimeout(setWechatSize,0)})};}());
             }
             }
         </script>
         </script>
 
 

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.7.2",
+  "version": "5.7.3",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -103,7 +103,7 @@
     "yoho-fastclick": "^1.0.6",
     "yoho-fastclick": "^1.0.6",
     "yoho-hammer": "^2.0.7",
     "yoho-hammer": "^2.0.7",
     "yoho-iscroll": "^5.2.0",
     "yoho-iscroll": "^5.2.0",
-    "yoho-jquery": "^2.2.4",
+    "yoho-jquery": "^1.12.4",
     "yoho-jquery-lazyload": "^1.9.12",
     "yoho-jquery-lazyload": "^1.9.12",
     "yoho-jquery-qrcode": "^0.14.0",
     "yoho-jquery-qrcode": "^0.14.0",
     "yoho-mlellipsis": "0.0.3",
     "yoho-mlellipsis": "0.0.3",

@@ -15,13 +15,13 @@ let fCbFn, hCbFn; // 筛选和关闭的回调
 // 隐藏筛选界面
 // 隐藏筛选界面
 function hideFilter() {
 function hideFilter() {
     setTimeout(function() {
     setTimeout(function() {
-        $filter.addClass('hide');
+        $filter && $filter.addClass('hide');
     }, 301);
     }, 301);
 }
 }
 
 
 // 显示筛选界面
 // 显示筛选界面
 function showFilter() {
 function showFilter() {
-    $filter.removeClass('hide');
+    $filter && $filter.removeClass('hide');
 }
 }
 
 
 // 一级菜单点击时背景高亮
 // 一级菜单点击时背景高亮

@@ -313,8 +313,7 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
             finalDetail.push({
             finalDetail.push({
                 relatedReco: {
                 relatedReco: {
                     isApp: isApp,
                     isApp: isApp,
-                    goods: goodsData,
-                    moreNum: goodsData.length - 2 > 0 ? goodsData.length - 2 : 0
+                    goods: goodsData
                 }
                 }
             });
             });
         }
         }
@@ -380,14 +379,26 @@ const pushGoodsInfo = (finalDetail, goodsList, isApp) => {
 
 
     _.forEach(finalDetail, (value, key) => {
     _.forEach(finalDetail, (value, key) => {
         if (value.relatedReco) {
         if (value.relatedReco) {
-            _.forEach(value.relatedReco.goods, (item, subKey) => {
-                if (goodsObj[item.id]) {
-                    finalDetail[key].relatedReco.goods[subKey] = goodsObj[item.id];
+            let goodsIds = [];
+
+            _.forEach(value.relatedReco.goods, relatedGoods => {
+                goodsIds.push(relatedGoods.id);
+            });
+
+            goodsIds = _.uniq(goodsIds);
+            finalDetail[key].relatedReco.goods = [];
+
+            _.forEach(goodsIds, (item, subKey) => {
+                if (goodsObj[item]) {
+                    finalDetail[key].relatedReco.goods[subKey] = goodsObj[item];
                 } else {
                 } else {
                     delete finalDetail[key].relatedReco.goods[subKey];
                     delete finalDetail[key].relatedReco.goods[subKey];
-                    finalDetail[key].relatedReco.moreNum--;
                 }
                 }
             });
             });
+
+            let moreNum = _.get(finalDetail[key], 'relatedReco.goods.length', 0);
+
+            finalDetail[key].relatedReco.moreNum = moreNum - 2 > 0 ? moreNum - 2 : 0;
         }
         }
 
 
         if (value.collocation) {
         if (value.collocation) {