每日一更

wp-content/plugins/tospur/Admin/House.php

@@ -38,6 +38,7 @@ class House {
                 'plate_id' => $_POST["basePlateId"],
                 'room_id' => $_POST['baseRoom'],
                 "location" => $_POST["location"],
+                'status' =>$_POST['status'],
                 "property_money" => $_POST["property_money"],
                 'community_name' => $_POST["community_name"],
             );
@@ -126,37 +127,31 @@ class House {
         $res = InsertDao::addRecommend($houseId,$data);
         if($res == 504){
             $result = $res;
+            echo "推荐房源修改失败";
         }
 
         $wpdb->delete(Config::A_HOUSE_USER_TABLE,array("house_id" => $houseId));
         $res = InsertDao::addRecConsultant($houseId,$data);
         if($res == 505){
             $result = $res;
+            echo "推荐置业顾问修改失败";
         }
-
         InsertDao::addHouseTag($_POST['mark'],$houseId);
-
         return $result;
     }
 
-    public static function data_insert($insert_tospur_house_array){
+    public static function data_insert($params){
         global $wpdb;
         //房源与类型以及面积信息
         $data = $_POST["data"];
         //获取新房信息，存入tospur_house表
-        $insert_tospur_house_array['user_id'] = get_current_user_id();
-        $insert_tospur_house_array['creattime'] = date("Y-m-d H:i:s");
-        $insert_tospur_house_array['house_type'] = 0;
-        $res = $wpdb->get_results('SELECT * FROM tospur_house WHERE name="' . $_POST['housename'] . '" and address="' . $_POST['address'] . '"', OBJECT);
+        $params['user_id'] = get_current_user_id();
+        $params['creattime'] = date("Y-m-d H:i:s");
+        $params['house_type'] = 0;
+        $res = $wpdb->get_results('SELECT * FROM tospur_house WHERE name="' . $_POST['housename'] . '" and address="' . $_POST['address'] . '" and house_type=0', OBJECT);
         if (!$res) {
-            $houseRes = $wpdb->insert('tospur_house', $insert_tospur_house_array);
-            if (!$houseRes) {
-                return 500;
-            }
-            $houseId = $wpdb->insert_id;
-            if(!SearchDao::setHouseNumber($houseId,$insert_tospur_house_array['house_type'],$insert_tospur_house_array['city_id'])){
-                return 510;
-            }
+            $houseId =  InsertDao::insert_tospur_house($params);
+
             InsertDao::addMainImage($houseId,$data);
 
             InsertDao::addRecommend($houseId,$data);

wp-content/plugins/tospur/Admin/newHouseList.php

@@ -276,9 +276,8 @@ function newHouseList()
         $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['acreage'] = $_POST['acreage'];
         $contest['characteristic'] = $_POST['characteristic'];
-        $contest['status'] = $_POST['status'];
+        $contest['status'] = SearchDao::searchStatus(1,$_POST['status']);
         $contest['hasSearch'] = $_POST['hasSearch'];
-
     }
     Timber::render("newHouseList.html",$contest);
 }

wp-content/plugins/tospur/Admin/rentHouse.php

@@ -34,11 +34,9 @@ class RentHouse{
             'traffic' => $_POST['traffic'],
             'periphery' => $_POST['periphery'],
             'status' =>$_POST['status'],
-            'creattime' => date("Y-m-d H:i:s"),
             'owner_name'=>$_POST['owner_name'],
             'owner_phone'=>$_POST['owner_phone'],
             "location" => $_POST["location"],
-            'house_type' => 2
         );
         if($type==3){
             $wpdb->query("START TRANSACTION");
@@ -85,10 +83,11 @@ class RentHouse{
     public static function rentHouseData_insert($params)
     {
         global $wpdb;
-        //图片信息
-        $uploadedfile = $_FILES['files'];
         //房源与类型以及面积信息
         $data = $_POST["data"];
+        $params['user_id'] = get_current_user_id();
+        $params['creattime'] = date("Y-m-d H:i:s");
+        $params['house_type'] = 2;
         $res = $wpdb->get_results('SELECT * FROM tospur_house WHERE address="' .$params['address'] . '" and owner_name="' .$params['owner_name'] . '" and owner_phone="'.$params['owner_phone'].'" and house_type=2', OBJECT);
         if(!$res){
             $houseId = InsertDao::insert_tospur_house($params);

wp-content/plugins/tospur/Admin/rentHouseList.php

@@ -306,7 +306,7 @@ function rentHouseList()
         $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['acreage'] = $_POST['acreage'];
         $contest['characteristic'] = $_POST['characteristic'];
-        $contest['status'] = $_POST['status'];
+        $contest['status'] = SearchDao::searchStatus(2,$_POST['status']);
         $contest['hasSearch'] = $_POST['hasSearch'];
 
     }

wp-content/plugins/tospur/Admin/secHandHouse.php

@@ -33,11 +33,9 @@ class SecHandHouse{
             'traffic' => $_POST['traffic'],
             'periphery' => $_POST['periphery'],
             'status' =>$_POST['status'],
-            'creattime' => date("Y-m-d H:i:s"),
             'owner_name'=>$_POST['owner_name'],
             'owner_phone'=>$_POST['owner_phone'],
             "location" => $_POST["location"],
-            'house_type' => 1
         );
         if($type==2){
             $wpdb->query("START TRANSACTION");
@@ -84,10 +82,11 @@ class SecHandHouse{
     public static function secHouseData_insert($params)
     {
         global $wpdb;
-        //图片信息
-        $uploadedfile = $_FILES['files'];
         //房源与类型以及面积信息
         $data = $_POST["data"];
+        $params['user_id'] = get_current_user_id();
+        $params['creattime'] = date("Y-m-d H:i:s");
+        $params['house_type'] = 1;
         //获取新房信息，存入tospur_house表
         $res = $wpdb->get_results('SELECT * FROM tospur_house WHERE address="' .$params['address'] . '" and owner_name="' .$params['owner_name'] . '" and owner_phone="'.$params['owner_phone'].'" and house_type=1', OBJECT);
         if(!$res){

wp-content/plugins/tospur/Admin/secHandHouseList.php

@@ -288,10 +288,10 @@ function secHandHouseList()
         $contest['options']= SearchDao::searchForCDP($_POST['listCity'],$_POST['listDistrict'],$_POST['listPlate']);
         $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['acreage'] = $_POST['acreage'];
+        $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['characteristic'] = $_POST['characteristic'];
-        $contest['status'] = $_POST['status'];
+        $contest['status'] = SearchDao::searchStatus(2,$_POST['status']);
         $contest['hasSearch'] = $_POST['hasSearch'];
-
     }
     Timber::render("secHandHouseList.html",$contest);
 }

wp-content/plugins/tospur/Admin/views/newHouseList.html

@@ -26,7 +26,11 @@
             {% endif %}
         </select>
         <select id="totalPrice" name="totalPrice">
+            {% if hasSearch and totalPrice %}
+            <option value="{{totalPrice}}"> {{totalPrice}}</option>
+            {% else %}
             <option value ="">价格</option>
+            {% endif %}
         </select>
         <select id="buildProperty" name="buildProperty">
             {% if hasSearch and buildProperty %}
@@ -36,15 +40,25 @@
             {% endif %}
         </select>
         <select id="acreage" name="acreage">
+            {% if hasSearch and acreage %}
+            <option value="{{acreage}}"> {{acreage}}</option>
+            {% else %}
             <option value ="">面积</option>
+            {% endif %}
         </select>
         <select name="status" name="status">
+            {% if hasSearch and status %}
+            {% for item in status %}
+            <option value="{{ item.status_id }}">{{ item.status_name }}</option>
+            {% endfor %}
+            {% else %}
             <option value="-1">状态</option>
+            {% endif %}
             <option value="0">未审核</option>
             <option value="1">审核</option>
             <option value="2">下架</option>
         </select>
-        <input type="text" placeholder="请出入楼盘名/地段名搜索" name="searchText">
+        <input type="text" placeholder="请出入楼盘名" name="searchText">
         <input type="submit" id="submit" class="button action" value="搜索">
         <!-- Now we can render the completed list table -->
         {{function("addNewHouseTable")}}

wp-content/plugins/tospur/Admin/views/rentHouseList.html

@@ -27,7 +27,11 @@
             {% endif %}
         </select>
         <select id="totalPrice" name="totalPrice">
+            {% if hasSearch and totalPrice %}
+            <option value="{{totalPrice}}"> {{totalPrice}}</option>
+            {% else %}
             <option value ="">价格</option>
+            {% endif %}
         </select>
         <select id="buildProperty" name="buildProperty">
             {% if hasSearch and buildProperty %}
@@ -37,10 +41,20 @@
             {% endif %}
         </select>
         <select id="acreage" name="acreage">
+            {% if hasSearch and acreage %}
+            <option value="{{acreage}}"> {{acreage}}</option>
+            {% else %}
             <option value ="">面积</option>
+            {% endif %}
         </select>
         <select name="status" name="status">
+            {% if hasSearch and status %}
+            {% for item in status %}
+            <option value="{{ item.status_id }}">{{ item.status_name }}</option>
+            {% endfor %}
+            {% else %}
             <option value="-1">状态</option>
+            {% endif %}
             <option value="0">未审核</option>
             <option value="1">审核</option>
             <option value="2">自售</option>

wp-content/plugins/tospur/Admin/views/secHandHouseList.html

@@ -27,7 +27,11 @@
             {% endif %}
         </select>
         <select id="totalPrice" name="totalPrice">
+            {% if hasSearch and totalPrice %}
+            <option value="{{totalPrice}}"> {{totalPrice}}</option>
+            {% else %}
             <option value ="">价格</option>
+            {% endif %}
         </select>
         <select id="buildProperty" name="buildProperty">
             {% if hasSearch and buildProperty %}
@@ -37,7 +41,11 @@
             {% endif %}
         </select>
         <select id="acreage" name="acreage">
+            {% if hasSearch and acreage %}
+            <option value="{{acreage}}"> {{acreage}}</option>
+            {% else %}
             <option value ="">面积</option>
+            {% endif %}
         </select>
         <select id="characteristic" name="characteristic">
             <option value ="">特色</option>
@@ -45,7 +53,13 @@
             <option value ="">唯一住房</option>
         </select>
         <select name="status" name="status">
+            {% if hasSearch and status %}
+            {% for item in status %}
+            <option value="{{ item.status_id }}">{{ item.status_name }}</option>
+            {% endfor %}
+            {% else %}
             <option value="-1">状态</option>
+            {% endif %}
             <option value="0">未审核</option>
             <option value="1">审核</option>
             <option value="2">自售</option>

wp-content/plugins/tospur/Dao/SearchDao.php

@@ -475,4 +475,12 @@ class SearchDao
         return $result;
     }
 
+	public static function searchStatus($type=null,$status=null){
+        global $wpdb;
+        if($status!=null && $type!=null){
+            $sql = "select status_id,status_name from tospur_status where status_type =".$type." and status_id =".$status;
+            $result = $wpdb->get_results($sql);
+        }
+        return $result;
+    }
 }
\ No newline at end of file

wp-content/themes/tospur/comment.php

 <?php
 
+require_once('const.php');
 $context = array();
 $context['theme'] = get_template_directory_uri();
 $context['url'] = home_url();
 
-Timber::render('comment.html', $context);
+$user = wp_get_current_user();
+$user_id = $user->ID;
+if ($user_id == 0) {
+    wp_redirect($const_login_page);
+} else {
+    $context['user_id'] = $user_id;
+    Timber::render('comment.html', $context);
+}
 
 ?>
\ No newline at end of file

wp-content/themes/tospur/css/component.css

+html, body { height: 100%; }
+
+.pt-perspective {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	-webkit-perspective: 1200px;
+	-moz-perspective: 1200px;
+	perspective: 1200px;
+}
+
+.pt-page {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	visibility: hidden;
+	overflow: hidden;
+	-webkit-backface-visibility: hidden;
+	-moz-backface-visibility: hidden;
+	backface-visibility: hidden;
+	-webkit-transform: translate3d(0, 0, 0);
+	-moz-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+	-webkit-transform-style: preserve-3d;
+	-moz-transform-style: preserve-3d;
+	transform-style: preserve-3d;
+}
+
+.pt-page-current,
+.no-js .pt-page {
+	visibility: visible;
+	z-index: 1;
+}
+
+.no-js body {
+	overflow: auto;
+}
+
+.pt-page-ontop {
+	z-index: 999;
+}
+
+/* Text Styles, Colors, Backgrounds */
+
+.pt-page h1 {
+	position: absolute;
+	font-weight: 300;
+	font-size: 4.4em;
+	line-height: 1;
+	letter-spacing: 6px;
+	margin: 0;
+	top: 12%;
+	width: 100%;
+	text-align: center;
+	text-transform: uppercase;
+	word-spacing: -0.3em;
+}
+
+.pt-page h1 span {
+	font-family: 'Satisfy', serif;
+	font-weight: 400;
+	font-size: 40%;
+	text-transform: none;
+	word-spacing: 0;
+	letter-spacing: 0;
+	display: block;
+	opacity: 0.4;
+}
+
+.pt-page h1 strong {
+	color: rgba(0,0,0,0.1);
+}
+/* Triggers (menu and button) */
+
+.pt-triggers {
+	position: absolute;
+	width: 300px;
+	z-index: 999999;
+	top: 12%;
+	left: 50%;
+	margin-top: 130px;
+	-webkit-transform: translateX(-50%);
+	-moz-transform: translateX(-50%);
+	-ms-transform: translateX(-50%); 
+	transform: translateX(-50%);
+}
+
+.no-js .pt-triggers {
+	display: none;
+}
+
+.pt-triggers .dl-menuwrapper button,
+.pt-touch-button {
+	border: none;
+	font-size: 13px;
+	font-weight: 700;
+	text-transform: uppercase;
+	margin: 10px 0 20px;
+	padding: 0px 20px;
+	line-height: 50px;
+	height: 50px;
+	letter-spacing: 1px;
+	width: 100%;
+	cursor: pointer;
+	display: block;
+	font-family: 'Lato', Calibri, Arial, sans-serif;
+	box-shadow: 0 3px 0 rgba(0,0,0,0.1);
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+.pt-touch-button {
+	background: #fff;
+	color: #aaa;
+}
+
+.pt-triggers .dl-menuwrapper button {
+	margin-bottom: 0;
+}
+
+.pt-touch-button:active {
+	box-shadow: 0 1px 0 rgba(0,0,0,0.1);
+}
+
+.touch .pt-triggers .dl-menuwrapper {
+	display: none;
+}
+
+.pt-message {
+	display: none;
+	position: absolute;
+	z-index: 99999;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	background: #da475c;
+	color: #fff;
+	text-align: center;
+}
+
+.pt-message p {
+	margin: 0;
+	line-height: 60px;
+	font-size: 26px;
+}
+
+.no-cssanimations .pt-message {
+	display: block;
+}
+
+@media screen and (max-width: 47.4375em) {
+	.pt-page h1 {
+		font-size: 3em;
+	}
+
+	.pt-triggers .dl-menuwrapper {
+		display: none;
+	}
+}
+
+@media screen and (max-height: 45.9em) {
+	.pt-triggers .dl-menuwrapper li a {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+	.pt-triggers .dl-menuwrapper li.dl-back:after, .dl-menuwrapper li > a:not(:only-child):after {
+		line-height: 24px;
+	}
+}
+
+@media screen and (max-height: 38em) { 
+	.pt-triggers .dl-menuwrapper {
+		display: none;
+	}
+}

wp-content/themes/tospur/css/detail.css

@@ -426,6 +426,11 @@ body {
   -webkit-border-bottom-left-radius: 6px;
   -webkit-border-bottom-right-radius: 6px;
 }
+.detail_row #wrapper #scroller ul li p em {
+  font-style: normal;
+  font-size: 7px;
+  vertical-align: top;
+}
 .detail_row #wrapper #scroller ul li:last-child {
   margin-right: 0;
 }

wp-content/themes/tospur/functions.php

@@ -50,6 +50,9 @@ function page_template($template)
             case 'map':
                 $page = $theme . '/map.php';
                 break;
+            case 'loan_calculator':
+                $page = $theme . '/loan_calculator.php';
+                break;
         }
         return $page;
     } else {
@@ -177,63 +180,30 @@ function get_consultant()
     }
 }
 
-add_action('wp_ajax_get_my_house', 'get_my_house');
-function get_my_house()
-{
-    $houseType = $_POST['houseType'];
-    $userType = $_POST['userType'];
-    $userId = $_POST['userId'];
-    $index = $_POST['index'];
-    if (isset($houseType) && isset($userType) && isset($userId) && isset($index)) {
-        $house_result = SearchDao::searchHouse(
-            array(
-                'houseType' => $houseType,
-                'userType' => $userType,
-                'userId' => $userId,
-                'index' => $index
-            )
-        );
-        $array = get_house_image_and_tags($house_result);
-        wp_send_json($array);
-    }
-}
-
 add_action('wp_ajax_search_house', 'SearchDao::ajax_searchHouse');
 add_action('wp_ajax_nopriv_search_house', 'SearchDao::ajax_searchHouse');
 
-function get_house_image_and_tags($house_result)
+add_action('wp_ajax_submit_comment', 'submit_comment');
+function submit_comment()
 {
-    $array = array();
-    if ($house_result) {
-        $array['code'] = 2000;
-        $house_ids = array();
-        foreach ($house_result as $key => $value) {
-            $house_id = $value->id;
-            $house_ids[] = $house_id;
-        }
-        $tag_result = dao::search_house_tag($house_ids);
-        //标签
-        if ($tag_result) {
-            foreach ($tag_result as $key => $value) {
-                $array['tags'][$value->house_id][] = $value->name;
-            }
-        }
-        //图片
-        $image_result = dao::search_house_image($house_ids);
-        if ($image_result) {
-            foreach ($image_result as $key => $value) {
-                $array['images'][$value->house_id] = home_url() . Image::getImage($value->path,'small');
-            }
-        }
-        $array['result'] = $house_result;
-    } else {
-        $array['code'] = 2001;
+    $user_id = $_POST['user_id'];
+    $content = $_POST['content'];
+    if (isset($user_id) && isset($content)) {
+        $data = array(
+            'comment_post_ID' => 1,
+            'comment_content' => $content,
+            'comment_parent' => 0,
+            'user_id' => $user_id,
+            'comment_date' => current_time('mysql'),
+            'comment_approved' => 1,
+        );
+        wp_insert_comment($data);
     }
-    return $array;
 }
 
 add_action('wp_ajax_add_collect', 'add_collect');
-function add_collect($house_id){
+function add_collect($house_id)
+{
     $insert_a_house_user_array = array(
         'user_id' => get_current_user_id(),
         'house_id' => $_POST["hid"],
@@ -252,16 +222,18 @@ function add_collect($house_id){
 }
 
 add_filter('login_redirect', 'new_login_redirect', 10, 3);
-function new_login_redirect($redirect_to, $request, $user ){
-    if($user-ID>0) {
+function new_login_redirect($redirect_to, $request, $user)
+{
+    if ($user - ID > 0) {
         $role = $user->roles[0];
         if ($role == 'administrator' || $role == 'editor') {
             return admin_url('admin.php?page=newHouseList');
         } else {
             return site_url();
         }
-    }else{
+    } else {
         return $redirect_to;
     }
 }
+
 ?>
\ No newline at end of file

wp-content/themes/tospur/js/gftools.js

+function loan_calc(bj, year, rate) {
+    //贷款总额
+    var loan_ceiling = bj * 10000;
+    //贷款期限
+    var loan_period = year * 12;
+    var number_of_month = loan_period;
+    //贷款利率
+    var loan_rate = rate / 100 / 12;
+    //公式需要
+    var _rate = Math.pow(1 + loan_rate, loan_period);
+    //等额本息月供
+    var acpi_monthly_payment = (loan_ceiling * loan_rate * _rate) / (_rate - 1);
+    var acpi_interest = loan_period * acpi_monthly_payment - loan_ceiling;
+    //等额本金计算
+    var em = loan_ceiling / loan_period;
+    var nbj = loan_ceiling;
+    var i = 0;
+    var ac_interest = 0;
+    var ac_monthly_payment = [];
+    for (; loan_period > 0; loan_period--) {
+        var interest = (loan_ceiling - i * em) * loan_rate;
+        ac_interest += interest;
+        ac_monthly_payment.push(em + interest);
+        i++;
+        nbj -= em;
+    }
+
+    return {
+        //等额本息
+        acpi: {
+            interest: acpi_interest,
+            monthlyPayment: acpi_monthly_payment
+        },
+        //等额本金
+        ac: {
+            interest: ac_interest,
+            monthlyPayment: ac_monthly_payment
+        },
+        loan_period: number_of_month,
+        loan_ceiling: bj
+    }
+}
+
+
+/*
+ 等额本息 Average Capital Plus Interest
+ 等额本金 average capital
+ 利息 interest
+ 还款总额：Total repayment
+ {ACPI:{interest, MonthlyPayment},
+ AC：[],
+ interest：
+ loan_period：月
+ totalPayment}*/

wp-content/themes/tospur/js/modernizr.custom.js

+/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
+ * Build: http://modernizr.com/download/#-cssanimations-csstransitions-touch-shiv-cssclasses-prefixed-teststyles-testprop-testallprops-prefixes-domprefixes-load
+ */
+;window.Modernizr=function(a,b,c){function z(a){j.cssText=a}function A(a,b){return z(m.join(a+";")+(b||""))}function B(a,b){return typeof a===b}function C(a,b){return!!~(""+a).indexOf(b)}function D(a,b){for(var d in a){var e=a[d];if(!C(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function E(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:B(f,"function")?f.bind(d||b):f}return!1}function F(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+o.join(d+" ")+d).split(" ");return B(b,"string")||B(b,"undefined")?D(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),E(e,b,c))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={},r={},s={},t=[],u=t.slice,v,w=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},x={}.hasOwnProperty,y;!B(x,"undefined")&&!B(x.call,"undefined")?y=function(a,b){return x.call(a,b)}:y=function(a,b){return b in a&&B(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=u.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(u.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(u.call(arguments)))};return e}),q.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:w(["@media (",m.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},q.cssanimations=function(){return F("animationName")},q.csstransitions=function(){return F("transition")};for(var G in q)y(q,G)&&(v=G.toLowerCase(),e[v]=q[G](),t.push((e[v]?"":"no-")+v));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)y(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},z(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.testProp=function(a){return D([a])},e.testAllProps=F,e.testStyles=w,e.prefixed=function(a,b,c){return b?F(a,b,c):F(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+t.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file

wp-content/themes/tospur/js/public.js

@@ -48,7 +48,7 @@ function ajaxSendCode(ajaxUrl, self, phone, validate) {
                     myModal.modal('show');
                     break;
                 case 2002:
-                    notice.html('<span>请输入有效的手机号</span>');
+                    notice.html('<span>此手机号码尚未注册</span>');
                     myModal.modal('show');
                     self.bind('click', {ajaxUrl: ajaxUrl, validate: validate}, clickSendCode);
                     break;
@@ -77,7 +77,7 @@ Date.prototype.Format = function (fmt) {
     return fmt;
 };
 
-function scrollPullToRefresh(cb){
+function scrollPullToRefresh(cb) {
     var pullUpFlag = false;
     var scroll = new IScroll('#wrapper', {
         scrollbars: true,
@@ -97,21 +97,21 @@ function scrollPullToRefresh(cb){
     return scroll;
 }
 
-function ajax_get_house(url, loading, ajax_data, context){
+function ajax_get_house(url, loading, ajax_data, context) {
     loading.show();
     $.ajax({
         type: 'POST',
         url: url + '/wp-admin/admin-ajax.php/',
         data: ajax_data,
-        success:function(data){
+        success: function (data) {
             loading.hide();
             if (data.code == 2000) {
                 $.each(data.result, function (index, value) {
-                    var houseType= value.house_type;
+                    var houseType = value.house_type;
                     var template = $('#template_' + houseType).html();
-                    if(data.tags)
+                    if (data.tags)
                         var data_tags = data.tags[value.id];
-                    if(data.images)
+                    if (data.images)
                         var data_images = data.images[value.id];
                     var div = $('<div class="row">');
                     div.append(template);
@@ -126,13 +126,17 @@ function ajax_get_house(url, loading, ajax_data, context){
                         div.find('[data-attr=community]').text(value.community_name);
                         div.find('[data-attr=apartment]').text(value.bp_literal);
                         div.find('[data-attr=covered_area]').text(value.covered_area + '平米');
-                        div.find('[data-attr=price]').html('<em>' + value.total_price + '万</em>');
+                        div.find('[data-attr=price]').html('<em>' + (value.total_price / 10000) + '万</em>');
                     } else if (houseType == 2) {
                         div.find('[data-attr=community]').text(value.community_name);
                         div.find('[data-attr=apartment]').text(value.bp_literal);
                         div.find('[data-attr=covered_area]').text(value.covered_area + '平米');
                         div.find('[data-attr=decoration]').text(value.decoration);
-                        div.find('[data-attr=price]').html('<em>' + value.rent + '</em>/月');
+                        var rent = value.rent;
+                        if (rent.length > 4) {
+                            rent = rent / 10000 + '万';
+                        }
+                        div.find('[data-attr=price]').html('<em>' + rent + '</em>/月');
                     }
                     var image = div.find('[data-attr=image]');
                     if (data_images) {
@@ -145,7 +149,7 @@ function ajax_get_house(url, loading, ajax_data, context){
                             }
                         });
                     }
-                    div.bind("tap",function(){
+                    div.bind("tap", function () {
                         window.location.href = url + '/?page=detail&hid=' + value.id;
                     });
                     context.append(div);

wp-content/themes/tospur/loan_calculator.php

+<?php
+
+$context = array();
+$context['theme'] = get_template_directory_uri();
+Timber::render('loan_calculator.html', $context);
+
+?>
\ No newline at end of file

wp-content/themes/tospur/login.php

@@ -33,9 +33,9 @@ if (is_user_logged_in()) {
             if (!is_wp_error($user)) {
                 wp_redirect($const_my_page);
             } else if ($user->get_error_code() == 'invalid_username') {
-                $context['error'] = '请输入有效的用户名';
+                $context['error'] = '此手机号码/帐号尚未注册';
             } else if ($user->get_error_code() == 'incorrect_password') {
-                $context['error'] = '您输入的密码无效';
+                $context['error'] = '您输入的密码有误';
             }
         }
     }

wp-content/themes/tospur/views/comment.html

@@ -13,10 +13,25 @@
     <script type="text/javascript" src="{{ theme }}/js/jquery.mobile.custom.min.js"></script>
     <script>
         $(document).ready(function () {
+            var notice = $('#notice');
+            var myModal = $('#myModal');
+            var textarea = $('#content');
             $('#submit').tap(function () {
-                var content = $('#content').val();
+                var content = textarea.val();
                 if (content.trim() == '') {
-                    alert('请输入反馈内容');
+                    notice.html('请输入反馈内容');
+                    myModal.modal('show');
+                } else {
+                    $.ajax({
+                        type: 'POST',
+                        url: '{{ url }}/wp-admin/admin-ajax.php/',
+                        data: 'action=submit_comment&user_id={{ user_id }}&content=' + content,
+                        success: function () {
+                            textarea.val('');
+                            notice.html('提交成功');
+                            myModal.modal('show');
+                        }
+                    });
                 }
             });
         });
@@ -31,5 +46,15 @@
     <button type="button" class="btn btn-lg" id="submit">提交</button>
 </div>
 
+<div class="modal fade" id="myModal">
+    <div class="modal-dialog">
+        <div class="modal-content text-center">
+            <h4>提示</h4>
+            <p id="notice"></p>
+            <button type="button" class="btn btn-lg btn-block" data-dismiss="modal">确认</button>
+        </div>
+    </div>
+</div>
+
 </body>
 </html>
\ No newline at end of file

wp-content/themes/tospur/views/consultant_info.html

@@ -33,7 +33,7 @@
             <p>同策房屋</p>
         </li>
         <li class="col-xs-3">
-            <a href="{{ consultant_score_url }}" class="btn btn-block">评分</a>
+            <a class="btn btn-block" data-toggle="modal" data-target="#scoreDiv">评分</a>
         </li>
     </ul>
     <h4>诚信宣言</h4>
@@ -141,7 +141,22 @@
         </li>
     </ul>
 </div>
-
+<div class="modal fade" id="scoreDiv">
+    <div class="modal-dialog">
+        <div class="modal-content text-center">
+            <h4 class="modal-title">评分</h4>
+            <p>
+                <input type="hidden" id="score" name="score" value="0">
+                <input type="hidden" name="user_id" value="{{ user_id }}">
+                <input type="hidden" name="consultant_id" value="{{ consultant_id }}">
+            </p>
+            <p>
+                <button id="add_score" type="button" class="btn btn-lg">评分</button>
+                <button type="button" class="btn btn-lg" data-dismiss="modal">取消</button>
+            </p>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 <script>
     var houseType = 0;
     var userId = '{{ consultant_id }}';
@@ -149,12 +164,49 @@
     var myScroll;
     var template;
     var loading;
+    var score = 0;
     $(document).ready(function () {
+        $('#score').rating({
+            min: 0,
+            max: 5,
+            step: 0.5,
+            size: 'sm',
+            showClear: false,
+            showCaption: false,
+            hoverEnabled: false,
+            starCaptions: function (data) {
+                console.log(data);
+                score = data;
+                $(this).val(score);
+            }
+        });
+        $("#add_score").bind("tap", function () {
+            if (score > 0) {
+                $.ajax({
+                    type: 'POST',
+                    url: '{{ url }}/wp-admin/admin-ajax.php/',
+                    data: 'action=add_score&user_id={{user_id}}&consultant_id={{consultant_id}}&score='+$("#score").val(),
+                    success: function (data) {
+                        if (data.code == 2000) {
+                            alert('评分成功');
+                        }else{
+                            alert('您已经提交过评分了');
+                        }
+                    },
+                    complete:function(){
+                        $("#scoreDiv").modal('toggle');
+                    }
+                });
+            } else {
+                alert('请选择后再评分');
+            }
+        });
         var searchData = {
-            action: 'get_my_house',
+            action: 'search_house',
+            cityId: {{ consultant.cityId }},
             houseType: houseType,
             userType: 1,
-            userId: userId,
+            userId: {{ consultant_id }},
             index: 0
         };
         var tabPane = $('[data-house=' + houseType + ']');

wp-content/themes/tospur/views/detail.html

@@ -16,6 +16,7 @@
     <script type="text/javascript" src="{{ theme }}/js/jquery.min.js"></script>
     <script type="text/javascript" src="{{ theme }}/js/jquery.mobile.custom.min.js"></script>
     <script type="text/javascript" src="{{ theme }}/js/star-rating.min.js"></script>
+    <script type="text/javascript" src="{{ theme }}/js/bootstrap.min.js"></script>
     <script type="text/javascript">
         var myScroll;
         var carouselScroll;
@@ -44,6 +45,12 @@
         $(document).ready(function(){
             $("#slider").bind("tap",function(){
                 $("#carousel_wrapper").parent().show();
+
+                var carousel = $("#carousel_wrapper");
+                var carouselWidth = carousel.width();
+                carousel.find("#carousel_scroller ul li").css({"width":carouselWidth});
+                carousel.find("#carousel_indicator li").removeClass("carousel_active");
+                carousel.find("#carousel_indicator li:first").addClass("carousel_active");
                 carouselScroll = new IScroll('#carousel_wrapper', {
                     bounce: false,
                     scrollX: true,
@@ -57,11 +64,6 @@
                     $("#carousel_indicator li").removeClass("carousel_active");
                     $("#carousel_indicator li").eq(this.currentPage.pageX).addClass("carousel_active");
                 });
-                var carousel = $("#carousel_wrapper");
-                var carouselWidth = carousel.width();
-                carousel.find("#carousel_scroller ul li").css({"width":carouselWidth});
-                carousel.find("#carousel_indicator li").removeClass("carousel_active");
-                carousel.find("#carousel_indicator li:first").addClass("carousel_active");
                 return false;
             });
             $("#carousel_wrapper").parent().bind("click",function(){
@@ -84,6 +86,10 @@
                 });
             });
 
+            $('#calculator').bind('tap',function(){
+                window.location.href = '{{ siteUrl }}/?page=loan_calculator';
+            });
+
             $(".map").bind("tap",function(){
                 location.href = "{{ siteUrl }}/?page=map&a={{result.address}}&c={{cityName}}&hn={{result.community_name}}<br>{{result.address}}&p={{result.location}}";
             });
@@ -93,7 +99,6 @@
 <body>
 
 <p class="collect">
-    <i class="iconfont">&#xe604;</i>
 </p>
 
 <!-- 图片滚动 -->
@@ -119,25 +124,19 @@
     <p class="detail_title">{{result.name}}</p>
     <ul class="list-unstyled">
         <li class="col-xs-7 price">
-            均价：<span><em>{{(result.average_price/10000)|round(2, 'floor')}}万</em>/m<em>2</em></span>
+            均价：<span>
+                    <em>
+                        {% if result.average_price>=10000 %}
+                            {{(result.average_price/10000)|round(2, 'floor')}}万
+                        {% else %}
+                            {{result.average_price}}元
+                        {% endif %}
+                    </em>/m<em>2</em></span>
         </li>
         <li class="col-xs-5">
-            <button type="button" class="btn btn-xs">房贷计算器</button>
+            <button type="button" class="btn btn-xs" id="calculator">房贷计算器</button>
         </li>
     </ul>
-
-    <!-- 二手房详细 -->
-    <!--     <ul class="list-unstyled">
-            <li class="col-xs-7">房源编号：CS0200000001</li>
-            <li class="col-xs-5">
-                <button type="button" class="btn btn-xs">房贷计算器</button>
-            </li>
-            <li class="col-xs-7 price">
-                均价：<span><em>20000元</em></span>
-            </li>
-            <li class="col-xs-5">单价：</li>
-        </ul>  -->
-    <!-- 二手房详细 -->
 </div>
 <div class="detail_row">
     <p class="detail_title">最新动态</p>
@@ -152,7 +151,7 @@
                     <li>
                         <p><img src="{{siteUrl}}{{ item.path }}"></p>
                         <p>{{item.type}}</p>
-                        <p>{{item.area}}平</p>
+                        <p>{{item.area}}/m<em>2</em></p>
                     </li>
                 {% endfor %}
             </ul>
@@ -167,12 +166,13 @@
         <li>周边配套：{{result.periphery}}</li>
     </ul>
     <p class="map">
-        <span></span>
     </p>
 </div>
 <div class="detail_row">
-    <a class="collapsed" data-toggle="collapse" href="#collapseExample"><p class="detail_title">基本信息<i class="iconfont pull-right"></i></p></a>
-    <ul class="list-unstyled collapse infoCont" id="collapseExample">
+    <a class="collapsed" data-toggle="collapse"  href="#collapseExample">
+        <p class="detail_title">基本信息<span class="pull-right"></span></p>
+    </a>
+    <ul class="list-unstyled infoCont collapse" id="collapseExample">
         <li>开发商：<span>{{result.developer}}</span></li>
         <li>建筑类型：{{result.periphery}}</li>
         <li>装修状况：{{result.decoration}}</li>

wp-content/themes/tospur/views/detailOther.html

@@ -89,6 +89,10 @@
                 location.href = "{{ siteUrl }}/?page=map&a={{result.address}}&c={{cityName}}&hn={{result.community_name}}<br>{{result.address}}&p={{result.location}}";
             });
 
+            $('#calculator').bind('tap',function(){
+                window.location.href = '{{ siteUrl }}/?page=loan_calculator';
+            });
+
             $(".col-xs-2").bind("tap",function(){
                 location.href = "{{siteUrl}}?page=consultant_info&consultant_id={{ consultant[0].id }}";
             });
@@ -135,18 +139,24 @@
     <ul class="list-unstyled">
         <li class="col-xs-7">房源编号：{{result.house_number}}</li>
         <li class="col-xs-5">
-            <button type="button" class="btn btn-xs">房贷计算器</button>
+            <button type="button" class="btn btn-xs" id="calculator">房贷计算器</button>
         </li>
         <li class="col-xs-7 price">
             售价：<span><em>{{(result.total_price/10000)|round(2, 'floor')}}万</em></span>
         </li>
-        <li class="col-xs-5">单价：{{(result.average_price/10000)|round(2, 'floor')}}万</li>
+        <li class="col-xs-5">单价：
+            {% if result.average_price>=10000 %}
+                {{(result.average_price/10000)|round(2, 'floor')}}万
+            {% else %}
+                {{result.average_price}}元
+            {% endif %}
+        </li>
     </ul>
     <!-- 二手房详细 -->
 </div>
 <div class="detail_row">
     <a class="collapsed" data-toggle="collapse" href="#collapseExample">
-        <p class="detail_title">基本信息<i class="iconfont pull-right"></i></p>
+        <p class="detail_title">基本信息<span class="pull-right"></span></p>
     </a>
     <ul class="list-unstyled collapse infoCont" id="collapseExample">
         <li>户型：{{result.covered_area}}</li>

wp-content/themes/tospur/views/index.html

@@ -23,14 +23,14 @@
         <div id="city_wrapper" class="dropdown-menu">
             <div id="city_scroller">
                 {% for item in select.city %}
-                    <a href="{{ url }}?cityId={{item.id}}">{{item.value}}</a>
+                    <a href="{{ url }}?houseType={{ houseType }}&cityId={{ item.id }}"{% if(item.id == cityId) %} class="active"{% endif %}>{{ item.value }}</a>
                 {% endfor %}
             </div>
         </div>
     </div>
     <div class="has-feedback pull-right">
-        <input type="text" class="form-control" placeholder="输入楼盘名/地段名搜索">
-        <span class="glyphicon glyphicon-search form-control-feedback"></span>
+        <input type="text" class="form-control" placeholder="输入楼盘名/地段名搜索" id="searchText">
+        <span class="glyphicon glyphicon-search form-control-feedback" id="searchBtn"></span>
     </div>
 </div>
 
@@ -58,7 +58,7 @@
         <a class="btn">价格<span></span></a>
         <div id="price_wrapper" class="dropdown-menu">
             {% if select.totalPrice %}
-            <div type="totalPrice"  id="totalPrice_scroller">
+            <div type="totalPrice" id="totalPrice_scroller">
                 <a href="#">不限</a>
                 {% for item in select.totalPrice %}
                     <a data-id="{{item.value}}">{{item.value}}</a>
@@ -66,7 +66,7 @@
             </div>
             {% endif %}
             {% if select.rentalPrice %}
-            <div type="rentalPrice"  id="rentalPrice_scroller">
+            <div type="rentalPrice" id="rentalPrice_scroller">
                 <a href="#">不限</a>
                 {% for item in select.rentalPrice %}
                     <a data-id="{{item.value}}">{{item.value}}</a>
@@ -310,12 +310,20 @@
                 searchData[$(this).parent().attr("type")] = $(this).attr("data-id")!=undefined?$(this).attr("data-id"):-1;
                 if($(this).attr("data-action") != "open"){
                     //do somthing
+                    $(this).parent().find('a').removeClass('active');
+                    $(this).addClass('active');
                     $(".btn-group").removeClass("open");
                     scroller.html('');
                     ajax_get_house('{{ url }}', loading, searchData, scroller);
                 }
             }
         });
+        $('#searchBtn').bind('tap',function(){
+            searchData.index = 0;
+            searchData.searchText = $('#searchText').val();
+            scroller.html('');
+            ajax_get_house('{{ url }}', loading, searchData, scroller);
+        });
         ajax_get_house('{{ url }}', loading, searchData, scroller);
     });
     var searchData = {

wp-content/themes/tospur/views/myHouse.html

@@ -112,7 +112,7 @@
     var loading;
     $(document).ready(function () {
         var searchData = {
-            action: 'get_my_house',
+            action: 'search_house',
             houseType: houseType,
             userType: 0,
             userId: userId,