merge

@@ -259,17 +259,3 @@ exports.consultsubmit = (req, res, next) => {
         return res.json(data);
         return res.json(data);
     }).catch(next);
     }).catch(next);
 };
 };
-
-exports.getSeckillData = (req, res) => {
-
-    detailModel.getSeckillData({
-
-        productskn: req.params.productskn
-
-    }, req).then(result => {
-
-        return res.json(result);
-
-    });
-
-};

@@ -60,7 +60,7 @@ exports.index = (req, res, next) => {
         res.render('detail/detail', {
         res.render('detail/detail', {
             pageHeader: headerData,
             pageHeader: headerData,
             result: result,
             result: result,
-            page: 'detail',
+            page: 'seckill-detail',
             title: result.goodsName,
             title: result.goodsName,
             pageFooter: true
             pageFooter: true
         });
         });
@@ -94,7 +94,7 @@ exports.indexSkn = (req, res, next) => {
         res.render('detail/detail', {
         res.render('detail/detail', {
             pageHeader: headerData,
             pageHeader: headerData,
             result: result,
             result: result,
-            page: 'detail',
+            page: 'seckill-detail',
             title: result.goodsName,
             title: result.goodsName,
             pageFooter: true
             pageFooter: true
         });
         });

@@ -104,28 +104,12 @@ function fetchProductList(activityInfo, uid) {
         });
         });
 }
 }
 
 
-let _helpers = {
-    statusClass: (nav) => {
-        if (nav.over) {
-            return 'over';
-        } else if (nav.now) {
-            return 'now';
-        } else if (nav.wait) {
-            return 'wait';
-        } else {
-            return '';
-        }
-    },
-    readaleTime: (unixStamp) => {
-        return moment.unix(unixStamp).format('MM月DD日 HH:mm');
-    }
-};
-
 
 
 /**
 /**
  * [秒杀列表页面]
  * [秒杀列表页面]
  */
  */
 const index = (req, res, next) => {
 const index = (req, res, next) => {
+    let focusTime = Number.parseInt(req.query.t, 10) || 0;
     let headerData = headerModel.setNav({
     let headerData = headerModel.setNav({
         navTitle: '秒杀活动',
         navTitle: '秒杀活动',
         navBtn: true,
         navBtn: true,
@@ -145,6 +129,9 @@ const index = (req, res, next) => {
 
 
     return seckillModel.queryActivity().then((resultActivity) => {
     return seckillModel.queryActivity().then((resultActivity) => {
         // console.log(resultActivity)
         // console.log(resultActivity)
+        let focusIndex = false;
+        let nowTime = Date.parse(new Date());
+
         if (resultActivity.code !== 200) {
         if (resultActivity.code !== 200) {
             return next();
             return next();
         }
         }
@@ -162,7 +149,17 @@ const index = (req, res, next) => {
         }
         }
 
 
         result.activitys = resultActivity.data.secKillProductVoList.sort((a, b) => a.startTime - b.startTime); // orderBy startTime ASC
         result.activitys = resultActivity.data.secKillProductVoList.sort((a, b) => a.startTime - b.startTime); // orderBy startTime ASC
-        let nowTime = Date.parse(new Date());
+
+        if (focusTime) {
+            focusTime = moment(focusTime, 'YYYYMMDDHHmmss').unix();
+            focusIndex = result.activitys.findIndex(activity=> activity.startTime === focusTime);
+            console.log(focusIndex)
+            if (focusIndex !== -1) {
+                result.activitys[focusIndex].focus = true;
+                focusIndex = true;
+            }
+        }
+
 
 
         result.activitys.forEach((activity, i) => {
         result.activitys.forEach((activity, i) => {
             let date,
             let date,
@@ -181,7 +178,7 @@ const index = (req, res, next) => {
 
 
                     if (nowTime < nextTime) { // 下一个时间段与当前时间来区别是否正在抢购
                     if (nowTime < nextTime) { // 下一个时间段与当前时间来区别是否正在抢购
                         activity.now = true;
                         activity.now = true;
-                        activity.focus = true;
+                        focusIndex || (activity.focus = true);
                     } else {
                     } else {
                         activity.over = true;
                         activity.over = true;
                     }
                     }

@@ -970,34 +970,6 @@ const _getCommonConsult = () => {
     });
     });
 };
 };
 
 
-/**
- * 获取秒杀列表
- */
-const getSeckillData = (param) => {
-    let params = {
-        method: 'app.seckill.data',
-        product_skn: param.productskn
-    };
-
-    return api.get('', params, {
-        code: 200
-    })
-
-    // mock
-    .catch()
-    .then(result => {
-        let data = {};
-
-        if (result.data) {
-            data = result.data;
-        } else {
-            data.status = 0;
-        }
-
-        return data;
-    });
-};
-
 let getProductData = (data) => {
 let getProductData = (data) => {
     let finalResult = {};
     let finalResult = {};
 
 
@@ -1102,6 +1074,5 @@ let _productInfoBySkns = (skns) => {
 module.exports = {
 module.exports = {
     getProductData,
     getProductData,
     getUserProfile: _getUserProfile,
     getUserProfile: _getUserProfile,
-    getSeckillData,
     productInfoBySkns: _productInfoBySkns
     productInfoBySkns: _productInfoBySkns
 };
 };

@@ -623,7 +623,6 @@ let getProductData = (data) => {
                 finalResult.enterStore = info[0];
                 finalResult.enterStore = info[0];
                 finalResult.isStudent = data.isStudent;
                 finalResult.isStudent = data.isStudent;
                 Object.assign(finalResult.feedbacks, info[2]);
                 Object.assign(finalResult.feedbacks, info[2]);
-                Object.assign(finalResult, {isSecKill: result.isSecKill});
                 finalResult.goodsPrice.previousPrice = '¥' + result.marketPrice;
                 finalResult.goodsPrice.previousPrice = '¥' + result.marketPrice;
 
 
                 /* 预售商品不能购买 */
                 /* 预售商品不能购买 */

@@ -28,8 +28,6 @@ const queryProductList = (activityId) => {
     return api.get('', {
     return api.get('', {
         method: 'app.seckill.queryProductList',
         method: 'app.seckill.queryProductList',
         activityId: activityId
         activityId: activityId
-    }, {
-        cache: true
     });
     });
 };
 };
 
 

@@ -232,7 +232,5 @@
         <input type="hidden" id="showPannel" value="1">
         <input type="hidden" id="showPannel" value="1">
     {{/if}}
     {{/if}}
 
 
-    <input type="hidden" id="isSecKill" value = "{{isSecKill}}">
-
 </div>
 </div>
 {{/ result}}
 {{/ result}}

@@ -20,6 +20,7 @@ module.exports = {
         service: 'http://service.yoho.cn/',
         service: 'http://service.yoho.cn/',
         liveApi: 'http://api.live.yoho.cn/',
         liveApi: 'http://api.live.yoho.cn/',
         singleApi: 'http://single.yoho.cn/'
         singleApi: 'http://single.yoho.cn/'
+
         // service: 'http://service-test1.yohops.com:9999/',
         // service: 'http://service-test1.yohops.com:9999/',
 
 
         // api: 'http://api.yoho.cn/',
         // api: 'http://api.yoho.cn/',

@@ -3,7 +3,7 @@
 		<img class="lazy" data-original="{{image defaultImages 235 314}}" alt="">
 		<img class="lazy" data-original="{{image defaultImages 235 314}}" alt="">
 	</div>
 	</div>
 	<div class="item-info">
 	<div class="item-info">
-		<div class="item-title">
+		<div class="item-title line-clamp-2">
 			{{productName}}
 			{{productName}}
 		</div>
 		</div>
 		{{#if wait}}
 		{{#if wait}}

@@ -23,10 +23,6 @@ var dialog = require('../plugin/dialog');
 
 
 require('../common');
 require('../common');
 
 
-if ($('#isSecKill').val() === 'Y') {
-    require('./tick');
-}
-
 // add extra marign-bottom for footer to show the yoho copyright
 // add extra marign-bottom for footer to show the yoho copyright
 function showFooter() {
 function showFooter() {
     var $cartBar = $('.cart-bar');
     var $cartBar = $('.cart-bar');

+/**
+ *  商品详情
+ * @author: liangzhifeng<zhifeng.liang@yoho.cn>
+ * @date: 2015/10/20
+ */
+var $ = require('yoho-jquery'),
+    Swiper = require('yoho-swiper'),
+    Hammer = require('yoho-hammer'),
+    lazyLoad = require('yoho-jquery-lazyload');
+
+var $discountFolder = $('.goods-discount .discount-folder'),
+    $discountArrow = $('.goods-discount .first-item span');
+
+var goodsDiscountEl = document.getElementById('goodsDiscount'),
+    goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl),
+    $discountFirstItem = $(goodsDiscountEl).find('.first-item');
+
+var $cart = $('.cart-bar');
+
+var appUrl = $('input[name="limitCodeUrl"]').val();
+
+var dialog = require('../plugin/dialog');
+
+require('../common');
+
+require('./tick');
+
+// add extra marign-bottom for footer to show the yoho copyright
+function showFooter() {
+    var $cartBar = $('.cart-bar');
+
+    var timer = setInterval(function() {
+        if ($cartBar) {
+            window.reMarginFooter('.cart-bar');
+            clearInterval(timer);
+        } else {
+            $cartBar = $('.cart-bar');
+        }
+    }, 200);
+}
+
+showFooter();
+
+lazyLoad($('img.lazy'));
+
+if ($('#goodsDiscount h1').length < 1) {
+    $('.dropdown').remove();
+}
+
+// 顶部swiper
+new Swiper('.banner-swiper', {
+    lazyLoading: true,
+    lazyLoadingInPrevNext: true,
+    paginationClickable: true,
+    pagination: '.banner-top .pagination-inner',
+    nextButton: '.my-swiper-button-next',
+    prevButton: '.my-swiper-button-prev',
+    spaceBetween: 3
+});
+
+// 初始化goods-discount
+if ($discountFolder.children().length === 0) {
+    $discountFolder.css('display', 'none');
+    $discountArrow.html('');
+}
+
+// goods-discount下拉按钮点击事件
+if (goodsDiscountHammer && $discountFolder.children().length > 0) {
+    goodsDiscountHammer.on('tap', function() {
+        if ($discountFolder.is(':hidden')) {
+            $discountFirstItem.removeClass('short-text');
+            $discountArrow.removeClass('icon-down').addClass('icon-up').html('&#xe608;');
+            $discountFolder.slideDown();
+        } else {
+            $discountFirstItem.addClass('short-text');
+            $discountArrow.removeClass('icon-up').addClass('icon-down').html('&#xe609;');
+            $discountFolder.slideUp();
+        }
+    });
+}
+
+$('#limit-sale').on('touchend', function(e) {
+    var loginUrl = $('#loginUrl').val(),
+        time,
+        ifr;
+
+    e.stopPropagation();
+
+    if (loginUrl) {
+        window.location = loginUrl;
+    } else {
+        dialog.showDialog({
+            dialogText: '进入有货APP，获取限购码',
+            hasFooter: {
+                rightBtnText: '打开Yoho!Buy有货APP'
+            }
+        }, function() {
+            ifr = document.createElement('iframe');
+            ifr.src = appUrl;
+            ifr.style.display = 'none';
+            document.body.appendChild(ifr);
+            window.location.href = appUrl;
+
+            time = Date.now();
+            window.setTimeout(function() {
+                document.body.removeChild(ifr);
+                if (Date.now() - time < 3200) {
+                    window.location.href = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho';
+                }
+            }, 3000);
+
+        }, null, true);
+
+        $('.dialog-wrapper').off('touchstart').on('touchstart', function(para) {
+            para.stopPropagation();
+            if ($(para.target).hasClass('dialog-wrapper')) {
+                dialog.hideDialog();
+            }
+        });
+    }
+});
+
+require('./detail/like');
+require('./detail/desc');
+require('./detail/comments-consults');
+require('./detail/consultform');
+require('./detail/recommend-for-you-product-desc');
+
+// 购物车商品数量
+$.ajax({
+    type: 'GET',
+    url: '/cart/index/count',
+    success: function(data) {
+        var count;
+
+        if (data.code === 200) {
+            count = data.data.cart_goods_count || 0;
+            if (count === 0) {
+                return false;
+            }
+            if (count > 99) {
+                count = '99+';
+            }
+            $cart.find('.num-tag').html(count).removeClass('hide');
+        }
+    }
+});
+
+if ($('.good-detail-page').length > 0) {
+    $('#yoho-footer').css('border-top', '1px solid #e0e0e0');
+}

@@ -380,7 +380,7 @@ seckillObj = {
         var $xhr;
         var $xhr;
 
 
         loading.show();
         loading.show();
-        $xhr = $.get('/product/seckill')
+        $xhr = $.get(location.href)
             .done(function(result) {
             .done(function(result) {
                 self.$container.html(
                 self.$container.html(
                     self.pageTemplate($.extend(result, {
                     self.pageTemplate($.extend(result, {