Merge branch 'feature/guang2' into 'release/5.8'

goods-limit



See merge request !630

@@ -314,20 +314,31 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
             }
             }
         }
         }
 
 
-        // 相关商品 170505 更改了前端样式
-        if (_.get(value, 'goods.data', false) || _.get(value, 'goods.dataGlobal', false)) {
+        // 相关商品
+        if (_.get(value, 'goods.data', false) ||
+            _.get(value, 'goods.dataGlobal', false) ||
+            _.get(value, 'goods.dataLimit', false)) {
             let goodsData = _.get(value, 'goods.data', []);
             let goodsData = _.get(value, 'goods.data', []);
             let goodsDataGlobal = _.get(value, 'goods.dataGlobal', []);
             let goodsDataGlobal = _.get(value, 'goods.dataGlobal', []);
+            let goodsDataLimit = _.get(value, 'goods.dataLimit', []);
 
 
+            // 普通商品
             _.forEach(goodsData, item => {
             _.forEach(goodsData, item => {
                 allgoods += item.id + ',';
                 allgoods += item.id + ',';
             });
             });
 
 
+            // 全球购商品
             _.forEach(goodsDataGlobal, item => {
             _.forEach(goodsDataGlobal, item => {
                 allgoods += item.id + ',';
                 allgoods += item.id + ',';
                 goodsData.push(item);
                 goodsData.push(item);
             });
             });
 
 
+            // 限定商品
+            _.forEach(goodsDataLimit, item => {
+                allgoods += item.id + ',';
+                goodsData.push(item);
+            });
+
             finalDetail.push({
             finalDetail.push({
                 relatedReco: {
                 relatedReco: {
                     isApp: isApp,
                     isApp: isApp,