Authored by biao

fix code merge issue

... ... @@ -116,8 +116,8 @@ $invoice.on('touchend', '.checkbox', function() {
function updateDeliverId(id) {
var $moreJit = $('.more-jit a').get(0),
url = $moreJit.href;
if (url.indexOf('deliveryId') < 0) {
$moreJit.href = url + '&deliveryId=' + id;
} else {
... ...
... ... @@ -191,12 +191,4 @@ $reaMask.on('touchend', function(event) {
$reaMask.css('visibility', 'hidden');
event.stopPropagation();
setTimeout(function() {
window.location.href = '/home/orders';
}, 2000);
}).fail(function() {
tip.show('网络错误');
});
});
}
});
... ...
... ... @@ -118,8 +118,8 @@ function search(opt) {
nav, navType,
page,
$this,
$title;
page,params;
$title,
params;
if (searching) {
return;
... ...