merge

@@ -158,6 +158,8 @@ const index = (req, res, next) => {
             if (focusIndex !== -1) {
             if (focusIndex !== -1) {
                 result.activitys[focusIndex].focus = true;
                 result.activitys[focusIndex].focus = true;
                 focusIndex = true;
                 focusIndex = true;
+            } else {
+                focusIndex = false;
             }
             }
         }
         }
 
 
@@ -179,12 +181,13 @@ const index = (req, res, next) => {
 
 
                     if (nowTime < nextTime) { // 下一个时间段与当前时间来区别是否正在抢购
                     if (nowTime < nextTime) { // 下一个时间段与当前时间来区别是否正在抢购
                         activity.now = true;
                         activity.now = true;
-                        focusIndex || (activity.focus = true);
+                        focusIndex || (activity.focus = focusIndex = true);
                     } else {
                     } else {
                         activity.over = true;
                         activity.over = true;
                     }
                     }
                 } else { // 大于这个时间段但是后面没有秒抢时间端了，则依然显示抢购中
                 } else { // 大于这个时间段但是后面没有秒抢时间端了，则依然显示抢购中
                     activity.now = true;
                     activity.now = true;
+                    focusIndex || (activity.focus = focusIndex = true);
                 }
                 }
             } else {
             } else {
                 activity.wait = true;
                 activity.wait = true;

@@ -8,7 +8,6 @@
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 
 
 module.exports = (req, res, next) => {
 module.exports = (req, res, next) => {
-    console.log('....');
     if (!req.user.uid) {
     if (!req.user.uid) {
         if (req.xhr) {
         if (req.xhr) {
             return res.json({
             return res.json({