Merge branch 'feature/reds' into release/5.6

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-03-23 11:02:31
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-13 20:03:26
+ * @Last Modified time: 2017-04-14 10:22:13
  */
 /* 红人店铺数据处理 */
 
@@ -301,9 +301,12 @@ const pushGoodsInfo = (decorators, goodsList) => {
     _.forEach(decorators, (value, key) => {
         _.forEach(_.get(value, 'pics', []), (subValue, subKey) => {
             if (subValue.skn) {
+                let salesPrice = _.get(goodsObj, `${subValue.skn}.sales_price`, '');
+                let marketPrice = _.get(goodsObj, `${subValue.skn}.market_price`, '');
+
                 decorators[key].pics[subKey].name = _.get(goodsObj, `${subValue.skn}.product_name`, '');
-                decorators[key].pics[subKey].salesPrice = '￥' + _.get(goodsObj, `${subValue.skn}.sales_price`, '');
-                decorators[key].pics[subKey].marketPrice = '￥' + _.get(goodsObj, `${subValue.skn}.market_price`, '');
+                decorators[key].pics[subKey].salesPrice = salesPrice ? '￥' + salesPrice : '';
+                decorators[key].pics[subKey].marketPrice = marketPrice ? '￥' + marketPrice : '';
             }
         });
     });