goods-handle-ok

@@ -328,6 +328,26 @@ class DetailModel extends global.yoho.BaseModel {
             cache: true
             cache: true
         });
         });
     }
     }
+
+    /**
+     * [根据商品SKN获取商品的简要信息]
+     * @param  {[array]} sknString [skns]
+     * @return {[type]}
+     */
+    productInfoBySkns(sknString) {
+        // 调用搜索接口
+        let param = {
+            method: 'h5.product.batch',
+            productSkn: sknString,
+            order: 's_t_desc'
+        };
+
+        return api.get('', param, {
+            cache: true
+        }).then(result => {
+            return _.get(result, 'data.product_list', []);
+        });
+    }
 }
 }
 
 
 module.exports = DetailModel;
 module.exports = DetailModel;

@@ -88,7 +88,7 @@
                                             {{#each collocation}}
                                             {{#each collocation}}
                                                 <div class="prod {{#unless @first}}hide{{/unless}}">
                                                 <div class="prod {{#unless @first}}hide{{/unless}}">
                                                     {{# goods}}
                                                     {{# goods}}
-                                                        {{> good}}
+                                                        {{> common/goods}}
                                                     {{/ goods}}
                                                     {{/ goods}}
                                                 </div>
                                                 </div>
                                             {{/each}}
                                             {{/each}}

@@ -6,6 +6,17 @@
 const _ = require('lodash');
 const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const productNameProcess = require('./product-name-process');
 const productNameProcess = require('./product-name-process');
+const productPrcs = require('./product-process');
+
+/**
+ * 将商品转化成以 product_skn 为键名的对象
+ * @param {*} goodsArray
+ */
+const _goodsArrayToObj = (goodsArray) => {
+    return _.keyBy(goodsArray, value => {
+        return value.product_skn;
+    });
+};
 
 
 /**
 /**
  * [将首字符为//的url转换为http://]
  * [将首字符为//的url转换为http://]
@@ -344,6 +355,7 @@ const formatProduct = (productData, showTags, showNew, showSale, width, height,
 
 
 const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isWeibo) => {
 const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isWeibo) => {
     let finalDetail = [];
     let finalDetail = [];
+    let allgoods = '';
 
 
     _.forEach(articleContent, (value, index) => {
     _.forEach(articleContent, (value, index) => {
 
 
@@ -413,6 +425,10 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
             let relatedReco = [];
             let relatedReco = [];
             let moreThanOne = _.get(value, 'goods.data', []).length > 1;
             let moreThanOne = _.get(value, 'goods.data', []).length > 1;
 
 
+            _.forEach(_.get(value, 'goods.data', []), item => {
+                allgoods += item.id + ',';
+            });
+
             if (moreThanOne) {
             if (moreThanOne) {
                 relatedReco = _.get(value, 'goods.data', []);
                 relatedReco = _.get(value, 'goods.data', []);
             } else {
             } else {
@@ -431,6 +447,10 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
             _.forEach(_.get(value, 'goodsGroup.data', []), item => {
             _.forEach(_.get(value, 'goodsGroup.data', []), item => {
                 let cover = _.get(item, 'cover', '');
                 let cover = _.get(item, 'cover', '');
 
 
+                _.forEach(_.get(item, 'list', []), item2 => {
+                    allgoods += item2.id + ',';
+                });
+
                 collocation.push({
                 collocation.push({
                     thumb: cover ?
                     thumb: cover ?
                         helpers.image(cover.cover, 235, 314) : '',
                         helpers.image(cover.cover, 235, 314) : '',
@@ -453,8 +473,31 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
 
 
     });
     });
 
 
-    console.log(JSON.stringify(finalDetail, 2, 2));
-    console.log('-------------------------------------------------------------------------');
+    return {
+        finalDetail: finalDetail,
+        allgoods: allgoods
+    };
+};
+
+const pushGoodsInfo = (finalDetail, goodsList) => {
+    let goodsObj = _goodsArrayToObj(productPrcs.processProductList(goodsList));
+
+    // console.log(goodsList);
+    _.forEach(finalDetail, (value, key) => {
+        // if (value.relatedReco) {
+        //     console.log(value.relatedReco);
+        // }
+
+        if (value.collocation) {
+            _.forEach(value.collocation, (item, subKey) => {
+                _.forEach(item.goods, (thItem, thKey) => {
+                    finalDetail[key].collocation[subKey].goods[thKey] = goodsObj[thItem.id];
+                });
+            });
+        }
+    });
+
+    // console.log(JSON.stringify(finalDetail, 2, 2));
     return finalDetail;
     return finalDetail;
 };
 };
 
 
@@ -464,5 +507,6 @@ module.exports = {
     getFilterUrl,
     getFilterUrl,
     formatProduct,
     formatProduct,
     getProductIcon,
     getProductIcon,
-    processArticleDetail
+    processArticleDetail,
+    pushGoodsInfo
 };
 };