Authored by yyq

Merge branch 'feature/activityTpl' into release/6.7.9

@@ -152,7 +152,7 @@ class featureModel extends global.yoho.BaseModel { @@ -152,7 +152,7 @@ class featureModel extends global.yoho.BaseModel {
152 let replaceKey = '__skn__'; 152 let replaceKey = '__skn__';
153 let replaceReg = new RegExp(replaceKey, 'g'); 153 let replaceReg = new RegExp(replaceKey, 'g');
154 let productUrl = `//m.yohobuy.com/product/${replaceKey}.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${replaceKey}","activity_id":"${activityId}","activity_type":"groupPurchase"}}`; // eslint-disable-line 154 let productUrl = `//m.yohobuy.com/product/${replaceKey}.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${replaceKey}","activity_id":"${activityId}","activity_type":"groupPurchase"}}`; // eslint-disable-line
155 - let defaultPros = result.data || []; 155 + let defaultPros = _.get(result, 'data.collageProductVoList', []);
156 156
157 if (!ctx.req.yoho.isApp) { 157 if (!ctx.req.yoho.isApp) {
158 productUrl = 'javascript:;'; // eslint-disable-line 158 productUrl = 'javascript:;'; // eslint-disable-line