Authored by zhaoqing

Merge branch 'dev_collage_activity' into test6.8.4

... ... @@ -324,6 +324,9 @@ var g = new common.grid({
if (item.isLimitbuy) {
html.push(ENUM.isLimitbuy[item.isLimitbuy] + "</br>");
}
if(item.isCollageProduct){
html.push(item.isCollageProduct + "</br>");
}
return '<div id="property_'+ item.__index + '" data-skn="'+ item.productSkn + '">' + html.join('') + '</div>';
}
},{
... ...