秒杀详情活动结束跳普通详情页

@@ -24,7 +24,7 @@
 			<div class="item-button">
 			<div class="item-button">
 				{{#if over}}
 				{{#if over}}
 					<span class="old-price">还可以原价购买</span>
 					<span class="old-price">还可以原价购买</span>
-					<a href='/product/show_{{{productSkn}}}{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}"}}{{/if}}' class="btn btn-over">已抢光</a>
+					<a href='/product/seckill/show_{{{productSkn}}}{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}"}}{{/if}}' class="btn btn-over">已抢光</a>
 				{{else if wait}}
 				{{else if wait}}
 					{{#if @root.isApp}}
 					{{#if @root.isApp}}
 						{{#unless hideRemind}}
 						{{#unless hideRemind}}

@@ -81,12 +81,14 @@ $(
             url: ajaxUrl + '?tamp=' + timestamp,
             url: ajaxUrl + '?tamp=' + timestamp,
             success: function(data) {
             success: function(data) {
                 // 秒杀是否结束
                 // 秒杀是否结束
-                if (data.status !== 1 && data.status !== 2) {
-                    $('.sold-out').hide();
-                    $('.cart-bar a:first').append('<a href="javascript:;" class="sold-out">已售罄</a>');
-                    $('.addto-cart').hide();
-                    $('.cart-bar').show();
-                    $('.current-price').show();
+                if (data == '' || data.status === 0 || data.status === 3) {
+                    window.location.replace('/product/show_' + $('#productSkn').val() + '.html');
+
+                    // $('.sold-out').hide();
+                    // $('.cart-bar a:first').append('<a href="javascript:;" class="sold-out">已售罄</a>');
+                    // $('.addto-cart').hide();
+                    // $('.cart-bar').show();
+                    // $('.current-price').show();
                 } else {
                 } else {
 
 
                     getMarketPrice();// 获取市场价
                     getMarketPrice();// 获取市场价
@@ -151,28 +153,9 @@ $(
 
 
                         seckHide();// 非秒杀库存置灰
                         seckHide();// 非秒杀库存置灰
 
 
-                        $('.price-date').append(
-                            '<div class="seckill-time seckill-time-border">' +
-                                '<span>距结束&nbsp</span>' +
-                                '<span class="end-time">' +
-                                    '<i class="tick day hide">00</i>' +
-                                    '<i class="tick hour">00</i>:' +
-                                    '<i class="tick minute">00</i>:' +
-                                    '<i class="tick second">00</i>' +
-                                '</span>' +
-                            '</div>'
-                        );
-                        $('.text-info').append(
-                            '<div class="seckill-time seckill-time-border seckill-chose">' +
-                                '<span>距结束&nbsp</span>' +
-                                '<span class="end-time">' +
-                                    '<i class="tick day hide">00</i>' +
-                                    '<i class="tick hour">00</i>:' +
-                                    '<i class="tick minute">00</i>:' +
-                                    '<i class="tick second">00</i>' +
-                                '</span>' +
-                            '</div>'
-                        );
+                        // 插入倒计时
+                        addTimeout($('.price-date'));
+                        addTimeout($('.text-info'));
                         $('.current-price').text('¥' + data.secKillPrice).show();
                         $('.current-price').text('¥' + data.secKillPrice).show();
                         $('.sale-price').text('¥' + data.secKillPrice).show();
                         $('.sale-price').text('¥' + data.secKillPrice).show();
                         $('.chose-items .num').find('.clearfix').append(
                         $('.chose-items .num').find('.clearfix').append(
@@ -276,6 +259,7 @@ function getMarketPrice() {
     var productId = $('#productId').val();
     var productId = $('#productId').val();
     var goodsId = $('#goodsId').val();
     var goodsId = $('#goodsId').val();
     var productSkn = $('#productSkn').val();
     var productSkn = $('#productSkn').val();
+
     if (productId && (goodsId || productSkn)) {
     if (productId && (goodsId || productSkn)) {
         $.ajax({
         $.ajax({
             type: 'POST',
             type: 'POST',
@@ -289,7 +273,19 @@ function getMarketPrice() {
                 $('.previous-price').text(data.goodsPrice.currentPrice);
                 $('.previous-price').text(data.goodsPrice.currentPrice);
             }
             }
         });
         });
-    } else {
-        callback();
     }
     }
 }
 }
+
+function addTimeout(obj) {
+    obj.append(
+        '<div class="seckill-time seckill-time-border">' +
+            '<span>距结束&nbsp</span>' +
+            '<span class="end-time">' +
+                '<i class="tick day hide">00</i>' +
+                '<i class="tick hour">00</i>:' +
+                '<i class="tick minute">00</i>:' +
+                '<i class="tick second">00</i>' +
+            '</span>' +
+        '</div>'
+    );
+}

@@ -44,6 +44,13 @@
     .text-info {
     .text-info {
         height: auto;
         height: auto;
 
 
+        .seckill-time {
+            position: absolute;
+            bottom: 0px;
+            right: 0px;
+            float: none;
+        }
+
         .name {
         .name {
             display: -webkit-box;
             display: -webkit-box;
             overflow: hidden;
             overflow: hidden;