| 
					
				 | 
			
			
				@@ -1,5 +1,5 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 $(function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // let shippingStatus = getQueryString("shippingStatus"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let shippingStatus = getQueryString("shippingStatus"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let payStatus = getQueryString("payStatus"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let orderStatus = getQueryString("orderStatus"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let merchOrderSn = getQueryString("merchOrderSn"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7,9 +7,9 @@ $(function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let endTime = getQueryString("endTime"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let storeId = getQueryString("storeId"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let url = '../order/list?1'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // if (shippingStatus) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //     url += '&shippingStatus=' + shippingStatus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if (shippingStatus) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        url += '&shippingStatus=' + shippingStatus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     if (payStatus) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         url += '&payStatus=' + payStatus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |