Authored by biao

fix code merge issue

@@ -116,8 +116,8 @@ $invoice.on('touchend', '.checkbox', function() { @@ -116,8 +116,8 @@ $invoice.on('touchend', '.checkbox', function() {
116 116
117 function updateDeliverId(id) { 117 function updateDeliverId(id) {
118 var $moreJit = $('.more-jit a').get(0), 118 var $moreJit = $('.more-jit a').get(0),
119 -  
120 url = $moreJit.href; 119 url = $moreJit.href;
  120 +
121 if (url.indexOf('deliveryId') < 0) { 121 if (url.indexOf('deliveryId') < 0) {
122 $moreJit.href = url + '&deliveryId=' + id; 122 $moreJit.href = url + '&deliveryId=' + id;
123 } else { 123 } else {
@@ -191,12 +191,4 @@ $reaMask.on('touchend', function(event) { @@ -191,12 +191,4 @@ $reaMask.on('touchend', function(event) {
191 191
192 $reaMask.css('visibility', 'hidden'); 192 $reaMask.css('visibility', 'hidden');
193 event.stopPropagation(); 193 event.stopPropagation();
194 - setTimeout(function() {  
195 - window.location.href = '/home/orders';  
196 - }, 2000);  
197 - }).fail(function() {  
198 - tip.show('网络错误');  
199 - });  
200 - });  
201 - }  
202 }); 194 });
@@ -118,8 +118,8 @@ function search(opt) { @@ -118,8 +118,8 @@ function search(opt) {
118 nav, navType, 118 nav, navType,
119 page, 119 page,
120 $this, 120 $this,
121 - $title;  
122 - page,params; 121 + $title,
  122 + params;
123 123
124 if (searching) { 124 if (searching) {
125 return; 125 return;