activity/individuation接口增加团购价格

@@ -14,11 +14,12 @@ let _getProduct = function(o) {
         brand_domain: o.brand_domain,
         brand_name: o.brand_name,
         product_id: o.product_id,
+        collageprice: o.collage_price,
         product_name: o.product_name,
         product_skn: o.product_skn,
         vip_price: o.vip_price,
         market_price: o.market_price,
-        sales_price: o.sales_price,
+        sales_price: o.collage_price || o.sales_price, // 新需求，如果有拼团价则优先显示拼团价格
         cn_alphabet: o.cn_alphabet,
         default_images: o.default_images,
         goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : void 0
@@ -64,7 +65,8 @@ class individuationModel extends global.yoho.BaseModel {
             }, params),
             param: {cache: true}
         }).then(res => {
-            var data = [],
+            console.log(res.data);
+            let data = [],
                 lst = (res && res.data && res.data.product_list) || [];
 
             lst.forEach(function(o) {
@@ -87,7 +89,7 @@ class individuationModel extends global.yoho.BaseModel {
             },
             param: {cache: true}
         }).then(res => {
-            var data = [],
+            let data = [],
                 lst = (res && res.data && res.data.product_list) || [];
 
             lst.forEach(function(o) {