Merge branch 'master' into hotfix/plusstarFooter

@@ -136,7 +136,7 @@ const _shop = (req, res, shopId) => {
                 _.forEach(result.hotList, (value, key) => {
                     result.hotList[key].tags = {};
                     result.hotList[key].is_soon_sold_out = false;
-                    result.hotList[key].tags.isHot = true;
+                    result.hotList[key].tags.is_hot = true;
                 });
 
                 // 有领券功能，不缓存
@@ -495,6 +495,9 @@ const userCoupon = (req, res, next) => {
         }
     }
 
+    cryptCouponId = parseInt(cryptCouponId, 10);
+    uid = parseInt(uid, 10);
+
     if (uid) {
         listModel.receiveCoupon(
             uid,

-
 'use strict';
 
 const SECOND = 1;
@@ -43,6 +42,7 @@ const cachePage = {
 
     // 秒杀列表
     '/product/seckill': 30 * SECOND,
+    '/product/seckill/list': 30 * SECOND,
 
     // 秒杀详情
     '/product/^\\/seckill\\/pro_([\\d]+)_([\\d]+)/': 30 * MINUTE,
@@ -64,10 +64,17 @@ const cachePage = {
     '/brands': 5 * MINUTE,
     '/brands/search': 1 * MINUTE,
 
-    //活动
+    // 直播活动
+    '/activity/live': 1 * MINUTE,
+
+    // 单品日
     '/activity/single-day': 1 * MINUTE,
+    '/activity/single-day/getSingleData': 30 * SECOND,
+    '/activity/single-day/getProductData': 30 * SECOND,
+
+    // 店铺收藏
     '/activity/shopCollect': 1 * MINUTE,
-    '/activity/live': 1 * MINUTE
+    '/activity/shopNav': 30 * SECOND
 
 };