Skip to content

T
tospur
Commit 38ca481e by felix
Options

每日一更

parent 12ffe958
Showing with 177 additions and 104 deletions
wp-content/plugins/tospur/Admin/newHouseList.php
...@@ -13,6 +13,7 @@ class newHouseList extends WP_List_Table ...@@ -13,6 +13,7 @@ class newHouseList extends WP_List_Table
global $wpdb; global $wpdb;
$current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); $current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
$current_url = remove_query_arg(array('paged', 'status'), $current_url); $current_url = remove_query_arg(array('paged', 'status'), $current_url);
$adminUrl = get_admin_url();
$sql = "select COUNT(*) as allNum, $sql = "select COUNT(*) as allNum,
COUNT(NULLIF(approval != -2, false)) as needCheckNum, COUNT(NULLIF(approval != -2, false)) as needCheckNum,
COUNT(NULLIF(status = 0, false)) as unCheckNum, COUNT(NULLIF(status = 0, false)) as unCheckNum,
...@@ -33,7 +34,7 @@ class newHouseList extends WP_List_Table ...@@ -33,7 +34,7 @@ class newHouseList extends WP_List_Table
} }
return array( return array(
"allNum" => '<a href="' . $current_url . '"'.(isset($_REQUEST["status"])?"":' class="current"').'>全部<span class="count">（' . $approvalParam["allNum"] . '）</span></a>', "allNum" => '<a href="'. $adminUrl. 'admin.php?page=newHouseList"'.(isset($_REQUEST["status"])?"":' class="current"').'>全部<span class="count">（' . $approvalParam["allNum"] . '）</span></a>',
"needCheckNum" => '<a href="' . $current_url . '&status=-2" '.($_REQUEST["status"]==-2?'class="current"':"").'>需审批<span class="count">（' . $approvalParam["needCheckNum"] . '）</span></a>', "needCheckNum" => '<a href="' . $current_url . '&status=-2" '.($_REQUEST["status"]==-2?'class="current"':"").'>需审批<span class="count">（' . $approvalParam["needCheckNum"] . '）</span></a>',
"unCheckNum" => '<a href="' . $current_url . '&status=0" '.($_REQUEST["status"]=="0"?'class="current"':"").'>未审核<span class="count">（' . $approvalParam["unCheckNum"] . '）</span></a>', "unCheckNum" => '<a href="' . $current_url . '&status=0" '.($_REQUEST["status"]=="0"?'class="current"':"").'>未审核<span class="count">（' . $approvalParam["unCheckNum"] . '）</span></a>',
"checkNum" => '<a href="' . $current_url . '&status=1" '.($_REQUEST["status"]==1?'class="current"':"").'>审核<span class="count">（' . $approvalParam["checkNum"] . '）</span></a>', "checkNum" => '<a href="' . $current_url . '&status=1" '.($_REQUEST["status"]==1?'class="current"':"").'>审核<span class="count">（' . $approvalParam["checkNum"] . '）</span></a>',
...@@ -412,7 +413,7 @@ function function_newHouseList() ...@@ -412,7 +413,7 @@ function function_newHouseList()
if (isset($_REQUEST['hasSearch'])) { if (isset($_REQUEST['hasSearch'])) {
$contest['district'] = SearchDao::searchCity($_REQUEST['listCity']); $contest['district'] = SearchDao::searchCity($_REQUEST['listCity']);
$contest['plate'] = SearchDao::searchCity($_REQUEST['listCity'], $_REQUEST['listDistrict']); $contest['plate'] = SearchDao::searchCity($_REQUEST['listCity'], $_REQUEST['listDistrict']);
$contest['dicTotalPrice'] = searchDao::searchTotalPrice($_REQUEST['listCity']); $contest['dicUnitPriceRange'] = searchDao::searchUnitPriceRange($_REQUEST['listCity']);
$contest['dicArea'] = searchDao::searchArea($_REQUEST['listCity']); $contest['dicArea'] = searchDao::searchArea($_REQUEST['listCity']);
$contest['cityId'] = $_REQUEST['listCity']; $contest['cityId'] = $_REQUEST['listCity'];
$contest['districtId'] = $_REQUEST['listDistrict']; $contest['districtId'] = $_REQUEST['listDistrict'];
......
wp-content/plugins/tospur/Admin/rentHouseList.php
...@@ -11,6 +11,7 @@ class rentHouseList extends WP_List_Table ...@@ -11,6 +11,7 @@ class rentHouseList extends WP_List_Table
global $wpdb; global $wpdb;
$current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); $current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
$current_url = remove_query_arg(array('paged', 'status'), $current_url); $current_url = remove_query_arg(array('paged', 'status'), $current_url);
$adminUrl = get_admin_url();
$role = Tospur_House::getCurrentRole(); $role = Tospur_House::getCurrentRole();
//根据当前user_id获取id所在门店的id，然后获取门店下所有职业顾问的id //根据当前user_id获取id所在门店的id，然后获取门店下所有职业顾问的id
$consultantArray = Tospur_House::get_oganization_consultant(); $consultantArray = Tospur_House::get_oganization_consultant();
...@@ -44,7 +45,7 @@ class rentHouseList extends WP_List_Table ...@@ -44,7 +45,7 @@ class rentHouseList extends WP_List_Table
); );
} }
return array( return array(
"allNum" => '<a href="' . $current_url . '"'.(isset($_REQUEST["status"])?"":' class="current"').'>全部<span class="count">（' . $approvalParam["allNum"] . '）</span></a>', "allNum" => '<a href="'. $adminUrl. 'admin.php?page=rentHouseList"'.(isset($_REQUEST["status"])?"":' class="current"').'>全部<span class="count">（' . $approvalParam["allNum"] . '）</span></a>',
"needCheckNum" => '<a href="' . $current_url . '&status=-2"'.($_REQUEST["status"]==-2?'class="current"':"").'>需审批<span class="count">（' . $approvalParam["needCheckNum"] . '）</span></a>', "needCheckNum" => '<a href="' . $current_url . '&status=-2"'.($_REQUEST["status"]==-2?'class="current"':"").'>需审批<span class="count">（' . $approvalParam["needCheckNum"] . '）</span></a>',
"unCheckNum" => '<a href="' . $current_url . '&status=0"'.($_REQUEST["status"]=="0"?'class="current"':"").'>未审核<span class="count">（' . $approvalParam["unCheckNum"] . '）</span></a>', "unCheckNum" => '<a href="' . $current_url . '&status=0"'.($_REQUEST["status"]=="0"?'class="current"':"").'>未审核<span class="count">（' . $approvalParam["unCheckNum"] . '）</span></a>',
"checkNum" => '<a href="' . $current_url . '&status=1"'.($_REQUEST["status"]==1?'class="current"':"").'>审核<span class="count">（' . $approvalParam["checkNum"] . '）</span></a>', "checkNum" => '<a href="' . $current_url . '&status=1"'.($_REQUEST["status"]==1?'class="current"':"").'>审核<span class="count">（' . $approvalParam["checkNum"] . '）</span></a>',
...@@ -298,7 +299,7 @@ class rentHouseList extends WP_List_Table ...@@ -298,7 +299,7 @@ class rentHouseList extends WP_List_Table
$sql = "select * from tospur_house th $sql = "select * from tospur_house th
left join(select user_id as aus_id,house_id,user_type from a_house_user) ahu on th.id = ahu.house_id and ahu.user_type=1 left join(select user_id as aus_id,house_id,user_type from a_house_user) ahu on th.id = ahu.house_id and ahu.user_type=1
left join(select id as consul_id,name as consul_name,subsidiaryId from tospur_consultant) tc on ahu.aus_id = tc.consul_id left join(select id as consul_id,name as consul_name,subsidiaryId from tospur_consultant) tc on ahu.aus_id = tc.consul_id
left join(select value,literal from dic_buildproperty) db on th.buildproperty_id = db.value left join(select value,literal from dic_buildproperty) db on if(th.buildproperty_id>5,5,th.buildproperty_id) = db.value
left join(select status_name,status_type,status_id from tospur_status)ts on th.status = ts.status_id and ts.status_type=2 left join(select status_name,status_type,status_id from tospur_status)ts on th.status = ts.status_id and ts.status_type=2
left join(select status_name as approvalName,status_type,status_id from tospur_status)tss on th.approval = tss.status_id and tss.status_type=2 left join(select status_name as approvalName,status_type,status_id from tospur_status)tss on th.approval = tss.status_id and tss.status_type=2
where 1=1 and house_type=2 "; where 1=1 and house_type=2 ";
......
wp-content/plugins/tospur/Admin/secHandHouseList.php
...@@ -10,6 +10,7 @@ class secHandHouseList extends WP_List_Table ...@@ -10,6 +10,7 @@ class secHandHouseList extends WP_List_Table
global $wpdb; global $wpdb;
$current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); $current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
$current_url = remove_query_arg(array('paged', 'status'), $current_url); $current_url = remove_query_arg(array('paged', 'status'), $current_url);
$adminUrl = get_admin_url();
$role = Tospur_House::getCurrentRole(); $role = Tospur_House::getCurrentRole();
//根据当前user_id获取id所在门店的id，然后获取门店下所有职业顾问的id //根据当前user_id获取id所在门店的id，然后获取门店下所有职业顾问的id
$consultantArray = Tospur_House::get_oganization_consultant(); $consultantArray = Tospur_House::get_oganization_consultant();
...@@ -43,7 +44,7 @@ class secHandHouseList extends WP_List_Table ...@@ -43,7 +44,7 @@ class secHandHouseList extends WP_List_Table
); );
} }
return array( return array(
"allNum" => '<a href="' . $current_url . '"'.(isset($_REQUEST["status"])?"":' class="current"').'>全部<span class="count">（' . $approvalParam["allNum"] . '）</span></a>', "allNum" => '<a href="'. $adminUrl. 'admin.php?page=secHandHouseList"'.(isset($_REQUEST["status"])?"":' class="current"').'>全部<span class="count">（' . $approvalParam["allNum"] . '）</span></a>',
"needCheckNum" => '<a href="' . $current_url . '&status=-2"'.($_REQUEST["status"]==-2?'class="current"':"").'>需审批<span class="count">（' . $approvalParam["needCheckNum"] . '）</span></a>', "needCheckNum" => '<a href="' . $current_url . '&status=-2"'.($_REQUEST["status"]==-2?'class="current"':"").'>需审批<span class="count">（' . $approvalParam["needCheckNum"] . '）</span></a>',
"unCheckNum" => '<a href="' . $current_url . '&status=0"'.($_REQUEST["status"]=="0"?'class="current"':"").'>未审核<span class="count">（' . $approvalParam["unCheckNum"] . '）</span></a>', "unCheckNum" => '<a href="' . $current_url . '&status=0"'.($_REQUEST["status"]=="0"?'class="current"':"").'>未审核<span class="count">（' . $approvalParam["unCheckNum"] . '）</span></a>',
"checkNum" => '<a href="' . $current_url . '&status=1"'.($_REQUEST["status"]==1?'class="current"':"").'>审核<span class="count">（' . $approvalParam["checkNum"] . '）</span></a>', "checkNum" => '<a href="' . $current_url . '&status=1"'.($_REQUEST["status"]==1?'class="current"':"").'>审核<span class="count">（' . $approvalParam["checkNum"] . '）</span></a>',
...@@ -324,7 +325,7 @@ class secHandHouseList extends WP_List_Table ...@@ -324,7 +325,7 @@ class secHandHouseList extends WP_List_Table
$sql = "select * from tospur_house th $sql = "select * from tospur_house th
left join(select user_id as aus_id,house_id,user_type from a_house_user) ahu on th.id = ahu.house_id and ahu.user_type=1 left join(select user_id as aus_id,house_id,user_type from a_house_user) ahu on th.id = ahu.house_id and ahu.user_type=1
left join(select id as consul_id,name as consul_name,subsidiaryId from tospur_consultant) tc on ahu.aus_id = tc.consul_id left join(select id as consul_id,name as consul_name,subsidiaryId from tospur_consultant) tc on ahu.aus_id = tc.consul_id
left join(select value,literal from dic_buildproperty) db on th.buildproperty_id = db.value left join(select value ,literal from dic_buildproperty) db on if(th.buildproperty_id>5,5,th.buildproperty_id) = db.value
left join(select status_name,status_type,status_id from tospur_status)ts on th.status = ts.status_id and ts.status_type=2 left join(select status_name,status_type,status_id from tospur_status)ts on th.status = ts.status_id and ts.status_type=2
left join(select status_name as approvalName,status_type,status_id from tospur_status)tss on th.approval = tss.status_id and tss.status_type=2 left join(select status_name as approvalName,status_type,status_id from tospur_status)tss on th.approval = tss.status_id and tss.status_type=2
where 1=1 and house_type=1 "; where 1=1 and house_type=1 ";
......
wp-content/plugins/tospur/Admin/views/addFeature.html
<table class="form-table"> <table class="form-table addBorder">
<tbody> <tbody>
<tr> <tr>
<th style="width:11.7%"><label for="feature" style="margin-left: 30px">特色筛选:</label></th> <th style="width:20%"><label for="feature" style="margin-left: 45px">特色筛选:</label></th>
<td> <td>
<div id="feature" class="row"> <div id="feature" class="row">
</div> </div>
......
wp-content/plugins/tospur/Admin/views/css/public.css
...@@ -12,11 +12,31 @@ p[class^=col-]{ ...@@ -12,11 +12,31 @@ p[class^=col-]{
padding: 0; padding: 0;
} }
#preview,#addPhotos,#recHouseTable{ #preview,#addPhotos,#recHouseTable,#featureTable,#weixin,#markTable,.addBorder{
border-bottom: 1px solid; border-bottom: 1px solid;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.form-horizontal .form-group{
margin-left:0px;
margin-right:0px;
padding-bottom: 0px;
}
.addBorder{
margin-left:0px;
margin-right:0px;
}
#paidTbody_buy tr,#paidTbody_sell tr{
border-bottom: 1px solid #ddd;
}
.addBorder{
padding-bottom: 10px;
}
#photoTables th,#photoTables td{ #photoTables th,#photoTables td{
text-align: center; text-align: center;
} }
\ No newline at end of file
wp-content/plugins/tospur/Admin/views/customerDemand.html
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-10"> <div class="col-md-10">
<input type="checkbox" name="new_house" id="new_house" value="{{ result.new_house }}" style="margin: 0;"{% if <input type="checkbox" name="new_house" id="new_house" value="{{ result.new_house }}" style="margin: 0;"{% if
result.new_house == 1 %} checked {% endif %}> result.new_house == 1 %} checked {% endif %}>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label for="character">性质：</label> <label for="character">性质：</label>
<select name="character" id="character" class="form-control"> <select name="character" id="character" class="form-control">
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<br> <br>
<div id="new_secondHand_house_input"> <div id="new_secondHand_house_input">
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label for="payment_mode">付款：</label> <label for="payment_mode">付款：</label>
<select name="payment_mode" id="payment_mode" class="form-control" disabled="disabled"> <select name="payment_mode" id="payment_mode" class="form-control" disabled="disabled">
...@@ -59,43 +59,43 @@ ...@@ -59,43 +59,43 @@
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label>总价：</label> <label>总价：</label>
<label for="min_totalPrice" class="hidden"></label> <label for="min_totalPrice" class="hidden"></label>
<input type="text" name="min_totalPrice" id="min_totalPrice" value="{{ result.min_totalPrice }}" <input type="text" name="min_totalPrice" id="min_totalPrice" value="{{ result.min_totalPrice }}"
class="form-control" disabled="disabled"> class="form-control" disabled="disabled" style="width:35%">
— —
<label for="max_totalPrice" class="hidden"></label> <label for="max_totalPrice" class="hidden"></label>
<input type="text" name="max_totalPrice" id="max_totalPrice" value="{{ result.max_totalPrice }}" <input type="text" name="max_totalPrice" id="max_totalPrice" value="{{ result.max_totalPrice }}"
class="form-control" disabled="disabled"> class="form-control" disabled="disabled" style="width:35%">
万 万
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label>单价：</label> <label>单价：</label>
<label for="min_unitPrice" class="hidden"></label> <label for="min_unitPrice" class="hidden"></label>
<input type="text" name="min_unitPrice" id="min_unitPrice" value="{{ result.min_unitPrice }}" <input type="text" name="min_unitPrice" id="min_unitPrice" value="{{ result.min_unitPrice }}"
class="form-control" disabled="disabled"> class="form-control" disabled="disabled" style="width:35%">
— —
<label for="max_unitPrice" class="hidden"></label> <label for="max_unitPrice" class="hidden"></label>
<input type="text" name="max_unitPrice" id="max_unitPrice" value="{{ result.max_unitPrice }}" <input type="text" name="max_unitPrice" id="max_unitPrice" value="{{ result.max_unitPrice }}"
class="form-control" disabled="disabled"> class="form-control" disabled="disabled" style="width:35%">
元/m² 元/m²
</div> </div>
</div> </div>
</div> </div>
<br> <br>
<div id="rent_house_input"> <div id="rent_house_input">
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label>月租：</label> <label>月租：</label>
<label for="min_rent" class="hidden"></label> <label for="min_rent" class="hidden"></label>
<input type="text" name="min_rent" id="min_rent" value="{{ result.min_rent }}" class="form-control" <input type="text" name="min_rent" id="min_rent" value="{{ result.min_rent }}" class="form-control"
disabled="disabled"> disabled="disabled" style="width:35%">
— —
<label for="max_rent" class="hidden"></label> <label for="max_rent" class="hidden"></label>
<input type="text" name="max_rent" id="max_rent" value="{{ result.max_rent }}" class="form-control" <input type="text" name="max_rent" id="max_rent" value="{{ result.max_rent }}" class="form-control"
disabled="disabled"> disabled="disabled" style="width:35%">
元/月 元/月
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
......
wp-content/plugins/tospur/Admin/views/customerDetail.html
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-12"> <div class="col-md-12">
<label>城市：</label> <label>城市：</label>
<label for="baseCity"></label> <label for="baseCity"></label>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label for="community_name">小区名称：</label> <label for="community_name">小区名称：</label>
<input type="text" name="community_name" id="community_name" value="{{ result.community_name }}" class="form-control"> <input type="text" name="community_name" id="community_name" value="{{ result.community_name }}" class="form-control">
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-4"> <div class="col-md-4">
<label for="check_in_time">入住时间：</label> <label for="check_in_time">入住时间：</label>
<input type="date" name="check_in_time" id="check_in_time" value="{{ result.check_in_time }}" class="form-control"> <input type="date" name="check_in_time" id="check_in_time" value="{{ result.check_in_time }}" class="form-control">
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-10"> <div class="col-md-10">
<label>面积：</label> <label>面积：</label>
<label for="min_coveredArea" class="hidden"></label> <label for="min_coveredArea" class="hidden"></label>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-10"> <div class="col-md-10">
<label>楼层：</label> <label>楼层：</label>
<label for="min_floor" class="hidden"></label> <label for="min_floor" class="hidden"></label>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label for="propertyRight">产权：</label> <label for="propertyRight">产权：</label>
<select name="propertyRight" id="propertyRight" class="form-control"> <select name="propertyRight" id="propertyRight" class="form-control">
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label for="age">年代：</label> <label for="age">年代：</label>
<select name="age" id="age" class="form-control"> <select name="age" id="age" class="form-control">
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label>户型：</label> <label>户型：</label>
<select name="bedroom" id="bedroom" class="form-control"> <select name="bedroom" id="bedroom" class="form-control">
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-8"> <div class="col-md-8">
<label for="origin_remark">客源备注：</label><br> <label for="origin_remark">客源备注：</label><br>
<textarea name="origin_remark" id="origin_remark" rows="5" cols="50" class="form-control">{{ result.origin_remark }}</textarea> <textarea name="origin_remark" id="origin_remark" rows="5" cols="50" class="form-control">{{ result.origin_remark }}</textarea>
......
wp-content/plugins/tospur/Admin/views/customerInfo.html
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-6"> <div class="col-md-6">
<label for="name">姓名：</label> <label for="name">姓名：</label>
<input type="text" name="name" id="name" value="{{ result.name }}" class="form-control"> <input type="text" name="name" id="name" value="{{ result.name }}" class="form-control">
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-8"> <div class="col-md-8">
<label for="phone">电话：</label> <label for="phone">电话：</label>
<input type="text" name="phone" id="phone" value="{{ result.phone }}" class="form-control"> <input type="text" name="phone" id="phone" value="{{ result.phone }}" class="form-control">
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row addBorder">
<div class="col-md-8"> <div class="col-md-8">
<label for="customer_remark">客户备注：</label><br> <label for="customer_remark">客户备注：</label><br>
<textarea name="customer_remark" id="customer_remark" rows="5" cols="50" class="form-control">{{ result.customer_remark }}</textarea> <textarea name="customer_remark" id="customer_remark" rows="5" cols="50" class="form-control">{{ result.customer_remark }}</textarea>
......
wp-content/plugins/tospur/Admin/views/houseInfo.html
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
{% if house_type == 1%} {% if house_type == 1%}
{% include 'addFeature.html' %} {% include 'addFeature.html' %}
{% endif %} {% endif %}
<div class="row form-group"> <div class=" form-group addBorder" style="margin-top:20px">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="baseCity" class=" control-label col-xs-3" >城市:</label> <label for="baseCity" class=" control-label col-xs-3" >城市:</label>
<p class="col-xs-3"> <p class="col-xs-3">
<select id="baseCity" name="baseCity" class="form-control" style="width:75px;"> <select id="baseCity" name="baseCity" class="form-control" style="width:73px;">
<option value="-1"> 城市</option> <option value="-1"> 城市</option>
{% for item in city %} {% for item in city %}
<option {{ item.id == result.city_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option> <option {{ item.id == result.city_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</select> </select>
</p> </p>
<p class="col-xs-3"> <p class="col-xs-3">
<select id="baseAreaId" name="baseAreaId" class="form-control" style="width:90px; margin-left:5px"> <select id="baseAreaId" name="baseAreaId" class="form-control" style="width:87px; margin-left:5px">
<option value = "-1">区域</option> <option value = "-1">区域</option>
{% if district %} {% if district %}
{% for item in district %} {% for item in district %}
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="suite" class="col-xs-5 control-label">门牌号码:</label> <label for="suite" class="col-xs-5 control-label">门牌号码:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="faceto" class="col-xs-5 control-label">朝向:</label> <label for="faceto" class="col-xs-5 control-label">朝向:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="from" class="col-xs-2 control-label">户型:</label> <label for="from" class="col-xs-2 control-label">户型:</label>
<p class="col-xs-1"> <p class="col-xs-1">
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="covered_area" class="col-xs-5 control-label">建筑面积:</label> <label for="covered_area" class="col-xs-5 control-label">建筑面积:</label>
<p class="col-xs-6"> <p class="col-xs-6">
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label for="propertyRight" class="col-xs-5 control-label">产权:</label> <label for="propertyRight" class="col-xs-5 control-label">产权:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label class="control-label col-xs-5"> <label class="control-label col-xs-5">
<input type="checkbox" id="garageCheck" {{ result.garage?"checked":"" }} class="form-control"> 车库: <input type="checkbox" id="garageCheck" {{ result.garage?"checked":"" }} class="form-control"> 车库:
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
{% endif %} {% endif %}
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="entrustDay" class="col-xs-5 control-label">委托日:</label> <label for="entrustDay" class="col-xs-5 control-label">委托日:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label for="traffic" class="col-xs-5 control-label">交通线路:</label> <label for="traffic" class="col-xs-5 control-label">交通线路:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
{% endif %} {% endif %}
</div> </div>
{% if house_type == 1 %} {% if house_type == 1 %}
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="parking_spaces" class="col-xs-5 control-label">车位:</label> <label for="parking_spaces" class="col-xs-5 control-label">车位:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
</div> </div>
{% endif %} {% endif %}
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="matching_facilities" class="col-xs-2 control-label">设施:</label> <label for="matching_facilities" class="col-xs-2 control-label">设施:</label>
<p class="col-xs-10"> <p class="col-xs-10">
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="overview" class="col-xs-2 control-label">房源点评:</label> <label for="overview" class="col-xs-2 control-label">房源点评:</label>
<p class="col-xs-10"> <p class="col-xs-10">
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
</div> </div>
{% if not houseId %} {% if not houseId %}
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label for="owner_name" class="col-xs-5 control-label">业主姓名:</label> <label for="owner_name" class="col-xs-5 control-label">业主姓名:</label>
<p class="col-xs-7"> <p class="col-xs-7">
......
wp-content/plugins/tospur/Admin/views/introduction.html
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
margin: 20px 0; margin: 20px 0;
} }
</style> </style>
<h2>我的设置</h2> <h2 class="addBorder">我的设置</h2>
<form action="" method="POST" enctype="multipart/form-data"> <form action="" method="POST" enctype="multipart/form-data">
<p> <p class="addBorder">
<label for="time">入职时间：</label> <label for="time">入职时间：</label>
<input type="date" name="time" value="{{ result.time }}"> <input type="date" name="time" value="{{ result.time }}">
</p> </p>
<p> <p class="addBorder">
<label for="introduction" style="vertical-align: top;">诚信宣言：</label> <label for="introduction" style="vertical-align: top;">诚信宣言：</label>
<textarea name="introduction" placeholder="请输入诚信宣言" rows="10" cols="50" style="resize: none;">{{ result.introduction }}</textarea> <textarea name="introduction" placeholder="请输入诚信宣言" rows="10" cols="50" style="resize: none;">{{ result.introduction }}</textarea>
</p> </p>
<div class="row" id="QRcodeDiv"> <div class="row addBorder" id="QRcodeDiv">
<div class="col-md-2"> <div class="col-md-2">
<label for="QRcode" style="vertical-align: top;">微信二维码：</label> <label for="QRcode" style="vertical-align: top;">微信二维码：</label>
</div> </div>
......
wp-content/plugins/tospur/Admin/views/listBlock.html
...@@ -44,7 +44,11 @@ ...@@ -44,7 +44,11 @@
{% elseif house_type == 0 %} {% elseif house_type == 0 %}
<select id="averagePrice" name="averagePrice" class="form-control"> <select id="averagePrice" name="averagePrice" class="form-control">
<option value ="">单价</option> <option value ="">单价</option>
<!--<option {{ item.value == average_price ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>--> {% if dicUnitPriceRange %}
{% for item in dicUnitPriceRange %}
<option {{ item.value == average_price ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
{% endfor %}
{% endif %}
</select> </select>
{% else%} {% else%}
<select id="totalPrice" name="totalPrice" class="form-control"> <select id="totalPrice" name="totalPrice" class="form-control">
...@@ -72,7 +76,7 @@ ...@@ -72,7 +76,7 @@
</select> </select>
<select id="acreage" name="acreage" class="form-control"> <select id="acreage" name="acreage" class="form-control">
<option value ="">面积</option> <option value ="">面积</option>
{% if acreage %} {% if dicArea %}
{% for item in dicArea %} {% for item in dicArea %}
<option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option> <option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
{% endfor %} {% endfor %}
......
wp-content/plugins/tospur/Admin/views/newHouseInfo.html
<br /> <br />
{% include 'weixin.html' %} {% include 'weixin.html' %}
<br/> <br/>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="baseCity" class=" control-label col-xs-3" >城市:</label> <label for="baseCity" class=" control-label col-xs-3" >城市:</label>
<p class="col-xs-3"> <p class="col-xs-3">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="developers" class="col-xs-5 control-label">开发商:</label> <label for="developers" class="col-xs-5 control-label">开发商:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label for="developers" class="col-xs-5 control-label">建筑类型:</label> <label for="developers" class="col-xs-5 control-label">建筑类型:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="covered_area" class="col-xs-5 control-label">建筑面积:</label> <label for="covered_area" class="col-xs-5 control-label">建筑面积:</label>
<p class="col-xs-6"> <p class="col-xs-6">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label for="property_management" class="col-xs-5 control-label">物业公司:</label> <label for="property_management" class="col-xs-5 control-label">物业公司:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-4 "> <div class="col-xs-4 ">
<label for="periphery" class="col-xs-5 control-label">周边配套:</label> <label for="periphery" class="col-xs-5 control-label">周边配套:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="latest_news" class="col-xs-2 control-label">最新动态:</label> <label for="latest_news" class="col-xs-2 control-label">最新动态:</label>
<p class="col-xs-10"> <p class="col-xs-10">
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="overview" class="col-xs-2 control-label" >楼盘概述:</label> <label for="overview" class="col-xs-2 control-label" >楼盘概述:</label>
<p class="col-xs-10"> <p class="col-xs-10">
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="publicize" class="col-xs-2 control-label" >项目宣传:</label> <label for="publicize" class="col-xs-2 control-label" >项目宣传:</label>
<p class="col-xs-10"> <p class="col-xs-10">
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="threeD" class="col-xs-2 control-label" >3D户型:</label> <label for="threeD" class="col-xs-2 control-label" >3D户型:</label>
<p class="col-xs-10"> <p class="col-xs-10">
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group addBorder">
<div class="col-xs-8"> <div class="col-xs-8">
<label for="roundLook" class="col-xs-2 control-label" >360°看房:</label> <label for="roundLook" class="col-xs-2 control-label" >360°看房:</label>
<p class="col-xs-10"> <p class="col-xs-10">
......
wp-content/plugins/tospur/Admin/views/recConsultant.html
{% block recConsultant %} {% block recConsultant %}
<style>
input[type=radio] {
margin: 0 4px 0 0;
}
</style>
<div class="modal fade" id="myConsultant" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="myConsultant" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<label>查询类型:</label>
<input type="radio" name="search_type" value="search_organization" id="search_organization">部门查询
<input type="radio" name="search_type" value="search_consultant" id="search_consultant">置业顾问查询
<div class="row" style="display: none;margin-top: 10px;margin-left: 1px" id="search_type_0">
{% import "selectOrganization.html" as macro %} {% import "selectOrganization.html" as macro %}
{{ macro.selectOrganization("consultant") }} {{ macro.selectOrganization("consultant") }}
<div class="row">
</div>
<div class="row" style="display: none;margin-top: 10px" id="search_type_1">
<div class="col-md-6"> <div class="col-md-6">
<input type="text" placeholder="请出入置业顾问姓名搜索" id="consultantName" class="form-control"> <input type="text" placeholder="请出入置业顾问姓名搜索" id="consultantName" class="form-control">
</div> </div>
<div class="col-md-2">
<button type="button" class="button action" id="searchConsult">搜索</button>
</div> </div>
<div style="margin-top: 10px">
<button type="button" class="button action" id="searchConsult">搜索</button>
</div> </div>
</div> </div>
<div class="modal-body" style="height: 300px;overflow: auto;"> <div class="modal-body" style="height: 300px;overflow: auto;">
<ul id="consultantList"> <ul id="consultantList">
...@@ -22,7 +35,27 @@ ...@@ -22,7 +35,27 @@
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function(){
var search_type_0 = $('#search_type_0');
var search_type_1 = $('#search_type_1');
$('input[name=search_type]').change(function () {
var value = $(this).val();
switch (value) {
case 'search_organization':
search_type_0.show();
search_type_1.hide();
break;
case 'search_consultant':
search_type_0.hide();
search_type_1.show();
break;
default:
search_type_0.hide();
search_type_1.hide();
break;
}
});
});
function close_modal_consultantList(){ function close_modal_consultantList(){
$("#myConsultant").modal('hide'); $("#myConsultant").modal('hide');
} }
...@@ -33,11 +66,21 @@ ...@@ -33,11 +66,21 @@
var consultantName = $("#consultantName").val(); var consultantName = $("#consultantName").val();
var organizationId = getOrganization('consultant'); var organizationId = getOrganization('consultant');
var select = $('#consultant_organization').find('select[data-depth]:not(.hidden)'); var select = $('#consultant_organization').find('select[data-depth]:not(.hidden)');
if(select.length > 1 && organizationId == -1 && consultantName == ""){ if($('#search_organization').is(':checked') && organizationId == -1){
alert("请选择部门"); alert("请选择部门");
return false; return false;
} }
searchConsultant(organizationId,consultantName); if($('#search_consultant').is(':checked') && $.trim(consultantName) == ""){
alert("请输入置业顾问姓名");
return false;
}
var search_type = $("input[name='search_type']:checked").val();
if(search_type == "search_organization"){
searchConsultant(organizationId,"");
}else if(search_type == "search_consultant"){
searchConsultant("",consultantName);
}
}); });
......
wp-content/plugins/tospur/Admin/views/save_customer_tracking.html
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
</style> </style>
<div class="customer_tracking"> <div class="customer_tracking">
<h2>新增客户跟踪</h2> <h2>新增客户跟踪</h2>
<h4>跟进记录</h4> <h4 class="addBorder">跟进记录</h4>
<p> <p class="addBorder">
<span>跟进类型：</span> <span>跟进类型：</span>
<span> <span>
<select id="customer_tracking_status" name="customer_tracking_status"> <select id="customer_tracking_status" name="customer_tracking_status">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<label for="customer_tracking_status"></label> <label for="customer_tracking_status"></label>
</span> </span>
</p> </p>
<p> <p class="addBorder">
<span style="vertical-align: top;">跟进说明：</span> <span style="vertical-align: top;">跟进说明：</span>
<span> <span>
<textarea rows="8" id="description" name="description" class="form-control" style="width: 250px;resize: none;"></textarea> <textarea rows="8" id="description" name="description" class="form-control" style="width: 250px;resize: none;"></textarea>
......
wp-content/plugins/tospur/Admin/views/selectOrganization.html
{% macro selectOrganization(prefix) %} {% macro selectOrganization(prefix) %}
{% set organization = function('SearchDao::searchOrganization')|json_encode() %} {% set organization = function('SearchDao::searchOrganization')|json_encode() %}
<div id="{{prefix}}_organization" style="margin-bottom: 10px;"> <div id="{{ prefix }}_organization" style="margin-bottom: 10px;">
<label>部门:</label> <label>部门:</label>
<label for="{{prefix}}_depth_1" class="hidden"></label> <label for="{{ prefix }}_depth_1" class="hidden"></label>
<select data-depth="1" id="{{prefix}}_depth_1"> <select data-depth="1" id="{{ prefix }}_depth_1">
<option value="-1">请选择</option> <option value="-1">请选择</option>
</select> </select>
<label for="{{prefix}}_depth_2" class="hidden"></label> <label for="{{ prefix }}_depth_2" class="hidden"></label>
<select data-depth="2" id="{{prefix}}_depth_2" class="hidden"> <select data-depth="2" id="{{ prefix }}_depth_2" class="hidden">
<option value="-1">请选择</option> <option value="-1">请选择</option>
</select> </select>
<label for="{{prefix}}_depth_3" class="hidden"></label> <label for="{{ prefix }}_depth_3" class="hidden"></label>
<select data-depth="3" id="{{prefix}}_depth_3" class="hidden"> <select data-depth="3" id="{{ prefix }}_depth_3" class="hidden">
<option value="-1">请选择</option> <option value="-1">请选择</option>
</select> </select>
<label for="{{prefix}}_depth_4" class="hidden"></label> <label for="{{ prefix }}_depth_4" class="hidden"></label>
<select data-depth="4" id="{{prefix}}_depth_4" class="hidden"> <select data-depth="4" id="{{ prefix }}_depth_4" class="hidden">
<option value="-1">请选择</option> <option value="-1">请选择</option>
</select> </select>
</div> </div>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
$(document).ready(function () { $(document).ready(function () {
var organization = eval('{{ organization }}'); var organization = eval('{{ organization }}');
$.each(organization, function (index, item) { $.each(organization, function (index, item) {
var select = $('#{{prefix}}_depth_' + item.Depth); var select = $('#{{ prefix }}_depth_' + item.Depth);
var css = ''; var css = '';
if (item.Depth != 1) { if (item.Depth != 1) {
css = 'class="hidden"'; css = 'class="hidden"';
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
select.append('<option value="' + item.Id + '" data-parent="' + item.ParentId + '" ' + css + '>' + item.Name + '</option>'); select.append('<option value="' + item.Id + '" data-parent="' + item.ParentId + '" ' + css + '>' + item.Name + '</option>');
}); });
$.each($('#{{prefix}}_organization select[data-depth]:not(:last)'), function (index, item) { $.each($('#{{ prefix }}_organization select[data-depth]:not(:last)'), function (index, item) {
var next_depth = Number($(item).data('depth')) + 1; var next_depth = Number($(item).data('depth')) + 1;
var next_select = $('#{{prefix}}_depth_' + next_depth); var next_select = $('#{{ prefix }}_depth_' + next_depth);
$(item).change(function () { $(item).change(function () {
var parent_id = $(this).val(); var parent_id = $(this).val();
$(this).nextAll().find('option:not(:first)').addClass('hidden'); $(this).nextAll().find('option:not(:first)').addClass('hidden');
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
}); });
}); });
var search_organization = Number('{{ req.organization }}'); if('{{ prefix }}' != 'consultant'){
var search_organization = Number(getUrlParmas().organization);
if (search_organization > 0) { if (search_organization > 0) {
var organization_select = $('#{{prefix}}_organization select[data-depth]'); var organization_select = $('#{{ prefix }}_organization select[data-depth]');
var search_option = organization_select.find('option[value=' + search_organization + ']'); var search_option = organization_select.find('option[value=' + search_organization + ']');
var index = search_option.parent().index('[data-depth]'); var index = search_option.parent().index('[data-depth]');
for (var i = 0; i <= index; i++) { for (var i = 0; i <= index; i++) {
...@@ -63,6 +64,7 @@ ...@@ -63,6 +64,7 @@
option.parent().removeClass('hidden'); option.parent().removeClass('hidden');
} }
} }
}
}); });
function getOrganization(prefix) { function getOrganization(prefix) {
......
wp-content/plugins/tospur/Admin/views/weixin.html
<div class="row form-group"> <div class="row form-group addBorder" >
<div class="col-xs-4"> <div class="col-xs-4">
<label for="housename" class="col-xs-5 control-label" >微信标题:</label> <label for="housename" class="col-xs-5 control-label" >微信标题:</label>
<p class="col-xs-7"> <p class="col-xs-7">
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<table class="form-table"> <table class="form-table addBorder">
<tbody > <tbody >
<tr> <tr>
<th style="width:11.9%"><label for="mark" style="margin-left: 42px">标签:</label></th> <th style="width:20%"><label for="mark" style="margin-left: 72px">标签:</label></th>
<td> <td>
<div id="mark" class="row"> <div id="mark" class="row">
</div> </div>
......
wp-content/plugins/tospur/Dao/SearchDao.php
...@@ -81,7 +81,7 @@ class SearchDao ...@@ -81,7 +81,7 @@ class SearchDao
{ {
global $wpdb; global $wpdb;
$where = " where 1=1"; $where = " where 1=1";
if (isset($_GET['cityId'])) { if (isset($cityId)) {
$where .= " and cityId = %d"; $where .= " and cityId = %d";
} }
$result = DBManager::get_results($wpdb->prepare('select id,priceValue as value from ' . Config::DIC_UNITPRICERANGE_TABLE . $where, $cityId)); $result = DBManager::get_results($wpdb->prepare('select id,priceValue as value from ' . Config::DIC_UNITPRICERANGE_TABLE . $where, $cityId));
...@@ -184,7 +184,7 @@ class SearchDao ...@@ -184,7 +184,7 @@ class SearchDao
" left join (select value as bp_value,literal as bp_literal from ".Config::DIC_BUILDPROPERTY_TABLE.") dbp on ada.buildproperty_id = dbp.bp_value"; " left join (select value as bp_value,literal as bp_literal from ".Config::DIC_BUILDPROPERTY_TABLE.") dbp on ada.buildproperty_id = dbp.bp_value";
$orderbySql = " group by th.id order by th.creattime DESC"; $orderbySql = " group by th.id order by th.creattime DESC";
}else if ($array['houseType'] == 1) { }else if ($array['houseType'] == 1) {
$addSql = " left join (select value as bp_value,literal as bp_literal from ".Config::DIC_BUILDPROPERTY_TABLE.") dbp on th.buildproperty_id = dbp.bp_value"; $addSql = " left join (select value as bp_value,literal as bp_literal from ".Config::DIC_BUILDPROPERTY_TABLE.") dbp on if(th.buildproperty_id>5,5,buildproperty_id) = dbp.bp_value";
if ($array['feature'] > -1) { if ($array['feature'] > -1) {
$addSql .= " left join (select house_id,tag_id from ".Config::A_HOUSE_TAG_TABLE.") aht on th.id = aht.house_id"; $addSql .= " left join (select house_id,tag_id from ".Config::A_HOUSE_TAG_TABLE.") aht on th.id = aht.house_id";
$addWhereSql = " and tag_id = ".$array['feature']; $addWhereSql = " and tag_id = ".$array['feature'];
...@@ -307,7 +307,7 @@ class SearchDao ...@@ -307,7 +307,7 @@ class SearchDao
LEFT JOIN ".Config::TOSPUR_ORGANIZATION_TABLE." tor on tc.subsidiaryId = tor.Id LEFT JOIN ".Config::TOSPUR_ORGANIZATION_TABLE." tor on tc.subsidiaryId = tor.Id
where 1=1"; where 1=1";
$params = array(); $params = array();
if($organizationId != -1){ if($organizationId!=NULL && $organizationId != -1 ){
$params[] = $organizationId; $params[] = $organizationId;
$sql = $sql." and subsidiaryId=%d"; $sql = $sql." and subsidiaryId=%d";
} }
...@@ -398,10 +398,10 @@ class SearchDao ...@@ -398,10 +398,10 @@ class SearchDao
LEFT JOIN ".Config::DIC_ROOM_TABLE." dr on dr.value = th.room_id LEFT JOIN ".Config::DIC_ROOM_TABLE." dr on dr.value = th.room_id
where th.id in(select recommend_id from ".Config::A_HOUSE_RECOMMEND_TABLE." where house_id = %d);"; where th.id in(select recommend_id from ".Config::A_HOUSE_RECOMMEND_TABLE." where house_id = %d);";
}else{ }else{
$recommendSql = "select th.id,th.name,th.community_name,ti.path,dr.value,th.rent,th.decoration,th.covered_area,th.total_price,(SELECT GROUP_CONCAT(left(tt.name,3)) from ".Config::A_HOUSE_TAG_TABLE." aht $recommendSql = "select th.id,th.name,th.community_name,ti.path,db.literal,th.rent,th.decoration,th.covered_area,th.total_price,(SELECT GROUP_CONCAT(left(tt.name,3)) from ".Config::A_HOUSE_TAG_TABLE." aht
LEFT JOIN ".Config::TOSPUR_TAG_TABLE." tt on tt.id = aht.tag_id LEFT JOIN ".Config::TOSPUR_TAG_TABLE." tt on tt.id = aht.tag_id
where aht.house_id = th.id) as tags from ".Config::TOSPUR_HOUSE_TABLE." th where aht.house_id = th.id) as tags from ".Config::TOSPUR_HOUSE_TABLE." th
LEFT JOIN ".Config::DIC_ROOM_TABLE." dr on dr.id = th.room_id LEFT JOIN ".Config::DIC_BUILDPROPERTY_TABLE." db on db.value = if(th.buildproperty_id>5,5,buildproperty_id)
LEFT JOIN ".Config::TOSPUR_IMAGE_TABLE." ti on th.frontCover_id = ti.id LEFT JOIN ".Config::TOSPUR_IMAGE_TABLE." ti on th.frontCover_id = ti.id
where th.id in(select recommend_id from ".Config::A_HOUSE_RECOMMEND_TABLE." where house_id = %d);"; where th.id in(select recommend_id from ".Config::A_HOUSE_RECOMMEND_TABLE." where house_id = %d);";
} }
......
wp-content/plugins/tospur/index.php
...@@ -101,8 +101,8 @@ function tospur_load_resources(){ ...@@ -101,8 +101,8 @@ function tospur_load_resources(){
wp_enqueue_script('validate'); wp_enqueue_script('validate');
wp_enqueue_style('jquery-ui_css'); wp_enqueue_style('jquery-ui_css');
wp_enqueue_style('publicCss');
wp_enqueue_style('bootstrapMinCss'); wp_enqueue_style('bootstrapMinCss');
wp_enqueue_style('publicCss');
} }
......
wp-content/themes/tospur/js/public.js
...@@ -136,12 +136,12 @@ function ajax_get_house(url, loading, ajax_data, context) { ...@@ -136,12 +136,12 @@ function ajax_get_house(url, loading, ajax_data, context) {
} else if (houseType == 1) { } else if (houseType == 1) {
div.find('[data-attr=community]').text(value.community_name); div.find('[data-attr=community]').text(value.community_name);
div.find('[data-attr=apartment]').text(value.bp_literal||'未知'); div.find('[data-attr=apartment]').text(value.bp_literal||'未知');
div.find('[data-attr=covered_area]').text(value.covered_area + '平米'); div.find('[data-attr=covered_area]').text(value.covered_area + '㎡');
div.find('[data-attr=price]').html('<em>' + (value.total_price / 10000).toFixed(0) + '万</em>'); div.find('[data-attr=price]').html('<em>' + value.total_price + '万</em>');
} else if (houseType == 2) { } else if (houseType == 2) {
div.find('[data-attr=community]').text(value.community_name); div.find('[data-attr=community]').text(value.community_name);
div.find('[data-attr=apartment]').text(value.bp_literal||'未知'); div.find('[data-attr=apartment]').text(value.bp_literal||'未知');
div.find('[data-attr=covered_area]').text(value.covered_area + '平米'); div.find('[data-attr=covered_area]').text(value.covered_area + '㎡');
div.find('[data-attr=decoration]').text(value.decoration); div.find('[data-attr=decoration]').text(value.decoration);
var rent = value.rent; var rent = value.rent;
if (rent.length > 4) { if (rent.length > 4) {
......
wp-content/themes/tospur/views/detail.html
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
<li>物业公司：{{result.property_management}}</li> <li>物业公司：{{result.property_management}}</li>
<li>入住时间：<span>{{result.check_in_time}}</span></li> <li>入住时间：<span>{{result.check_in_time}}</span></li>
<li>产权年限：{{result.property_age}}</li> <li>产权年限：{{result.property_age}}</li>
<li>建筑面积：{{result.covered_area}}</li> <li>建筑面积：{{result.covered_area}}㎡</li>
<li>绿化率：{{result.greening_rate}}</li> <li>绿化率：{{result.greening_rate}}</li>
<li>车位数：{{result.parking_spaces}}</li> <li>车位数：{{result.parking_spaces}}</li>
<li>物业费：{{result.property_money}}</li> <li>物业费：{{result.property_money}}</li>
......
wp-content/themes/tospur/views/detailOther.html
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
<p class="detail_title">基本信息<span class="pull-right"></span></p> <p class="detail_title">基本信息<span class="pull-right"></span></p>
</a> </a>
<ul class="list-unstyled collapse infoCont" id="collapseExample" style="min-height:60px;display:block;overflow:hidden;height:0;"> <ul class="list-unstyled collapse infoCont" id="collapseExample" style="min-height:60px;display:block;overflow:hidden;height:0;">
<li>户型：{{result.buildproperty}}</li> <li>户型：{{result.buildproperty_id}}房</li>
<li>面积：{{result.covered_area}}</li> <li>面积：{{result.covered_area}}㎡</li>
<li>楼层：{{result.floor}}</li> <li>楼层：{{result.floor}}</li>
<li>朝向：{{result.faceto}}</li> <li>朝向：{{result.faceto}}</li>
<li>装修：{{result.decoration}}</li> <li>装修：{{result.decoration}}</li>
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</li> </li>
<li>{{item.community_name}}</li> <li>{{item.community_name}}</li>
<li> <li>
<span>{{item.value}}</span> <span>{{item.literal}}</span>
{% if result.house_type == 2 %} {% if result.house_type == 2 %}
<span>{{item.decoration}}</span> <span>{{item.decoration}}</span>
{% endif %} {% endif %}
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
<span class="pull-right"> <span class="pull-right">
{% if result.house_type == 1 %} {% if result.house_type == 1 %}
<em> <em>
{{(item.total_price/10000)|round(2, 'floor')}}万 {{(item.total_price)|round(2, 'floor')}}万
</em> </em>
{% elseif result.house_type == 2 %} {% elseif result.house_type == 2 %}
<em> <em>
......
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