Merge branch 'release/5.1' of git.yoho.cn:fe/yohobuywap-node into release/5.1

@@ -20,11 +20,15 @@ const shopList = (uid, tabName) => {
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             _.forEach(result.data, function(data) {
             _.forEach(result.data, function(data) {
-                let href = '//m.yohobuy.com/product/index/brand?shop_id=' + data.shopsId + '&openby:yohobuy={"action":"go.shop","params":{"shop_id":"'
-                + data.shopsId + '","shop_template_type":"' + data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
+                let href = '//m.yohobuy.com/product/index/brand?shop_id=' + data.shopsId + '&openby:yohobuy={"action":"go.shop","params":{"shop_id":"' +
+                data.shopsId + '","shop_template_type":"' + data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
 
 
                 data.isFavorite = data.isFavorite === 'Y';
                 data.isFavorite = data.isFavorite === 'Y';
 
 
+                if (parseInt(data.collectionNum) > 10000) {
+                    data.collectionNum = (data.collectionNum / 10000).toFixed(1) + ' w';
+                }
+
                 data.href = href;
                 data.href = href;
             });
             });
             return result.data;
             return result.data;

@@ -128,8 +128,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 focusIndex = false;
-        let nowTime = Date.parse(new Date());
+        let nowTime = Date.now();
 
 
+        result.currentTime = nowTime;
         if (resultActivity.code !== 200) {
         if (resultActivity.code !== 200) {
             return next();
             return next();
         }
         }

@@ -17,7 +17,7 @@
             </div>
             </div>
 
 
             <div class="info-content">
             <div class="info-content">
-                <img class="lazy content" data-original="{{image bannerUrl 690 175}}"></img>
+                <img class="lazy content" data-original="{{image bannerUrl 690 235}}"></img>
             </div>
             </div>
         </a>
         </a>
     </div>
     </div>

@@ -229,7 +229,7 @@ function updateConformButtonClassAndText() {
         if ($chosed.closest('.zero-stock').length === 2) {
         if ($chosed.closest('.zero-stock').length === 2) {
             $('#chose-btn-sure').css('background-color', '#c0c0c0').html('已售罄');
             $('#chose-btn-sure').css('background-color', '#c0c0c0').html('已售罄');
         } else {
         } else {
-            $('#chose-btn-sure').css('background-color', '#eb0313').html(isEdit ? '确认' : '立即结算');
+            $('#chose-btn-sure').css('background-color', '#eb0313').html(isEdit ? '确认' : '立即购买');
         }
         }
     }
     }
 
 

@@ -188,7 +188,7 @@ seckillObj = {
         $el.$navUl.find('>li').each(function() {
         $el.$navUl.find('>li').each(function() {
             $(this).removeClass('now over wait');
             $(this).removeClass('now over wait');
             time = new Date(parseInt($(this).find('input.date').val(), 10));
             time = new Date(parseInt($(this).find('input.date').val(), 10));
-            nowTime = new Date();
+            nowTime = new Date(Date.now() + that.diff * 1000);
 
 
             if (nowTime > time) { // 当前时间大于这个时间段，已经开始和即将开始两种情况
             if (nowTime > time) { // 当前时间大于这个时间段，已经开始和即将开始两种情况
                 if ($(this).next('.time-item').length) {
                 if ($(this).next('.time-item').length) {
@@ -258,7 +258,7 @@ seckillObj = {
     initTick: function(elem) {
     initTick: function(elem) {
         var $el = this.el, that = this,
         var $el = this.el, that = this,
             time,
             time,
-            nowTime = Date.parse(new Date()) / 1000,
+            nowTime = Date.parse(new Date()) / 1000 + that.diff,
             offsetTime;
             offsetTime;
 
 
         if ($(elem).hasClass('now')) {
         if ($(elem).hasClass('now')) {
@@ -288,7 +288,7 @@ seckillObj = {
             $(elem).find('.tick.second').text(second < 0 ? '00' : (second < 10 ? ('0' + second) : second));
             $(elem).find('.tick.second').text(second < 0 ? '00' : (second < 10 ? ('0' + second) : second));
 
 
             $el.currentTick = setTimeout(function() {
             $el.currentTick = setTimeout(function() {
-                var curSec = Math.floor(Date.now() / 1000);
+                var curSec = Math.floor(Date.now() / 1000) + that.diff;
 
 
                 offsetTime = offsetTime - (curSec - nowTime);
                 offsetTime = offsetTime - (curSec - nowTime);
                 that.startTick(elem, offsetTime, curSec);
                 that.startTick(elem, offsetTime, curSec);
@@ -392,16 +392,14 @@ seckillObj = {
                     }))
                     }))
                 );
                 );
 
 
-                // if (result && result.currentTime) {
-                //     self.diff = Math.round((Date.now() - result.currentTime) / 1000);
-                // }
+                if (result && result.activitys && result.activitys.length) {
+                    window.diff = self.diff = Math.round((result.currentTime - Date.now()) / 1000);
+                    callback();
+                }
 
 
                 lazyload('img.lazy');
                 lazyload('img.lazy');
                 window.rePosFooter();
                 window.rePosFooter();
 
 
-                if (result && result.activitys && result.activitys.length) {
-                    callback();
-                }
             })
             })
             .error(function() {
             .error(function() {
             })
             })

@@ -57,7 +57,7 @@ seckillObj = {
             $(elem).find('.tick.hour').text(hour < 0 ? '00' : (hour < 10 ? ('0' + hour) : hour));
             $(elem).find('.tick.hour').text(hour < 0 ? '00' : (hour < 10 ? ('0' + hour) : hour));
             $(elem).find('.tick.minute').text(minute < 0 ? '00' : (minute < 10 ? ('0' + minute) : minute));
             $(elem).find('.tick.minute').text(minute < 0 ? '00' : (minute < 10 ? ('0' + minute) : minute));
             $(elem).find('.tick.second').text(second < 0 ? '00' : (second < 10 ? ('0' + second) : second));
             $(elem).find('.tick.second').text(second < 0 ? '00' : (second < 10 ? ('0' + second) : second));
-            if (offsetTime <= 0) { // 结束倒计时刷新状态
+            if (offsetTime <= 1) { // 结束倒计时刷新状态
                 window.location.reload();
                 window.location.reload();
             } else {
             } else {
                 $el.currentTick = setTimeout(function() {
                 $el.currentTick = setTimeout(function() {
@@ -164,7 +164,7 @@ $(
                         $('.left-num').hide();
                         $('.left-num').hide();
                         $('.btn-plus').removeClass('btn-plus');
                         $('.btn-plus').removeClass('btn-plus');
                         $('.addto-cart').text('立即购买');
                         $('.addto-cart').text('立即购买');
-                        $('#chose-btn-sure').text('立即抢购').addClass('isSecKill');
+                        $('#chose-btn-sure').text('立即购买').addClass('isSecKill');
                         $('.cart-bar').show();
                         $('.cart-bar').show();
                         var seckillNum = 0;
                         var seckillNum = 0;
 
 

@@ -56,13 +56,14 @@
             .fans {
             .fans {
                 margin-right: 10px;
                 margin-right: 10px;
                 color: #666;
                 color: #666;
+                font-size: 22px;
             }
             }
 
 
             .collect-btn {
             .collect-btn {
                 color: #b0b0b0;
                 color: #b0b0b0;
                 display: inline-block;
                 display: inline-block;
                 width: 50px;
                 width: 50px;
-                font-size: 24px;
+                font-size: 26px;
                 text-align: center;
                 text-align: center;
             }
             }
 
 
@@ -109,19 +110,17 @@
             .giving {
             .giving {
                 width: 170px;
                 width: 170px;
                 color: #b0b0b0;
                 color: #b0b0b0;
-                position: relative;
-                top: -10px;
+                font-size: 22px;
             }
             }
         }
         }
 
 
         .info-content {
         .info-content {
             height: 235px;
             height: 235px;
-            padding: 30px;
             border-top: 1px solid #e0e0e0;
             border-top: 1px solid #e0e0e0;
 
 
             .content {
             .content {
                 width: 690px;
                 width: 690px;
-                height: 175px;
+                height: 233px;
             }
             }
         }
         }
     }
     }

@@ -153,7 +153,7 @@ function tranformPayment(data, orderInfo) {
 
 
     // 有货币
     // 有货币
     result.yohoCoin = data.yoho_coin;
     result.yohoCoin = data.yoho_coin;
-    result.useYohoCoin = false; //data.use_yoho_coin;
+    result.useYohoCoin = false; // data.use_yoho_coin;
 
 
     // 发票
     // 发票
     if (data.invoices) {
     if (data.invoices) {