Merge branch 'feature/reSeckill' into 'release/5.5'

秒杀商品在非秒杀路径跳转秒杀路径



See merge request !347

@@ -109,6 +109,7 @@ setTimeout(() => {
                 success: (data) => {
                 success: (data) => {
                     // 如果当前是秒杀商品，且不在秒杀路径下，跳到该商品的秒杀详情页
                     // 如果当前是秒杀商品，且不在秒杀路径下，跳到该商品的秒杀详情页
                     var reg = /\/product\/show_([\d]+)/;
                     var reg = /\/product\/show_([\d]+)/;
+                    var reg2 = /\/product\/([\d]+)/;
                     var regPro = /\/product\/pro_([\d]+)_([\d]+)/;
                     var regPro = /\/product\/pro_([\d]+)_([\d]+)/;
                     var regSeckill = /\/product\/seckill/;
                     var regSeckill = /\/product\/seckill/;
 
 
@@ -117,7 +118,7 @@ setTimeout(() => {
                     var thisRefer = document.referrer;
                     var thisRefer = document.referrer;
 
 
                     if (!regSeckill.test(thisRefer)) {
                     if (!regSeckill.test(thisRefer)) {
-                        if (data.isSecKill === 'Y' && (reg.test(thisHref) || regPro.test(thisHref))) {
+                        if (data.isSecKill === 'Y' && (reg.test(thisHref) || regPro.test(thisHref) || reg2.test(thisHref))) {
                             window.location.replace('/product/seckill/show_' + productSkn + '.html');
                             window.location.replace('/product/seckill/show_' + productSkn + '.html');
                         }
                         }
                     }
                     }