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

@@ -249,7 +249,7 @@ const _getContent = (data, params, isApp, appVersion) => {
         }
 
         // tar note 处理楼层标题
-        if (fun === 'getCoupon' && _.has(data[i - 1], 'template_name') && data[i - 1].template_name === 'text') {
+        if (fun === 'getCoupon' && data[i].data.length && _.has(data[i - 1], 'template_name') && data[i - 1].template_name === 'text') {
             data[i].data[0].floorTitle = data[i - 1].data;
         }
         build = processFun[fun](data[i].data, isApp);

 'use strict';
 
 const api = global.yoho.API;
-const logger = global.yoho.logger;
 const utils = '../../../utils';
 const productProcess = require(`${utils}/product-process`);
 
@@ -29,8 +28,6 @@ const mayLike = (uid, page, limit, gender, udid, recPos, channel) => {
                 }
             }
 
-        } else {
-            logger.error('mayLike cood 不是 200');
         }
     });
 };
@@ -54,8 +51,6 @@ const mayLikeKids = (page, limit, channel) => {
                 return productProcess.processProductList(result.data.product_list);
 
             }
-        } else {
-            logger.error('mayLikeKids cood 不是 200');
         }
     });
 };

@@ -2,24 +2,24 @@
     <div class="good-info {{#if @root.saleViplogin}}sale-vip{{/if}}" data-good-id="{{product_id}}" data-id="{{product_skn}}" data-bp-id="guang_goodList_{{product_name}}_false">
         <div class="tag-container clearfix">
             {{# tags}}
-                {{# is_new}}
+                {{# isNew}}
                     <p class="good-tag new-tag">NEW</p>
-                {{/ is_new}}
-                {{# is_hot}}
+                {{/ isNew}}
+                {{# isHot}}
                     <p class="good-tag hot-tag">HOT</p>
-                {{/ is_hot}}
-                {{# is_advance}}
+                {{/ isHot}}
+                {{# isAdvance}}
                     <p class="good-tag renew-tag">再到着</p>
-                {{/ is_advance}}
-                {{# is_discount}}
+                {{/ isAdvance}}
+                {{# isDiscount}}
                     <p class="good-tag sale-tag">SALE</p>
-                {{/ is_discount}}
-                {{# is_yohood}}
+                {{/ isDiscount}}
+                {{# isYohood}}
                     <p class="good-tag new-festival-tag">新品节</p>
-                {{/ is_yohood}}
-                {{# is_limited}}
+                {{/ isYohood}}
+                {{# isLimited}}
                     <p class="good-tag limit-tag">限量商品</p>
-                {{/ is_limited}}
+                {{/ isLimited}}
             {{/ tags}}
         </div>
         <div class="good-detail-img">