Merge remote-tracking branch 'origin/test' into test

public/resource/js/edit.js

@@ -180,17 +180,6 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
 				                	};
 				                	_landlordNum++;
 				                });
-				                for(var i in _data['agents_name']){
-				                	if(_acqxNum == 0){
-				                		$('#acqx_tel_jia').prev().find('input').val(_data['agents_name'][i]).attr('data-id',_data['agents_name'][i].split('-')[0]);
-				                	}else{
-				                		$('#acqx_tel_jia').before('<div class="form-group phone-list-container"><input type="tel" class="form-control phone_jia" placeholder="请输入" value="{0}" data-id="{1}"><ul></ul><img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>'.stringFormatObj({
-				                			'0': _data['agents_name'][i],
-				                			'1': _data['agents_name'][i].split('-')[0]
-				                		}));
-				                	};
-				                	_landlordNum++;
-				                };
 				                
 				                _landlordPhoneObj.val(_data['landlord_phone']);//房东手机号
 				                _internalNameObj.val(_data['internal_title']);//对内商铺名称