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

@@ -3,6 +3,8 @@
 var api = global.yoho.API;
 
 const camelCase = global.yoho.camelCase;
+const helpers = global.yoho.helpers;
+const _ = require('lodash');
 
 /**
  * 分享页面基础参数
@@ -15,8 +17,40 @@ const getPreferenceData = (data) => {
     let list = data.data || {};
 
     list = camelCase(list);
+
+    let distGoods = [];
+
+    _.forEach(list.productList, function(value) {
+
+        if (!value.productSkn || !value.goodsList || !value.goodsList.length) {
+            return;
+        }
+        value.goodsId = value.goodsList[0].goodsId;
+
+        let goods = value;
+
+        goods.url = helpers.urlFormat(`/product/pro_${value.productId}_${value.goodsId}/${value.cnAlphabet}.html`);
+        if (_.get(goods, 'tags[0]', null)) {
+            goods.tags = [];
+            if (goods.isNew === 'Y') {
+                goods.tags.push({isNew: true});
+            } else if (goods.isAdvance === 'Y') {
+                goods.tags.push({isAdvance: true});
+            } else if (goods.isDiscount === 'Y') {
+                goods.tags.push({isDiscount: true});
+            } else if (goods.isYohoood === 'Y') {
+                goods.tags.push({isYohoood: true});
+            } else if (goods.isLimited === 'Y') {
+                goods.tags.push({isLimited: true});
+            }
+        }
+        distGoods.push(goods);
+    });
+
+
+
     dest.code = list.code;
-    dest.goods = list.productList;
+    dest.goods = distGoods;
     dest.rec_id = list.recId;
     dest.message = list.message;
 
@@ -35,6 +69,7 @@ exports.getPreference = (data) => {
         infoData = Object.assign(defaultParam, data); // 处理完成后，发给后端
 
     return api.get('', infoData).then(result => {
+
         return getPreferenceData(result);
     }); // 所有数据返回一个 Promise，方便 Promise.all 调用
 };

@@ -15,11 +15,8 @@ module.exports = {
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     domains: {
-        api: 'http://api.yoho.yohoops.org/',
-        service: 'http://service.yoho.yohoops.org/'
-
-        // api: 'http://devapi.yoho.cn:58078/',
-        // service: 'http://devservice.yoho.cn:58077/'
+        api: 'http://devapi.yoho.cn:58078/',
+        service: 'http://devservice.yoho.cn:58077/'
     },
     subDomains: {
         host: '.m.yohobuy.com',