Authored by 阿达

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
... ... @@ -12715,8 +12715,11 @@ $invoice.on('touchend', '.checkbox', function() {
function updateDeliverId(id) {
var $moreJit = $('.more-jit a').get(0),
url = $moreJit.href;
$moreJit.href = url.replace(/deliveryId=(\d)/, 'deliveryId=' + id);
if (url.indexOf('deliveryId') <0 ) {
$moreJit.href = url + '&deliveryId=' + id;
} else {
$moreJit.href = url.replace(/deliveryId=(\d)/, 'deliveryId=' + id);
}
}
function orderCompute() {
... ... @@ -12761,7 +12764,7 @@ function orderCompute() {
$('.bill span').html('¥' + res.last_order_amount);
$('.total').html(total);
}
updateDeliverId(deliverId);
}
}).fail(function() {
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -117,8 +117,11 @@ $invoice.on('touchend', '.checkbox', function() {
function updateDeliverId(id) {
var $moreJit = $('.more-jit a').get(0),
url = $moreJit.href;
$moreJit.href = url.replace(/deliveryId=(\d)/, 'deliveryId=' + id);
if (url.indexOf('deliveryId') <0 ) {
$moreJit.href = url + '&deliveryId=' + id;
} else {
$moreJit.href = url.replace(/deliveryId=(\d)/, 'deliveryId=' + id);
}
}
function orderCompute() {
... ... @@ -163,7 +166,7 @@ function orderCompute() {
$('.bill span').html('¥' + res.last_order_amount);
$('.total').html(total);
}
updateDeliverId(deliverId);
}
}).fail(function() {
... ...
... ... @@ -23,7 +23,7 @@
<p class="beside-icon sub-content">
<span class="sub-title">订单编号:{{orderNum}}</span>
<span >{{orderStatus}}</span>
<span >订单详情:{{orderStatus}}</span>
<span>下单时间:{{orderTime}}</span>
</p>
</div>
... ...