1

application/index/view/member/users_list.html

@@ -644,7 +644,7 @@
 						<label for="inputEmail3" class="col-sm-4 control-label">客户类型：</label>
 						<div class="col-sm-8">
 							<select class="form-control left-width" id="find-shop-type">
-								<option value="">客户类型</option>
+								<option value="-1">客户类型</option>
 								<option value="0">找商铺</option>
 								<option value="1">找办公楼</option>
 							</select>

application/index/view/office/index.html

@@ -341,7 +341,7 @@
 
 <!-- /#新增编辑楼盘字典模态框 -->
 <div class="modal fade" id="modal_add_loupan" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog" style="width: 988px; height:600px;overflow:scroll">
+    <div class="modal-dialog" style="width:992px">
         <div class="modal-content modal-body-new-user">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
@@ -352,7 +352,7 @@
                 </h4>
             </div>
 
-            <div class="modal-body">
+            <div class="modal-body" style="height:600px;overflow:scroll">
                 <form class="form-horizontal" action="/agents/add_user" id="add_user_form">
                     <div class="form-group form-group-bottom">
                         <div class="col-sm-6 isshowLou">
@@ -408,7 +408,7 @@
                                     <label for="">纬度</label>
                                     <input type="text" class="input-100-width address-relate" data-toggle="modal" data-target=".bs-example-modal-lg" title="通过地址定位获取" readonly="readonly" id="latitude" name="latitude" data-alert="请通过地址定位获取经纬度！">
                                 </div>
-                                <div class="form-group" style="width: 164px;float: left;">
+                                <div class="form-group" style="width: 180px;float: left;">
                                     <label for="">商圈</label>
                                     <select id="business_rong">
                                         <option value="-1">请选择商圈</option>

public/resource/js/buildingDictionary.js

@@ -622,16 +622,22 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 			    	
 			    }
 			    if($('#loucengOffice').val() == ''){
-			    	alert('楼盘楼层必选');
+			    	alert('楼盘总层数必填');
 			    	return;
 			    	
 			    }
 			    if(_cityInternalObj.val() == ''){
 			    	alert('请选择楼盘地址');
 			    	return;
-			    	
 			    }
-			    
+			    if(detailArr.length == 0 ){
+			    	alert('请选择楼盘交通信息');
+			    	return;
+			    }
+			    if(imgname1.concat(imgname2).length == 0){
+			    	alert('请选择楼盘图片');
+			    	return;
+			    }
 				$.ajax({
 					type: 'POST',
 					url: business.url,
@@ -755,7 +761,10 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
                                         //编辑获取交通详情
                                         $('.detail-modal-bargaininfo-commission-addarea').html('');
                                         business.addStr = _str;
-										$.each(business.buildingStations, function(i, v) {
+	                                    if(business.buildingStations.length == 0){
+	                                    	$('.detail-modal-bargaininfo-commission-addarea').append('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="control-label" style="float: left;">距离</label><select class="form-control btn2-city shop_city_choose_site_list_line">'+ business.addStr +'</select><select class="form-control btn2-city shop_area_id_line"><option value="" selected="selected">区域</option></select><input type="number" class="form-control btn2-city" name="user_phone" autocomplete="off" class="" placeholder="请输入"><label class="control-label">米</label><span href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></span></div>');
+	                                    }else{
+	                                    		$.each(business.buildingStations, function(i, v) {
 													$('.detail-modal-bargaininfo-commission-addarea').append('<div data-id="'+ v.id +'" class="form-group detail-modal-bargaininfo-commission-sec"><label class="control-label" style="float: left;">距离</label><select class="form-control btn2-city shop_city_choose_site_list_line">'+  _str +'</select><select class="form-control btn2-city shop_area_id_line"><option value="{3}" selected="selected" data-latitude="{4}" data-longitude="{5}">{1}</option></select><input type="number" class="form-control btn2-city" name="user_phone" autocomplete="off" class="" placeholder="请输入" value="{2}"><label class="control-label">米</label><span href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></span></div>'.stringFormatObj({
 														'0': v.line_name,
 														'1': v.name,
@@ -764,9 +773,10 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 														'4': v.latitude,
 														'5': v.longitude
 													}));
-													var name_ = v.line_name;
+													var name_ = v.line_name_simple;
 													$(".shop_city_choose_site_list_line").eq(i).val(name_);
 												});
+	                                    }
                                        
 			                    }
 			                }

public/resource/js/officeBuildingList.js

@@ -1302,6 +1302,9 @@ if(data.code == 200) {
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
+						alert(data.msg)
+					}else{
+						alert(data.msg)
 					}
 				}
 			});

public/resource/js/officeEdit.js

@@ -826,6 +826,9 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 			_doc.on('input', '.phone_loupan', function() {
 				var _this = $(this),
 					_thisVal = $.trim(_this.val());
+					if(!_thisVal){
+						user.IDBuilding = '';
+					}
 				_this.removeAttr('data-id'); //移除之前携带的信息
 				if(_thisVal != '') {
 					_ajaxObjLoupan && _ajaxObjLoupan.abort();
@@ -1148,7 +1151,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 				if(_data['rent_free'] == -1 || _data['rent_free'] !=''){
 					
 				}else{
-					alert('请选择免租时间')
+					alert('请选择免租时间');
+					return
 				}
 				if(_exclusiveTypeObj.val() == '1') {
 					_data['agent_start_time'] = _exclusiveDate1Obj.val();