Merge branch 'hotfix/sale-pager' into 'master'

Hotfix/sale pager



See merge request !392

@@ -430,10 +430,6 @@ function getSaleDiscountData(params, channel) {
                     Object.assign(finalResult, {
                     Object.assign(finalResult, {
                         leftContent: publicHandler.handleSaleSortData(subResult[0].data.filter.group_sort,
                         leftContent: publicHandler.handleSaleSortData(subResult[0].data.filter.group_sort,
                             params, 'discount', baseUrl),
                             params, 'discount', baseUrl),
-                        saleList: {
-                            footPager: listHandler.handlePagerData(subResult[0].data.total, params, true, baseUrl),
-                            opts: publicHandler.handleSaleOptsData(params, subResult[0].data.total, 'default', baseUrl)
-                        }
                     });
                     });
                 }
                 }
 
 
@@ -441,9 +437,13 @@ function getSaleDiscountData(params, channel) {
                 if (subResult[1].code === 200) {
                 if (subResult[1].code === 200) {
                     let sknArr = [];
                     let sknArr = [];
 
 
-                    finalResult.saleList = finalResult.saleList || {};
-                    finalResult.saleList.goods = productProcess.processProductList(subResult[1].data.product_list);
-                    finalResult.saleList.totalCount = subResult[1].data.total;
+                    finalResult.saleList = {
+                        footPager: listHandler.handlePagerData(subResult[1].data.total, Object.assign({
+                            limit: 60
+                        }, params), true, baseUrl),
+                        opts: publicHandler.handleSaleOptsData(params, subResult[1].data.total, 'default', baseUrl),
+                        goods: productProcess.processProductList(subResult[1].data.product_list)
+                    };
                     _.forEach(finalResult.saleList.goods, (value, key) => {
                     _.forEach(finalResult.saleList.goods, (value, key) => {
                         if (sknArr.length < 3) {
                         if (sknArr.length < 3) {
                             sknArr.push(value.product_skn);
                             sknArr.push(value.product_skn);

@@ -39,6 +39,14 @@ const online = (req, res, next) => {
             return next();
             return next();
         }
         }
 
 
+        if (order.pay_lefttime) {
+            order.pay_lefttime = +order.pay_lefttime - 3600;
+
+            if (order.pay_lefttime < 0) {
+                order.pay_lefttime = 0;
+            }
+        }
+
         order.payment_type = parseInt(order.payment_type, 10);
         order.payment_type = parseInt(order.payment_type, 10);
 
 
         if (amount <= 0 || order.payment_type === 2) {
         if (amount <= 0 || order.payment_type === 2) {

 {
 {
   "name": "yohobuy-node",
   "name": "yohobuy-node",
-  "version": "6.8.2",
+  "version": "6.8.21",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -11,6 +11,7 @@ var $btnby = $('input.btnby'),
     $formGo = $('.form-go'),
     $formGo = $('.form-go'),
     Alert = dialog.Alert,
     Alert = dialog.Alert,
     time = $('.js-time').data('time'),
     time = $('.js-time').data('time'),
+    timeInterval,
     $timer = $('.js-timer'),
     $timer = $('.js-timer'),
     C_ID;
     C_ID;
 
 
@@ -61,7 +62,7 @@ payPage = {
         });
         });
 
 
         this.setTimer();
         this.setTimer();
-        setInterval(function() {
+        timeInterval = setInterval(function() {
             self.setTimer();
             self.setTimer();
         }, 1000);
         }, 1000);
     },
     },
@@ -139,10 +140,14 @@ payPage = {
         });
         });
     },
     },
     setTimer: function() {
     setTimer: function() {
-        var hour = Math.floor(time / 3600);
-        var minus = Math.floor((time % 3600) / 60);
-        var second = time % 60;
-        var text = '';
+        if (time < 0) {
+            return clearInterval(timeInterval);
+        }
+
+        let hour = Math.floor(time / 3600);
+        let minus = Math.floor((time % 3600) / 60);
+        let second = time % 60;
+        let text = '';
 
 
         if (hour > 0) {
         if (hour > 0) {
             text += hour + '小时';
             text += hour + '小时';