Skip to content

T
tl_estate
Commit 23388a39 authored by clone's avatar clone
Browse files
Options

Merge branch '0529-v3.3.0' of https://gitee.com/zwyjjc/tl_estate into 0529-v3.3.0

parents 107020f6 0bc416fa
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 36 deletions
application/index/controller/OfficeManage.php
View file @ 23388a39
...@@ -114,8 +114,8 @@ class OfficeManage extends Basic ...@@ -114,8 +114,8 @@ class OfficeManage extends Basic
$msg = ''; $msg = '';
$data = []; $data = [];
$code = 200; $code = 200;
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$building_service = new OfficeService(); $building_service = new OfficeService();
$result = $building_service->BuildingSearch($pageNo, $pageSize, $this->params, 1); $result = $building_service->BuildingSearch($pageNo, $pageSize, $this->params, 1);
......
application/index/service/OfficeRoomService.php
View file @ 23388a39
...@@ -1357,8 +1357,8 @@ class OfficeRoomService ...@@ -1357,8 +1357,8 @@ class OfficeRoomService
$result['agent_end_time'] = $data['agent_end_time']; $result['agent_end_time'] = $data['agent_end_time'];
$agent_data = $this->agent_room->getAgentsByRoomId('b.id,b.name,b.phone', ['a.house_id'=>$room_id, 'a.type'=>3]); $agent_data = $this->agent_room->getAgentsByRoomId('b.id,b.name,b.phone', ['a.house_id'=>$room_id, 'a.type'=>3]);
if ($agent_data) { if ($agent_data[0]) {
$result['name'] = empty($agents['name']) ? '' : $agents['name'] . '-' . $agents['phone']; $result['name'] = $agent_data[0]['name'] . '-' . $agent_data[0]['phone'];
} else { } else {
$result['name'] = ''; $result['name'] = '';
} }
......
application/index/view/member/users_list.html
View file @ 23388a39
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
<label for="inputEmail3" class="col-sm-4 control-label">客户类型：</label> <label for="inputEmail3" class="col-sm-4 control-label">客户类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control left-width" id="find-shop-type"> <select class="form-control left-width" id="find-shop-type">
<option value="">客户类型</option> <option value="-1">客户类型</option>
<option value="0">找商铺</option> <option value="0">找商铺</option>
<option value="1">找办公楼</option> <option value="1">找办公楼</option>
</select> </select>
...@@ -655,10 +655,10 @@ ...@@ -655,10 +655,10 @@
<label for="inputEmail3" class="col-sm-4 control-label">客户状态：</label> <label for="inputEmail3" class="col-sm-4 control-label">客户状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control left-width" id="add-user-staus"> <select class="form-control left-width" id="add-user-staus">
<option value="">客户状态</option> <option value="-1">客户状态</option>
<option value="0">求租</option> <option value="0">求租</option>
<option value="1">已租</option> <option value="1">已租</option>
<option value="-1">无效</option> <!--<option value="-1">无效</option>-->
</select> </select>
</div> </div>
</div> </div>
......
application/index/view/office/index.html
View file @ 23388a39
...@@ -341,7 +341,7 @@ ...@@ -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 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-content modal-body-new-user">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
...@@ -352,7 +352,7 @@ ...@@ -352,7 +352,7 @@
</h4> </h4>
</div> </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"> <form class="form-horizontal" action="/agents/add_user" id="add_user_form">
<div class="form-group form-group-bottom"> <div class="form-group form-group-bottom">
<div class="col-sm-6 isshowLou"> <div class="col-sm-6 isshowLou">
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
<label for="">纬度</label> <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="请通过地址定位获取经纬度！"> <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>
<div class="form-group" style="width: 164px;float: left;"> <div class="form-group" style="width: 180px;float: left;">
<label for="">商圈</label> <label for="">商圈</label>
<select id="business_rong"> <select id="business_rong">
<option value="-1">请选择商圈</option> <option value="-1">请选择商圈</option>
......
application/index/view/office/officeBuildingList.html
View file @ 23388a39
...@@ -269,16 +269,16 @@ ...@@ -269,16 +269,16 @@
<option value="6">厂房</option> <option value="6">厂房</option>
</select> </select>
<select class="form-control btn2 ld-Marheight" id="office_status"> <select class="form-control btn2 ld-Marheight" id="office_status">
<option value="">出租状态</option> <option value="">上下架状态</option>
<option value="1">上架</option> <option value="1">上架</option>
<option value="2">下架</option> <option value="2">下架</option>
<option value="3">无效</option> <option value="3">无效</option>
</select> </select>
<select class="form-control btn2 ld-Marheight" id="office_rent"> <select class="form-control btn2 ld-Marheight" id="office_rent">
<option value="">出租状态</option> <option value="">出租状态</option>
<option value="1">求租</option> <option value="0">求租</option>
<option value="2">已租</option> <option value="1">已租</option>
<option value="3">无效</option> <!--<option value="3">无效</option>-->
</select> </select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="office_id" placeholder="房源编号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="office_id" placeholder="房源编号" type="text" value="">
......
public/app/js/daily_achieve_mdzj.js
View file @ 23388a39
...@@ -374,26 +374,25 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque ...@@ -374,26 +374,25 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
}; };
if(lengthID > 0 && _data.data[0].site_id == 10002){ if(lengthID > 0 && _data.data[0].site_id == 10002){
$('.hangzhou').show(); $('.hangzhou').show();
shanghai_bitian = 1; hangzhou_bitian = 1;
_this.loadMainHZ(_data.data[0].id); _this.loadMainHZ(_data.data[0].id);
}; };
if(lengthID > 0 && _data.data[0].site_id == 10003){ if(lengthID > 0 && _data.data[0].site_id == 10003){
$('.shenzhen').show(); $('.shenzhen').show();
shanghai_bitian = 1; shenzhen_bitian = 1;
_this.loadMainSZ(_data.data[0].id); _this.loadMainSZ(_data.data[0].id);
}; };
if(lengthID > 0 && _data.data[0].site_id == 10004){ if(lengthID > 0 && _data.data[0].site_id == 10004){
$('.guangzhou').show(); $('.guangzhou').show();
shanghai_bitian = 1; guangzhou_bitian = 1;
_this.loadMainGZ(_data.data[0].id); _this.loadMainGZ(_data.data[0].id);
}; };
if(lengthID > 0 && _data.data[0].site_id == 10005){ if(lengthID > 0 && _data.data[0].site_id == 10005){
$('.beijing').show(); $('.beijing').show();
shanghai_bitian = 1; beijing_bitian = 1;
_this.loadMainBJ(_data.data[0].id); _this.loadMainBJ(_data.data[0].id);
}; };
......
public/app/js/office_detail_pc.js
View file @ 23388a39
...@@ -284,8 +284,6 @@ require(['vue','css!style/office_detail_pc.css','jquery0325', 'common'], functio ...@@ -284,8 +284,6 @@ require(['vue','css!style/office_detail_pc.css','jquery0325', 'common'], functio
_this.select_public_var=_data.data.is_show; _this.select_public_var=_data.data.is_show;
_this.d = _data.data; _this.d = _data.data;
_this.ds = _data.data.building_data; _this.ds = _data.data.building_data;
// _this.traffic =_data.data.building_data.traffic.join(',');//交通
// _this.exclusive_name = _data.data.exclusive_name.join(',');//独家方
_this.$nextTick(() => { _this.$nextTick(() => {
vm.$previewRefresh() vm.$previewRefresh()
}); });
......
public/resource/js/buildingDictionary.js
View file @ 23388a39
...@@ -607,22 +607,37 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style ...@@ -607,22 +607,37 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
business.url = '/office_index/houseDictionaryAdd'; business.url = '/office_index/houseDictionaryAdd';
} }
//验证必填项 //验证必填项
if($('#loupan_title').val() == ''){
alert('楼盘名称必填');
}
if($('#loupan_type').val() == -1){ if($('#loupan_type').val() == -1){
alert('楼盘类型必选'); alert('楼盘类型必选');
return;
}
if($('#loupan_title').val() == ''){
alert('楼盘名称必填');
return;
} }
if($('#introOffice').val() == ''){ if($('#introOffice').val() == ''){
alert('楼盘简介必选'); alert('楼盘简介必选');
return;
} }
if($('#loucengOffice').val() == ''){ if($('#loucengOffice').val() == ''){
alert('楼盘楼层必选'); alert('楼盘总层数必填');
return;
} }
if(_cityInternalObj.val() == ''){ if(_cityInternalObj.val() == ''){
alert('请选择楼盘地址'); alert('请选择楼盘地址');
return;
}
if(detailArr.length == 0 ){
alert('请选择楼盘交通信息');
return;
}
if(imgname1.concat(imgname2).length == 0){
alert('请选择楼盘图片');
return;
} }
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: business.url, url: business.url,
...@@ -746,6 +761,9 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style ...@@ -746,6 +761,9 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
//编辑获取交通详情 //编辑获取交通详情
$('.detail-modal-bargaininfo-commission-addarea').html(''); $('.detail-modal-bargaininfo-commission-addarea').html('');
business.addStr = _str; business.addStr = _str;
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) { $.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({ $('.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, '0': v.line_name,
...@@ -755,9 +773,10 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style ...@@ -755,9 +773,10 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
'4': v.latitude, '4': v.latitude,
'5': v.longitude '5': v.longitude
})); }));
var name_ = v.line_name?v.line_name.substr(2,3):v.line_name; var name_ = v.line_name_simple;
$(".shop_city_choose_site_list_line").eq(i).val(name_); $(".shop_city_choose_site_list_line").eq(i).val(name_);
}); });
}
} }
} }
......
public/resource/js/officeBuildingList.js
View file @ 23388a39
...@@ -1302,6 +1302,9 @@ if(data.code == 200) { ...@@ -1302,6 +1302,9 @@ if(data.code == 200) {
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
alert(data.msg)
}else{
alert(data.msg)
} }
} }
}); });
...@@ -1379,8 +1382,8 @@ if(data.code == 200) { ...@@ -1379,8 +1382,8 @@ if(data.code == 200) {
if($('#price_end').val()){ if($('#price_end').val()){
params.price_total_end = $('#price_end').val(); //租金总价 params.price_total_end = $('#price_end').val(); //租金总价
} }
if($('#price_end_single').val()){ if($('#price_start_single').val()){
params.price_start = $('#price_end_single').val(); //租金单价 params.price_start = $('#price_start_single').val(); //租金单价
} }
if($('#price_end_single').val()){ if($('#price_end_single').val()){
params.price_end = $('#price_end_single').val(); //租金单价 params.price_end = $('#price_end_single').val(); //租金单价
......
public/resource/js/officeEdit.js
View file @ 23388a39
...@@ -826,6 +826,9 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -826,6 +826,9 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_doc.on('input', '.phone_loupan', function() { _doc.on('input', '.phone_loupan', function() {
var _this = $(this), var _this = $(this),
_thisVal = $.trim(_this.val()); _thisVal = $.trim(_this.val());
if(!_thisVal){
user.IDBuilding = '';
}
_this.removeAttr('data-id'); //移除之前携带的信息 _this.removeAttr('data-id'); //移除之前携带的信息
if(_thisVal != '') { if(_thisVal != '') {
_ajaxObjLoupan && _ajaxObjLoupan.abort(); _ajaxObjLoupan && _ajaxObjLoupan.abort();
...@@ -1148,7 +1151,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -1148,7 +1151,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
if(_data['rent_free'] == -1 || _data['rent_free'] !=''){ if(_data['rent_free'] == -1 || _data['rent_free'] !=''){
}else{ }else{
alert('请选择免租时间') alert('请选择免租时间');
return
} }
if(_exclusiveTypeObj.val() == '1') { if(_exclusiveTypeObj.val() == '1') {
_data['agent_start_time'] = _exclusiveDate1Obj.val(); _data['agent_start_time'] = _exclusiveDate1Obj.val();
......
public/resource/js/user.js
View file @ 23388a39
...@@ -2253,7 +2253,13 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -2253,7 +2253,13 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
if($("#concrete_industry").val() == '') { if($("#concrete_industry").val() == '') {
alert('具体业态必填'); alert('具体业态必填');
return; return;
};
if(params.industry_type == '') {
alert('请选择业态');
$("#industry_type2").focus();
return;
} }
} }
params.disc = $("#user_area_add").val(); params.disc = $("#user_area_add").val();
...@@ -2289,11 +2295,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -2289,11 +2295,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
$("input[name='user_phone']").focus(); $("input[name='user_phone']").focus();
return; return;
} }
if(params.industry_type == '') {
alert('请选择业态');
$("#industry_type2").focus();
return;
}
if(params.price_demand == '') { if(params.price_demand == '') {
alert('请选择价格'); alert('请选择价格');
$("#price_type2").focus(); $("#price_type2").focus();
...@@ -2323,6 +2324,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -2323,6 +2324,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
alert('请选择正确的客方'); alert('请选择正确的客方');
return; return;
} }
if(params.user_status=='-1'){
alert('客户状态必填');
return;
}
$.ajax({ $.ajax({
url: '/index/pcEditClient', url: '/index/pcEditClient',
type: 'POST', type: 'POST',
......
public/resource/js/user_genjing_modal.js
View file @ 23388a39
...@@ -1016,6 +1016,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1016,6 +1016,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
}else{ }else{
user.yueDaiKanurl = '/office/getRoomListByReport';//办公楼 user.yueDaiKanurl = '/office/getRoomListByReport';//办公楼
} }
console.log(user.entrustType)
$.ajax({ $.ajax({
url:user.yueDaiKanurl, url:user.yueDaiKanurl,
type: 'GET', type: 'GET',
...@@ -1147,7 +1148,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1147,7 +1148,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
if(data.data) { if(data.data) {
user.entrustType == data.data.user_info.entrust_type; user.entrustType = data.data.user_info.entrust_type;
$(".cus_id").html(data.data.user_info.user_id); //客户编号 $(".cus_id").html(data.data.user_info.user_id); //客户编号
$(".cus_name").html(data.data.user_info.user_name); //姓名 $(".cus_name").html(data.data.user_info.user_name); //姓名
$(".area_demand").html(data.data.user_info.area_demand * 1); $(".area_demand").html(data.data.user_info.area_demand * 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment