1

application/app_broker/view/index/daily_achieve_dz.html

@@ -194,10 +194,10 @@
 							</tr>
 							<tr v-for="(item, index) in peopleList" data-id="item.agent_id">
 								<td>{{item.agent_name}}</td>
-								<td><input type="number" placeholder="填写" /></td>
-								<td><input type="number" placeholder="填写" /></td>
-								<td><input type="number" placeholder="填写" /></td>
-								<td><input type="number" placeholder="填写" /></td>
+								<td>{{item.house_num}}</td>
+								<td>{{item.user_num}}</td>
+								<td>{{item.follow_up_num}}</td>
+								<td>{{item.performance_week}}</td>
 								<td><input type="number" placeholder="填写" /></td>
 								
 								<!--<td>

application/app_broker/view/index/office_detail_pc.html

@@ -45,7 +45,7 @@
 							
 							<tr>
 								<td>所在楼层：{{d.floor}}</td>
-								<td>房号：{{d.id}}</td>
+								<td>房号：{{d.room_num}}</td>
 								<td>房源状态：{{(d.is_rent==1)?'已租':'未租'}}</td>
 								<td>是否独家：{{(d.is_exclusive_type==1)?'是':'否'}}</td>
 							</tr>
@@ -59,7 +59,7 @@
 								<td>可容纳工位：{{d.station_start}}-{{d.station_end}}</td>
 								<td>面积：{{d.area}}</td>
 								<td>所属楼层：{{switchFloortag(d.floor_tag)}}</td>
-								<td>入驻时间：{{d.enter_time}}</td>
+								<td>入驻时间：{{d.enter_date}}</td>
 							</tr>
 							<tr>
 								<td>付款规则：{{d.payment_month}}-{{d.deposit_month}}</td>

application/index/view/member/users_list.html

@@ -663,13 +663,13 @@
 						</div>
 					</div>
 					
-					<div class="form-group form-group-bottom col-sm-6" class="isShowYetai">
+					<div class="form-group form-group-bottom col-sm-6 isShowYetai">
 						<label for="inputEmail3" class="col-sm-4 control-label">具体业态:</label>
 						<div class="col-sm-8">
 							<input type="text" class="form-control left-width" name="" id="concrete_industry" placeholder="8个字以内(选填)">
 						</div>
 					</div>
- 				    <div class="form-group form-group-bottom col-sm-6" class="isShowYetai">
+ 				    <div class="form-group form-group-bottom col-sm-6 isShowYetai">
 						<label class="col-sm-4 control-label">业态范围：</label>
 						<div class="col-sm-8">
 							<select class="form-control left-width" id="industry_type2">

application/index/view/office/index.html

@@ -486,7 +486,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default"  id="close">关闭
+                <button type="button" class="btn btn-default"  id="close" data-dismiss="modal">关闭
                 </button>
                 <button type="button" class="btn btn-primary btn-guanbi" id="saveBtn">
                     提交

application/index/view/officeBuilding/buildingDictionary.html

@@ -486,7 +486,7 @@
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn btn-default"  id="close" data-dismiss="modal">关闭
+				<button type="button" class="btn btn-default" data-dismiss="modal" id="">关闭
                 </button>
 				<button type="button" class="btn btn-primary btn-guanbi" id="saveBtn">
                     提交

application/index/view/officeBuilding/officeEdit.html

@@ -84,12 +84,12 @@
 										<select class="form-control" name="" id="is_rent" data-alert="请选择房源状态">
 											<option value="">请选择</option>
 											<option value="1">已租</option>
-											<option value="0">未租</option>
+											<option value="0">求租</option>
 										</select>
 									</div>
 									<!--<div class="form-group">-->
 									<!--新增时 不显示是否对客户展示-->
-									<div class="form-group" style="display: none;" class="isShowuser">
+									<div class="form-group isShowuser">
 										<label for="show_all">是否对客户展示</label>
 										<select class="form-control" name="showCd" id="showCd" disabled="disabled">
 											<option value="">请选择</option>
@@ -176,7 +176,7 @@
 										<div class="col-xs-4 p-t-10">
 											<label class="">免租时间: </label>
 											<label class="checkbox-inline">
-												<input type="checkbox" id="" value="面议">面议
+												<input type="checkbox" id="mianyi" value="-1">面议
 											</label>
 											<!--<div class="input-group">-->
 												<input type="number" class="form-control input-100-width" id="rent_free" placeholder="请输入" data-alert="请填写免租时间！">月
@@ -185,7 +185,7 @@
 										
 										<div class="col-xs-4 p-t-10">
 											<label class="">物业管理费: </label>
-											<input type="number" class="form-control input-100-width" id="management_fee" placeholder="请输入" data-alert="请输入物业管理费！">&nbsp;&nbsp;元/m²/天
+											<input type="number" class="form-control input-100-width" id="management_fee" placeholder="请输入" data-alert="请输入物业管理费！">&nbsp;&nbsp;元/m²/月
 										</div>
 										
 										<div class="col-xs-4 p-t-10">

public/resource/js/buildingDictionary.js

@@ -95,6 +95,9 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 			$("#search").click(function() {
 				business.getList(1);
 			});
+			$("#guanbi").click(function() {//关闭弹窗
+				$("#modal_add_loupan").modal('hide');//提交成功后 关闭弹窗
+			});
 
 			$("#reset").click(function() { //重置
 				document.getElementById("form_search").reset();

public/resource/js/myCollectionOfficeList.js

@@ -148,7 +148,7 @@ define(['doT', 'text!temp/my_collection_office_template_tpl.html', 'css!style/ho
 				house.detailTabIndex = _this.index();
 				$('.detail-modal-body-sec:nth-of-type('+(house.detailTabIndex+1)+')').show().siblings().hide();
 				if(house.detailTabIndex  == 1){
-				    $('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+house.id);
+				    $('.iframe-shop-detail').attr('src', '/app_broker/office_detail_pc?shop_id='+house.id);
 				}else if(house.detailTabIndex  == 0){
 					$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
 				      house.getFollowupList();

public/resource/js/officeBuildingList.js

@@ -1648,7 +1648,7 @@ if(data.code == 200) {
 		},
 		delBusiness: function() {
 			$.ajax({
-				url: '/office_index/houseDel',
+				url: '/office_index/del',
 				type: 'POST',
 				async: true,
 				data: {

public/resource/js/officeEdit.js

@@ -10,16 +10,16 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 			//初始化dot
 			user.event();
 			$('#pf_tel_jia').hide();
-			if(getUrlParam('id') != null){//编辑 
-				$(".isShowuser").show()
-			}else{
-				$(".isShowuser").hide()
-			}
 		},
 		upload_id: 0,
 		event: function() {
 			
 			$('#page-content-wrapper').show();
+			if(getUrlParam('id') != null){//编辑 
+				$(".isShowuser").show()
+			}else{
+				$(".isShowuser").hide()
+			}
 			var _objThis = this, //user对象
 				_id = getUrlParam('id'), //地址栏获取的商铺或者街铺id
 				_source = getUrlParam('source'),
@@ -1164,7 +1164,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
                 if(user.IDBuilding){//楼盘id
 				  _data['building_id'] = user.IDBuilding;
                 }else{
-                	alert("请输入楼盘id");
+                	alert("请输入楼盘");
                 	return;
                 }
 

public/resource/js/user.js

@@ -1621,7 +1621,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 			params.entrust_type = $('#find-shop-typeEdit').val();
 			params.weixin_nick = $("#weixin_nickEdit").val();//微信号
 			params.user_status = $("#edit-user-staus").val();//客户状态
-			if($('#find-shop-typeEdit').val() == 1){
+			if($('#find-shop-typeEdit').val() == 0){
 			   params.concrete_industry = $("#concrete_industryEdit").val();//具体业态
 			   params.industry_type = $(".industry_type_two_1").val();
 			}
@@ -2247,10 +2247,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 			params.site_id = _siteTagArr.join(',');
 			//客户类型
 			params.entrust_type = $('#find-shop-type').val();
-			if($('#find-shop-type').val() == 1){
+			if($('#find-shop-type').val() == 0){
 			  params.concrete_industry = $("#concrete_industry").val();//具体业态
 			  params.industry_type = $("#industry_type2").val();//业态范围
-			  if(params.concrete_industry == '') {
+			  if($("#concrete_industry").val() == '') {
 				alert('具体业态必填');
 				return;
 			}