Merge branch 'release/4.5' of git.yoho.cn:fe/YOHOBUYWAP into release/4.5

@@ -9655,6 +9655,7 @@ require("js/me/address");
 require("js/me/suggest");
 require("js/me/browse-record");
 require("js/me/address-act");
+require("js/me/address-modify");
 require("js/me/logistic");
 require("js/me/pay");
 require("js/me/personal-details");
@@ -12112,6 +12113,66 @@ if (chinaAddressList) {
 }
 
 });
+define("js/me/address-modify", ["jquery","hammer"], function(require, exports, module){
+/**
+ * 订单 地址修改
+ * @author: liangxiaosong
+ * @date: 2016/5/11
+ */
+
+var $ = require("jquery"),
+    tip = require("js/plugin/tip");
+
+var $confimMod = $('.confim-modify-mask'),
+    $modifyAdd = $('.modifyAdd'),
+    orderCode = $modifyAdd.data('orderCode'),
+    selectId;
+
+require("js/common");
+
+$('.address-item').on('touchend', function() {
+    selectId = $(this).data('addressId');
+
+    if ($modifyAdd.data('rel') === true) {
+        $confimMod.find('.content').text('关联订单的收货地址将会一起修改且不可修改第二次，请确认是否修改？');
+        $confimMod.fadeIn();
+    } else {
+        $confimMod.find('.content').text('收货地址仅且只能修改一次，请确认是否修改？');
+        $confimMod.fadeIn();
+    }
+});
+
+$confimMod.on('touchend', '.cancel', function(e) {
+    selectId = null;
+    $confimMod.fadeOut();
+    return false;
+}).on('touchend', '.confim', function() {
+    $.ajax({
+        method: 'GET',
+        url: '/home/chooseAddress',
+        data: {
+            addressId: selectId,
+            orderCode: orderCode
+        }
+    }).then(function(res) {
+        if ($.type(res) !== 'object') {
+            res = {};
+        }
+        if (res.code !== 200) {
+            $confimMod.fadeOut();
+            tip.show(res.message || '网络出了点问题~');
+        } else {
+            window.location.href = '/home/orderdetail?order_code=' + orderCode;
+        }
+    }).fail(function() {
+        tip.show('网络出了点问题~');
+    }).always(function() {
+        selectId = null;
+    });
+    return false;
+});
+
+});
 define("js/me/logistic", ["jquery","hammer","mlellipsis","lazyload"], function(require, exports, module){
 /**
  * 物流信息页面

@@ -15,6 +15,7 @@ require('./address');
 require('./suggest');
 require('./browse-record');
 require('./address-act');
+require('./address-modify');
 require('./logistic');
 require('./pay');
 require('./personal-details');

@@ -36,26 +36,27 @@ function downCount(options) {
             _minute = _second * 60,
             _hour = _minute * 60,
             _day = _hour * 24,
-            days,
             hours,
             minutes,
             seconds;
 
         // calculate dates
-        days = Math.floor(difference / _day),
         hours = Math.floor((difference % _day) / _hour),
         minutes = Math.floor((difference % _hour) / _minute),
         seconds = Math.floor((difference % _minute) / _second);
 
         // fix dates so that it will show two digets
-        days = (String(days).length >= 2) ? days : '0' + days;
         hours = (String(hours).length >= 2) ? hours : '0' + hours;
         minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
         seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
 
         // set to DOM
         $countdownContainer.removeClass('hide');
-        $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
+        if (hours === 0) {
+            $countDownHours.text('剩余' + minutes + ':' + seconds);
+        } else {
+            $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
+        }
 
         difference -= 1000;