订单详情添加倒计时JS文件

Signed-off-by: 🍓 <lixia.zhang@yoho.cn>

@@ -8,88 +8,82 @@ var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
     Hammer = require('yoho.hammer'),
     Hammer = require('yoho.hammer'),
     dialog = require('./dialog'),
     dialog = require('./dialog'),
-    tip = require('../plugin/tip');
-
-var orderId = $('#order-detail').data('id');
-
-var $countDownHours = $('.hours'),
-    $countdownContainer = $('.count-down');
-var optHammer;
-
-downCount($countDownHours.text());
+    tip = require('../plugin/tip'),
+    orderId = $('#order-detail').data('id'),
+    $countDownHours = $('.hours'),
+    $countdownContainer = $('.count-down'),
+    optHammer;
 
 
 lazyLoad({
 lazyLoad({
     try_again_css: 'order-failure'
     try_again_css: 'order-failure'
 });
 });
 
 
-function downCount (options, callback) {
-    var settings = new Date(options);
-
-        // Throw error if date is not set
-        if (!settings) {
-            $.error('Date is not defined.');
-        }
-
-        // Throw error if date is set incorectly
-        if (!Date.parse(settings)) {
-            $.error('Incorrect date format, it should look like this, 12/24/2012 12:00:00.');
-        }
-
-        // Save container
-        var container = this;
+function downCount(options) {
+    var settings = new Date(options),
+        targetDateFunction = function() {
+            var orderDate = new Date(settings),
 
 
-        var targetDate = function () {
-            var order_date = new Date(settings);
-            //结束时间在下单时间加
-            var utc = order_date.getTime() + 7200000;
+                //结束时间在下单时间加两小时
+                utc = orderDate.getTime() + 7200000,
+                newDate = new Date(utc);
 
 
-            var new_date = new Date(utc)
-
-            return new_date;
-        };
+            return newDate;
+        },
 
 
         /**
         /**
          * Change client's local date to match offset timezone
          * Change client's local date to match offset timezone
          * @return {Object} Fixed Date object.
          * @return {Object} Fixed Date object.
          */
          */
-        var currentDate = function () {
+        currentDateFunction = function() {
+
             // get client's current date
             // get client's current date
             var date = new Date();
             var date = new Date();
+
             // turn date to utc
             // turn date to utc
             var utc = date.getTime();
             var utc = date.getTime();
+
             // set new Date object
             // set new Date object
-            // var new_date = new Date(utc + (3600000*settings.offset))
             return utc;
             return utc;
         };
         };
 
 
+    // Throw error if date is not set
+    if (!settings) {
+        $.error('Date is not defined.');
+    }
+
+    // Throw error if date is set incorectly
+    if (!Date.parse(settings)) {
+        $.error('Incorrect date format, it should look like this, 12/24/2012 12:00:00.');
+    }
+
     /**
     /**
      * Main downCount function that calculates everything
      * Main downCount function that calculates everything
      */
      */
-        function countdown () {
-            var target_date = targetDate(),// set target date
-                current_date = currentDate(); // get fixed current date
-
-            // difference of dates
-            var difference = target_date - current_date;
+    function countdown() {
+        var targetDate = targetDateFunction(),// set target date
+            currentDate = currentDateFunction(), // get fixed current date
+            difference = targetDate - currentDate,// difference of dates
+            // basic math variables
+            _second = 1000,
+            _minute = _second * 60,
+            _hour = _minute * 60,
+            _day = _hour * 24,
+            interval,
+            days,
+            hours,
+            minutes,
+            seconds;
 
 
         // if difference is negative than it's pass the target date
         // if difference is negative than it's pass the target date
         if (difference < 0) {
         if (difference < 0) {
+
             // stop timer
             // stop timer
             clearInterval(interval);
             clearInterval(interval);
-
-                if (callback && typeof callback === 'function') callback();
-
             return;
             return;
         }
         }
 
 
-            // basic math variables
-            var _second = 1000,
-                _minute = _second * 60,
-                _hour = _minute * 60,
-                _day = _hour * 24;
-
         // calculate dates
         // calculate dates
-            var days = Math.floor(difference / _day),
+        days = Math.floor(difference / _day),
         hours = Math.floor((difference % _day) / _hour),
         hours = Math.floor((difference % _day) / _hour),
         minutes = Math.floor((difference % _hour) / _minute),
         minutes = Math.floor((difference % _hour) / _minute),
         seconds = Math.floor((difference % _minute) / _second);
         seconds = Math.floor((difference % _minute) / _second);
@@ -99,13 +93,17 @@ function downCount (options, callback) {
         hours = (String(hours).length >= 2) ? hours : '0' + hours;
         hours = (String(hours).length >= 2) ? hours : '0' + hours;
         minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
         minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
         seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
         seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
+
         // set to DOM
         // set to DOM
         $countdownContainer.removeClass('hide');
         $countdownContainer.removeClass('hide');
         $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
         $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
-        };
+    }
+
     // start
     // start
-        var interval = setInterval(countdown, 1000);
-};
+    setInterval(countdown, 1000);
+}
+
+downCount($countDownHours.text());
 
 
 //订单删除
 //订单删除
 optHammer = new Hammer(document.getElementsByClassName('opt')[0]);
 optHammer = new Hammer(document.getElementsByClassName('opt')[0]);