Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuywap-node into release/4.6

@@ -114,6 +114,7 @@ const convertActicityData = (data) => {
             discountText = transDiscountToArr(discountArr[1])[1];
             discountText = transDiscountToArr(discountArr[1])[1];
         }
         }
 
 
+
         formatData.push({
         formatData.push({
             activityUrl: '/product/outlet/activity?id=' + item.id,
             activityUrl: '/product/outlet/activity?id=' + item.id,
             coverUrl: item.coverUrl,
             coverUrl: item.coverUrl,
@@ -121,6 +122,7 @@ const convertActicityData = (data) => {
             title: item.title,
             title: item.title,
             discountNum: discountNum,
             discountNum: discountNum,
             discountText: discountText,
             discountText: discountText,
+            productPoolId: item.productPoolId || '',
             leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime,
             leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime,
             hide: false
             hide: false
         });
         });
@@ -134,12 +136,10 @@ const getActivityDetail = (id) => {
         method: 'app.outlets.activityGet',
         method: 'app.outlets.activityGet',
         sort: 1,
         sort: 1,
         platform: 3,
         platform: 3,
-        // yh_channel: 1,
         id: id,
         id: id,
-        // type: 0
+        type: 0
     };
     };
 
 
-    console.log(id);
 
 
     return api.get('', sign.apiSign(params)).then(res => {
     return api.get('', sign.apiSign(params)).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
@@ -183,7 +183,6 @@ exports.getContent = (categoryId, channel, code) => {
 
 
 exports.getActivity = (id) => {
 exports.getActivity = (id) => {
     return getActivityDetail(id).then(res => {
     return getActivityDetail(id).then(res => {
-        console.log(res);
         return {
         return {
             activity: res,
             activity: res,
             productPool: res[0] && res[0].productPoolId || '',
             productPool: res[0] && res[0].productPoolId || '',

@@ -11,7 +11,6 @@ var iscroll = require('./outlet/nav');
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
-/**
 // 搜索条件初始化
 // 搜索条件初始化
 function searchInitParam(dom) {
 function searchInitParam(dom) {
     var href = dom.attr('href'),
     var href = dom.attr('href'),
@@ -106,4 +105,4 @@ $('.more-activity').click(function() {
             $(e).show();
             $(e).show();
         }
         }
     });
     });
-});**/
+});