| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -28,7 +28,8 @@ Page({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    sec: "00", | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    paramData:null, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    showErr:false, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    showTime:true | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    showTime: true, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    merchantVoList: [] | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			  }, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			  /** | 
		
		
	
	
		
			
				| 
				
					
				
				
					
				
				
				 | 
			
			 | 
			@@ -203,7 +204,8 @@ Page({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			      data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			      data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			      that.setData({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        data | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        data, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        merchantVoList: data.merchantVoList | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			      }); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    }); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			  }, | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |