Authored by 邱骏

团购商品跳转到团购商品页

@@ -49,8 +49,14 @@ class featureModel extends global.yoho.BaseModel { @@ -49,8 +49,14 @@ class featureModel extends global.yoho.BaseModel {
49 49
50 _.forEach(result, item => { 50 _.forEach(result, item => {
51 _.get(item, 'data.product_list', []).forEach(function(val) { 51 _.get(item, 'data.product_list', []).forEach(function(val) {
52 - var obj = {  
53 - producturl: `//m.yohobuy.com/product/${val.product_skn}.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${val.product_skn}","from_page_name":"${yasProcess.getPname(ctx.req)}","from_page_param":"${_.get(ctx,'req.url', '')}"}}`, // eslint-disable-line 52 + let productURL = `//m.yohobuy.com/product/${val.product_skn}.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${val.product_skn}","from_page_name":"${yasProcess.getPname(ctx.req)}","from_page_param":"${_.get(ctx,'req.url', '')}"}}`; // eslint-disable-line
  53 +
  54 + if (val.collage_price && val.collage_activity_id) {
  55 + productURL = `//m.yohobuy.com/activity/group/detail?activityId=${val.collage_activity_id}&productSkn=${val.product_skn}&openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${val.product_skn}","activity_id":"${val.collage_activity_id}","activity_type":"groupPurchase"}}`; // eslint-disable-line
  56 + }
  57 +
  58 + let obj = {
  59 + producturl: productURL,
54 productimg: helpers.image(val.default_images, 213, 284, 2, 60).replace('quality/80', 'quality/60'), // eslint-disable-line 60 productimg: helpers.image(val.default_images, 213, 284, 2, 60).replace('quality/80', 'quality/60'), // eslint-disable-line
55 productname: val.product_name, 61 productname: val.product_name,
56 vipprice: val.vip_price, 62 vipprice: val.vip_price,
@@ -58,6 +64,7 @@ class featureModel extends global.yoho.BaseModel { @@ -58,6 +64,7 @@ class featureModel extends global.yoho.BaseModel {
58 marketprice: val.sales_price === val.market_price ? '' : val.market_price, 64 marketprice: val.sales_price === val.market_price ? '' : val.market_price,
59 brandname: val.brand_name, 65 brandname: val.brand_name,
60 collageprice: val.collage_price, 66 collageprice: val.collage_price,
  67 + collage_activity_id: val.collage_activity_id,
61 product_skn: val.product_skn, 68 product_skn: val.product_skn,
62 product_price_plan_list: _.sortBy(val.product_price_plan_list, o => { 69 product_price_plan_list: _.sortBy(val.product_price_plan_list, o => {
63 return +o.show_begin_time; 70 return +o.show_begin_time;
@@ -57,7 +57,7 @@ module.exports = { @@ -57,7 +57,7 @@ module.exports = {
57 testCode: 'yoho4946abcdef#$%&!@', 57 testCode: 'yoho4946abcdef#$%&!@',
58 domains: domains, 58 domains: domains,
59 59
60 - yohoVerifyUdid: 'ca5c462a-e28b-407d-8061-5e204398e3cc', 60 + // yohoVerifyUdid: 'ca5c462a-e28b-407d-8061-5e204398e3cc',
61 signExtend: { 61 signExtend: {
62 business_line: 'yohobuy' 62 business_line: 'yohobuy'
63 }, 63 },