|  | @@ -149,10 +149,16 @@ export default {
 | 
	
		
			
				|  |  |  		// 监听data事件,获取上一页面通过eventChannel.emit传送到当前页面的数据
 | 
	
		
			
				|  |  |  		if (eventChannel.on) {
 | 
	
		
			
				|  |  |  			eventChannel.on('data', data => {
 | 
	
		
			
				|  |  | -				if(data.info.name) that.form.name = data.info.name;
 | 
	
		
			
				|  |  | -				if(data.info.phone) that.form.phone = data.info.phone;
 | 
	
		
			
				|  |  | -				if(data.info.sex) that.form.sex = data.info.sex;
 | 
	
		
			
				|  |  | -				if(data.info.demand) that.form.remark = data.info.demand;
 | 
	
		
			
				|  |  | +				if (data.info && data.info.estate_id && data.info.estate_name) {
 | 
	
		
			
				|  |  | +					that.form.estate_name = data.info.estate_name
 | 
	
		
			
				|  |  | +					that.eIds = [data.info.estate_id]
 | 
	
		
			
				|  |  | +					that.eArr = [
 | 
	
		
			
				|  |  | +						{
 | 
	
		
			
				|  |  | +							estate_id: data.info.estate_id,
 | 
	
		
			
				|  |  | +							estate_name: data.info.estate_name,
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  | +					]
 | 
	
		
			
				|  |  | +				}
 | 
	
		
			
				|  |  |  			})
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  	},
 |