Merge branch 'dev' into shz

Conflicts:
	.htaccess
	wp-content/plugins/tospur/Admin/House.php
	wp-content/plugins/tospur/Admin/feature.php
	wp-content/plugins/tospur/Admin/newHouseList.php
	wp-content/plugins/tospur/Admin/rentHouse.php
	wp-content/plugins/tospur/Admin/rentHouseList.php
	wp-content/plugins/tospur/Admin/secHandHouse.php
	wp-content/plugins/tospur/Admin/secHandHouseList.php
	wp-content/plugins/tospur/Admin/views/add_feature.html
	wp-content/plugins/tospur/Admin/views/feature_list.html
	wp-content/plugins/tospur/Admin/views/newHouseList.html
	wp-content/plugins/tospur/Admin/views/newhouse.html
	wp-content/plugins/tospur/Admin/views/rentHouse.html
	wp-content/plugins/tospur/Admin/views/rentHouseList.html
	wp-content/plugins/tospur/Admin/views/secHandHouse.html
	wp-content/plugins/tospur/Admin/views/secHandHouseList.html
	wp-content/plugins/tospur/Dao/InsertDao.php
	wp-content/plugins/tospur/Dao/SearchDao.php
	wp-content/plugins/tospur/Tools/Core.php
	wp-content/plugins/tospur/Tools/Image.php
	wp-content/plugins/tospur/consultant_score.php
	wp-content/plugins/tospur/handle_view_house.php
	wp-content/plugins/tospur/index.php
	wp-content/plugins/tospur/view_house.php
	wp-content/themes/tospur/const.php
	wp-content/themes/tospur/consultant_info.php
	wp-content/themes/tospur/consultant_list.php
	wp-content/themes/tospur/css/consultantShop.css
	wp-content/themes/tospur/css/detail.css
	wp-content/themes/tospur/dao.php
	wp-content/themes/tospur/detail.php
	wp-content/themes/tospur/functions.php
	wp-content/themes/tospur/img/formBg.jpg
	wp-content/themes/tospur/img/logo.png
	wp-content/themes/tospur/js/gftools.js
	wp-content/themes/tospur/list.php
	wp-content/themes/tospur/loan_calculator.php
	wp-content/themes/tospur/map.php
	wp-content/themes/tospur/my.php
	wp-content/themes/tospur/view.php
	wp-content/themes/tospur/views/comment.html
	wp-content/themes/tospur/views/consultant_info.html
	wp-content/themes/tospur/views/consultant_list.html
	wp-content/themes/tospur/views/detail.html
	wp-content/themes/tospur/views/detailOther.html
	wp-content/themes/tospur/views/list.html
	wp-content/themes/tospur/views/loan_calculator.html
	wp-content/themes/tospur/views/map.html
	wp-content/themes/tospur/views/myHouse.html
	wp-content/themes/tospur/views/register.html
	wp-content/themes/tospur/views/view.html

.htaccess

 
 # BEGIN WordPress
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /tospur/
+RewriteRule ^index\.php$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /tospur/index.php [L]
+</IfModule>
 
 # END WordPress

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

@@ -3,7 +3,8 @@ require_once(PLUGIN_DIR . 'Dao/SearchDao.php');
 require_once(PLUGIN_DIR . 'Dao/InsertDao.php');
 require_once(PLUGIN_DIR . 'Tools/Image.php');
 require_once(PLUGIN_DIR . 'Tools/Core.php');
-class House {
+require_once(PLUGIN_DIR . 'Admin/Tospur_House.php');
+class House extends Tospur_House{
     public static function init_view(){
         wp_enqueue_script('jquery-ui');
         wp_enqueue_script('bootstrapjs');
@@ -47,7 +48,7 @@ class House {
                 $result = House::data_update($_POST['houseId'],$insert_tospur_house_array);
                 if($result != 203){
                     $wpdb->query("ROLLBACK");
-                    print_r($wpdb->last_error);;
+                    print_r($result);
                     echo "新房房源修改失败";
                 }else{
                     $wpdb->query("COMMIT");
@@ -55,9 +56,10 @@ class House {
                 }
             }else{
                 $result = House::data_insert($insert_tospur_house_array);
+                print_r($result);
                 if($result != 200){
                     $wpdb->query("ROLLBACK");
-                    print_r($wpdb->last_error);;
+                    print_r($result);;
                     echo "新增房源失败";
                 }else{
                     $wpdb->query("COMMIT");
@@ -166,11 +168,4 @@ class House {
         return 200;
     }
 
-    public static function getCurrentRole(){
-        $current_user = wp_get_current_user();
-        if ( !($current_user instanceof WP_User) )
-            return;
-        $roles = $current_user->roles;
-        return $roles[0];
-    }
 } 
\ No newline at end of file

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

+<?php
+class Tospur_House{
+    public static function getCurrentRole(){
+        $current_user = wp_get_current_user();
+        if ( !($current_user instanceof WP_User) )
+            return;
+        $roles = $current_user->roles;
+        return $roles[0];
+    }
+}
\ No newline at end of file

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

@@ -260,24 +260,27 @@ add_action( 'wp_ajax_nopriv_updateList', 'newHouseList::prepare_items');
 add_action( 'wp_ajax_searchListCity', 'SearchDao::ajax_searchListCity');
 add_action( 'wp_ajax_nopriv_searchListCity', 'SearchDao::ajax_searchListCity');
 
-function newHouseList()
+function function_newHouseList()
 {
     $contest = array();
     $contest['page'] = $_REQUEST['page'];
+    $contest['city'] = SearchDao::searchCity();
+    $contest['status'] = SearchDao::searchStatusType(1);
+    $contest['buildProperty'] = SearchDao::searchBuildProperty();
+    $contest['room'] = searchDao::searchRoom();
     if(isset($_POST['hasSearch'])){
-        $bpRes = SearchDao::searchBuildProperty();
-        foreach($bpRes as $val){
-            if($val->id == $_POST['buildProperty']){
-                $contest['buildProperty'] = $val->value;
-                $contest['buildPropertyId'] = $val->id;
-            }
-        }
-        $contest['options']= SearchDao::searchForCDP($_POST['listCity'],$_POST['listDistrict'],$_POST['listPlate']);
+        $contest['district'] = SearchDao::searchCity($_POST['listCity']);
+        $contest['plate'] = SearchDao::searchCity($_POST['listCity'],$_POST['listDistrict']);
+        $contest['dicTotalPrice'] = searchDao::searchTotalPrice($_POST['listCity']);
+        $contest['dicArea'] = searchDao::searchArea($_POST['listCity']);
+        $contest['cityId'] = $_POST['listCity'];
+        $contest['districtId'] = $_POST['listDistrict'];
+        $contest['plateId' ]= $_POST['listPlate'];
+        $contest['roomId']= $_POST['room'];
+        $contest['buildPropertyId']= $_POST['buildProperty'];
         $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['acreage'] = $_POST['acreage'];
-        $contest['characteristic'] = $_POST['characteristic'];
-        $contest['status'] = SearchDao::searchStatus(1,$_POST['status']);
-        $contest['hasSearch'] = $_POST['hasSearch'];
+        $contest['statusId']  =  $_POST['status'];
     }
     Timber::render("newHouseList.html",$contest);
 }

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

@@ -2,7 +2,7 @@
 require_once(PLUGIN_DIR . 'Dao/SearchDao.php');
 require_once(PLUGIN_DIR . 'Dao/InsertDao.php');
 require_once(PLUGIN_DIR . 'Tools/Image.php');
-class RentHouse{
+class RentHouse extends Tospur_House{
     //二手房信息
     public static function rentHouse_html(){
         wp_enqueue_script('bootstrapjs');
@@ -44,7 +44,7 @@ class RentHouse{
                 $result = RentHouse::data_update($_POST['houseId'],$insert_tospur_house_array);
                 if($result != 202){
                     $wpdb->query("ROLLBACK");
-                    print_r($wpdb->last_error);;
+                    print_r($result);;
                     echo "租房房源修改失败";
                 }else{
                     $wpdb->query("COMMIT");
@@ -55,7 +55,7 @@ class RentHouse{
                 $result = RentHouse::rentHouseData_insert($insert_tospur_house_array);
                 if ($result != 200) {
                     $wpdb->query("ROLLBACK");
-                    print_r($wpdb->last_error);;
+                    print_r($result);;
                     echo "租房房源新增失败";
                 } else {
                     $wpdb->query("COMMIT");
@@ -139,12 +139,5 @@ class RentHouse{
         InsertDao::addHouseTag($_POST['mark'],$houseId);
         return $result;
     }
-    public static function getCurrentRole(){
-        $current_user = wp_get_current_user();
-        if ( !($current_user instanceof WP_User) )
-            return;
-        $roles = $current_user->roles;
-        return $roles[0];
-    }
 }
 

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

@@ -31,18 +31,10 @@ class rentHouseList extends WP_List_Table
             case 'decoration':
             case 'age':
             case 'matching_facilities':
-            case 'flat':
-            case 'suite':
             case 'user_id':
             case 'status':
-                    $handle = $item['name'];
-                    if ($handle == 0) {
-                        return '<a href="' . admin_url() . 'admin.php?page=rentHouse&edit=true&id=' . $item['id'] . '">' . $item[$column_name] . '</a>';
-                    } else {
-                        return $item[$column_name];
-                    }
             default:
-                return print_r($item, true); //Show the whole array for troubleshooting purposes
+                return '<a href="' . admin_url() . 'admin.php?page=rentHouse&edit=true&id=' . $item['id'] . '">' . $item[$column_name] . '</a>';
         }
     }
 
@@ -75,8 +67,6 @@ class rentHouseList extends WP_List_Table
         $columns['decoration']= '装修状况';
         $columns['age']= '年代';
         $columns['matching_facilities']= '配套设施';
-        $columns['flat']= '楼号';
-        $columns['suite']= '室';
         $columns['user_id']= '置业顾问';
         $columns['status']= '状态';
         return $columns;
@@ -96,8 +86,6 @@ class rentHouseList extends WP_List_Table
             'decoration' => array('decoration', false),
             'age' => array('age', false),
             'matching_facilities' => array('matching_facilities', false),
-            'flat' => array('flat', false),
-            'suite' => array('suite', false),
             'user_id' => array('user_id', false),
             'status' => array('status', false)
         );
@@ -198,10 +186,10 @@ class rentHouseList extends WP_List_Table
         );
 
         $sql = "select * from tospur_house th
-                 left join(select user_id as aus_id,house_id from a_house_user)  ahu on th.id = ahu.house_id
+                 left join(select user_id as aus_id,house_id,user_type from a_house_user)  ahu on th.id = ahu.house_id
                  left join(select id as consul_id,name as consul_name 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
-                 where 1=1 and house_type=2";
+                 where 1=1 and house_type=2 and ahu.user_type=1";
         if($_POST["listCity"]!=0  ){
             $sql = $sql." and city_id=".$_POST["listCity"];
         }
@@ -240,8 +228,6 @@ class rentHouseList extends WP_List_Table
                 'decoration' =>  $value->decoration,
                 'age' => $value->age,
                 'matching_facilities'=> $value->matching_facilities,
-                'flat' =>  $value->flat,
-                'suite' =>  $value->suite,
                 'user_id' =>  $value->consul_name,
             );
 
@@ -290,25 +276,25 @@ add_action( 'wp_ajax_nopriv_updateList', 'newHouseList::prepare_items');
 add_action( 'wp_ajax_searchListCity', 'SearchDao::ajax_searchListCity');
 add_action( 'wp_ajax_nopriv_searchListCity', 'SearchDao::ajax_searchListCity');
 
-function rentHouseList()
+function function_rentHouseList()
 {
     $contest = array();
     $contest['page'] = $_REQUEST['page'];
+    $contest['city'] = SearchDao::searchCity();
+    $contest['status'] = SearchDao::searchStatusType(2);
+    $contest['buildProperty'] = SearchDao::searchBuildProperty();
     if(isset($_POST['hasSearch'])){
-        $bpRes = SearchDao::searchBuildProperty();
-        foreach($bpRes as $val){
-            if($val->id == $_POST['buildProperty']){
-                $contest['buildProperty'] = $val->value;
-                $contest['buildPropertyId'] = $val->id;
-            }
-        }
-        $contest['options']= SearchDao::searchForCDP($_POST['listCity'],$_POST['listDistrict'],$_POST['listPlate']);
+        $contest['district'] = SearchDao::searchCity($_POST['listCity']);
+        $contest['plate'] = SearchDao::searchCity($_POST['listCity'],$_POST['listDistrict']);
+        $contest['dicTotalPrice'] = searchDao::searchTotalPrice($_POST['listCity']);
+        $contest['dicArea'] = searchDao::searchArea($_POST['listCity']);
+        $contest['cityId'] = $_POST['listCity'];
+        $contest['districtId'] = $_POST['listDistrict'];
+        $contest['plateId' ]= $_POST['listPlate'];
+        $contest['buildPropertyId']= $_POST['buildProperty'];
         $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['acreage'] = $_POST['acreage'];
-        $contest['characteristic'] = $_POST['characteristic'];
-        $contest['status'] = SearchDao::searchStatus(2,$_POST['status']);
-        $contest['hasSearch'] = $_POST['hasSearch'];
-
+        $contest['statusId']  =  $_POST['status'];
     }
     Timber::render("rentHouseList.html",$contest);
 }

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

@@ -2,7 +2,7 @@
 require_once(PLUGIN_DIR . 'Dao/SearchDao.php');
 require_once(PLUGIN_DIR . 'Dao/InsertDao.php');
 require_once(PLUGIN_DIR . 'Tools/Image.php');
-class SecHandHouse{
+class SecHandHouse extends Tospur_House{
     //二手房信息
     public static function secHandHouse_html(){
         wp_enqueue_script('bootstrapjs');
@@ -43,7 +43,7 @@ class SecHandHouse{
                 $result = SecHandHouse::data_update($_POST['houseId'],$insert_tospur_house_array);
                 if($result != 201){
                     $wpdb->query("ROLLBACK");
-                    print_r($wpdb->last_error);;
+                    print_r( $result);;
                     echo "二手房房源修改失败";
                 }else{
                     $wpdb->query("COMMIT");
@@ -54,7 +54,7 @@ class SecHandHouse{
                 $result = SecHandHouse::secHouseData_insert($insert_tospur_house_array);
                 if ($result != 200) {
                     $wpdb->query("ROLLBACK");
-                    print_r($wpdb->last_error);;
+                    print_r( $result);;
                     echo "二手房房源新增失败";
                 } else {
                     $wpdb->query("COMMIT");
@@ -68,6 +68,7 @@ class SecHandHouse{
             $context["district"] = SearchDao::searchCity($context['result']->city_id);
             $context["plate"] = SearchDao::searchCity($context['result']->city_id,$context['result']->district_id);
             $context["mark"] = SearchDao::searchHouseTag($_GET['id']);
+	        $context["featureOld"] = SearchDao::searchFeatureByHouse($_GET['id']);
         }
         $context['role'] = SecHandHouse::getCurrentRole();
         $context["city"] = SearchDao::searchCity();
@@ -75,6 +76,7 @@ class SecHandHouse{
         $context["room"] = SearchDao::searchRoom();
         $context["photoType"] = SearchDao::searchPhotoType();
         $context["status"] = searchDao::searchStatusType(2);
+        $context["feature"] = searchDao::searchFeature();
         Timber::render("secHandHouse.html",$context);
 
     }
@@ -98,7 +100,12 @@ class SecHandHouse{
 
             InsertDao::addRecConsultant($houseId,$data);
 
+            if(isset($_POST['mark'])&&$_POST['mark']!=""){
                 InsertDao::addHouseTag($_POST['mark'],$houseId);
+            }
+
+            InsertDao::addHouseFeature($houseId,$data);
+
 
         }else{
             return 507;
@@ -137,16 +144,20 @@ class SecHandHouse{
         $wpdb->delete(Config::A_HOUSE_USER_TABLE,array("house_id" => $houseId));
         InsertDao::addRecConsultant($houseId,$data);
 
+//        $wpdb->delete(Config::A_HOUSE_TAG_TABLE,array("house_id" => $houseId));
+        $wpdb->query(
+            $wpdb->prepare(
+                "DELETE FROM a_house_tag
+                WHERE tag_id in(select tag_id from (select tag_id,tt.type from a_house_tag as aht
+                left JOIN tospur_tag tt on aht.tag_id = tt.id) as a
+                where house_id = %d and a.type = 1);", $houseId)
+        );
+        InsertDao::addHouseFeature($houseId,$data);
+
+        if(isset($_POST['mark'])&&$_POST['mark']!="") {
         InsertDao::addHouseTag($_POST['mark'],$houseId);
-        return $result;
         }
-
-    public static function getCurrentRole(){
-        $current_user = wp_get_current_user();
-        if ( !($current_user instanceof WP_User) )
-            return;
-        $roles = $current_user->roles;
-        return $roles[0];
+        return $result;
     }
 
 }

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

@@ -23,14 +23,13 @@ class secHandHouseList extends WP_List_Table
             case 'name':
             case 'community_name':
             case 'total_price':
+            case 'average_price':
             case 'buildproperty_id':
             case 'covered_area':
             case 'floor':
             case 'faceto':
             case 'decoration':
             case 'age':
-            case 'flat':
-            case 'suite':
             case 'user_id':
             case 'status':
             default:
@@ -60,14 +59,13 @@ class secHandHouseList extends WP_List_Table
         $columns['name']= '二手房标题';
         $columns['community_name']= '小区名称';
         $columns['total_price']= '总价';
+        $columns['average_price']='单价';
         $columns['buildproperty_id']= '户型';
         $columns['covered_area']= '面积';
         $columns['floor']= '楼层';
         $columns['faceto']= '朝向';
         $columns['decoration']= '装修状况';
         $columns['age']= '年代';
-        $columns['flat']= '楼号';
-        $columns['suite']= '室';
         $columns['user_id']= '置业顾问';
         $columns['status']= '状态';
         return $columns;
@@ -80,14 +78,13 @@ class secHandHouseList extends WP_List_Table
             'name' => array('name', false),
             'community_name' => array('community_name', false),
             'total_price' => array('total_price', false),
+            'average_price' => array('average_price', false),
             'buildproperty_id' => array('buildproperty_id', false),
             'covered_area' => array('covered_area', false),
             'floor' => array('floor', false),
             'faceto' => array('faceto', false),
             'decoration' => array('decoration', false),
             'age' => array('age', false),
-            'flat' => array('flat', false),
-            'suite' => array('suite', false),
             'user_id' => array('user_id', false),
             'status' => array('status', false)
         );
@@ -159,7 +156,6 @@ class secHandHouseList extends WP_List_Table
                     break;
             }
             global $wpdb;
-            print_r('update tospur_house SET status='.$status .' where id in ' . $string);
             $result = $wpdb->query('update tospur_house SET status='.$status .' where id in ' . $string);
         }
     }
@@ -181,10 +177,10 @@ class secHandHouseList extends WP_List_Table
         //$data = $this->example_data;
 
         $sql = "select * from tospur_house th
-                 left join(select user_id as aus_id,house_id from a_house_user)  ahu on th.id = ahu.house_id
+                 left join(select user_id as aus_id,house_id,user_type from a_house_user)  ahu on th.id = ahu.house_id
                  left join(select id as consul_id,name as consul_name 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
-                 where 1=1 and house_type=1";
+                 where 1=1 and house_type=1 and ahu.user_type=1";
         if($_POST["listCity"]!=0  ){
             $sql = $sql." and city_id=".$_POST["listCity"];
         }
@@ -220,14 +216,13 @@ class secHandHouseList extends WP_List_Table
                 'name' =>  $value->name,
                 'community_name' =>  $value->community_name,
                 'total_price' =>  $value->total_price,
+                'average_price'=> $value->average_price,
                 'buildproperty_id' =>  $value->literal,
                 'covered_area' => $value->covered_area,
                 'floor' =>  $value->floor,
                 'faceto' =>  $value->faceto,
                 'decoration' =>  $value->decoration,
                 'age' => $value->age,
-                'flat' =>  $value->flat,
-                'suite' =>  $value->suite,
                 'user_id' =>  $value->consul_name,
             );
             if($value->status == 0){
@@ -273,25 +268,25 @@ class secHandHouseList extends WP_List_Table
 add_action( 'wp_ajax_updateList', 'newHouseList::prepare_items');
 add_action( 'wp_ajax_nopriv_updateList', 'newHouseList::prepare_items');
 
-function secHandHouseList()
+function function_secHandHouseList()
 {
     $contest = array();
     $contest['page'] = $_REQUEST['page'];
+    $contest['city'] = SearchDao::searchCity();
+    $contest['status'] = SearchDao::searchStatusType(2);
+    $contest['buildProperty'] = SearchDao::searchBuildProperty();
     if(isset($_POST['hasSearch'])){
-        $bpRes = SearchDao::searchBuildProperty();
-        foreach($bpRes as $val){
-            if($val->id == $_POST['buildProperty']){
-                $contest['buildProperty'] = $val->value;
-                $contest['buildPropertyId'] = $val->id;
-            }
-        }
-        $contest['options']= SearchDao::searchForCDP($_POST['listCity'],$_POST['listDistrict'],$_POST['listPlate']);
+        $contest['district'] = SearchDao::searchCity($_POST['listCity']);
+        $contest['plate'] = SearchDao::searchCity($_POST['listCity'],$_POST['listDistrict']);
+        $contest['dicTotalPrice'] = searchDao::searchTotalPrice($_POST['listCity']);
+        $contest['dicArea'] = searchDao::searchArea($_POST['listCity']);
+        $contest['cityId'] = $_POST['listCity'];
+        $contest['districtId'] = $_POST['listDistrict'];
+        $contest['plateId' ]= $_POST['listPlate'];
+        $contest['buildPropertyId']= $_POST['buildProperty'];
         $contest['totalPrice'] = $_POST['totalPrice'];
         $contest['acreage'] = $_POST['acreage'];
-        $contest['totalPrice'] = $_POST['totalPrice'];
-        $contest['characteristic'] = $_POST['characteristic'];
-        $contest['status'] = SearchDao::searchStatus(2,$_POST['status']);
-        $contest['hasSearch'] = $_POST['hasSearch'];
+        $contest['statusId']  =  $_POST['status'];
     }
     Timber::render("secHandHouseList.html",$contest);
 }

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

+<h2>添加特色</h2>
+<label for="feature">特色：</label>
+<input id="feature" type="text">
+<input type="submit" id="submit" class="button">
+<script>
+    (function ($) {
+        $(document).ready(function () {
+            $('#submit').click(function () {
+                var name = $('#feature').val();
+                if (name.trim() != '') {
+                    $.ajax({
+                        type: 'POST',
+                        url: '{{ url }}/wp-admin/admin-ajax.php/',
+                        data: 'action=add_feature&name=' + name,
+                        success: function (data) {
+                            if (data) {
+                                alert('添加成功');
+                            } else {
+                                alert('添加失败');
+                            }
+                        }
+                    });
+                } else {
+                    alert('请输入特色');
+                }
+            });
+        });
+    })(jQuery);
+</script>
\ No newline at end of file

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

@@ -3,62 +3,64 @@
     <form id="scores-filter" method="POST">
         <!-- For plugins, we also need to ensure that the form posts back to our current page -->
         <input type="hidden" name="page" value="{{page}}"/>
-        <input type="hidden" name="hasSearch" value="1"/>
         <select id="listCity" name="listCity">
-            {% if hasSearch and options.cityName %}
-            <option value="{{options.cityId}}"> {{options.cityName}}</option>
-            {% else %}
             <option value="0"> 城市</option>
-            {% endif %}
+            {% for item in city %}
+            <option {{ item.id == cityId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <select id="listDistrict" name="listDistrict">
-            {% if hasSearch and options.districtName %}
-            <option value="{{options.districtId}}"> {{options.districtName}}</option>
-            {% else %}
             <option value="0">区域</option>
+            {% if district %}
+                {% for item in district %}
+                    <option {{ item.id == districtId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                {% endfor %}
             {% endif %}
         </select>
         <select  id="listPlate" name="listPlate">
-            {% if hasSearch and options.districtName and options.plateName %}
-            <option value="{{options.plateId}}">{{options.plateName}}</option>
-            {% else %}
             <option value="0">板块</option>
+            {% if plate %}
+                {% for item in plate %}
+                    <option {{ item.id == plateId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                {% endfor %}
             {% endif %}
         </select>
         <select id="totalPrice" name="totalPrice">
-            {% if hasSearch and totalPrice %}
-            <option value="{{totalPrice}}"> {{totalPrice}}</option>
-            {% else %}
             <option value ="">价格</option>
+            {% if dicTotalPrice %}
+                {% for item in dicTotalPrice %}
+                    <option {{ item.value == totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                {% endfor %}
             {% endif %}
         </select>
+        <select id="room" name="room">
+            <option value="0">类型</option>
+            {% for item in room %}
+            <option {{ item.id == roomId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
+        </select>
         <select id="buildProperty" name="buildProperty">
-            {% if hasSearch and buildProperty %}
-            <option value="{{buildPropertyId}}"> {{buildProperty}}</option>
-            {% else %}
             <option value="0"> 房型</option>
-            {% endif %}
+            {% for item in buildProperty %}
+            <option {{ item.id == buildPropertyId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <select id="acreage" name="acreage">
-            {% if hasSearch and acreage %}
-            <option value="{{acreage}}"> {{acreage}}</option>
-            {% else %}
             <option value ="">面积</option>
+            {% if acreage %}
+                {% for item in dicArea %}
+                    <option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                {% endfor %}
             {% 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>
+            {% for item in status%}
+            <option {{ item.id == statusId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <input type="text" placeholder="请出入楼盘名" name="searchText">
+        <input type="hidden" name="hasSearch" value="1"/>
         <input type="submit" id="submit" class="button action" value="搜索">
         <!-- Now we can render the completed list table -->
         {{function("addNewHouseTable")}}
@@ -67,38 +69,6 @@
 <script>
     (function ($) {
         $(document).ready(function(){
-            //获取城市信息AJAX
-            var listCity = $("#listCity");
-            var room = $("#room");
-            var buildProperty =$("#buildProperty");
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=serachCity",
-                success:function(data){
-                    addOption(data,listCity)
-                }
-            })
-            //获取类型信息AJAX
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=searchRoom",
-                success:function(data){
-                    addOption(data,room)
-                }
-            })
-            //获取房型信息AJAX
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=searchBuildProperty",
-                success:function(data){
-                    addOption(data,buildProperty)
-                }
-            })
-
-
             $("#listCity").change(function(){
                 var listCityId = $("#listCity").val();
                 var district =$("#listDistrict");
@@ -106,6 +76,8 @@
                 var totalPrice = $("#totalPrice");
                 $('#listDistrict').find('option:not(:first-child)').remove();
                 $('#listPlate').find('option:not(:first-child)').remove();
+                $('#acreage').find('option:not(:first-child)').remove();
+                $('#totalPrice').find('option:not(:first-child)').remove();
                 $.ajax({
                     type: "GET",
                     url: "/tospur/wp-admin/admin-ajax.php",
@@ -132,7 +104,7 @@
                 $.ajax({
                     type: "GET",
                     url: "/tospur/wp-admin/admin-ajax.php",
-                    data: "action=searchUnitPriceRange&cityId="+listCityId,
+                    data: "action=searchTotalPrice&cityId="+listCityId,
                     success:function(json){
                         for(var i = 0; i <=json.length-1; i++){
                             var id = json[i]["id"];

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

@@ -34,13 +34,13 @@
                 <th><label for="from">所属地区</label></th>
                 <td>
                     <select id="baseCity" name="baseCity">
-                        <option value=""> 城市</option>
+                        <option value="-1"> 城市</option>
                         {% for item in city %}
                             <option {{ item.id == result.city_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
                         {% endfor %}
                     </select>
                     <select id="baseAreaId" name="baseAreaId">
-                        <option value = "">区域</option>
+                        <option value = "-1">区域</option>
                         {% if district %}
                             {% for item in district %}
                                 <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
@@ -48,7 +48,7 @@
                         {% endif %}
                     </select>
                     <select id="basePlateId" name="basePlateId">
-                        <option value = "">板块</option>
+                        <option value = "-1">板块</option>
                         {% if district %}
                             {% for item in plate %}
                                 <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
@@ -184,6 +184,7 @@
                         {% endif %}
                         {% set exists_photo_ids = exists_photo_ids~item.image_id %}
                         <p>
+                            <input type="radio" name="frontCover" value="{{item.image_id}}" {{ result.frontCover_id == item.image_id?"checked":"" }} />
                             <select name="exists_photo[{{ item.image_id }}][type]">
                                 {% for i in photoType %}
                                 <option {{ i.id == item.image_type?"selected":"" }} value="{{ i.id }}">{{ i.value }}</option>
@@ -240,7 +241,7 @@
                 <td>
                     <select id="status" name="status">
                         {% for item in status %}
-                        <option value={{item.status_id}}>{{item.status_name}}</option>
+                        <option value={{item.id}}>{{item.value}}</option>
                         {% endfor %}
                     </select>
                 </td>
@@ -385,6 +386,7 @@
                 var cityName = $("#baseCity").find("option:selected").text();
                 var option = $("<option>").attr("value",cityId).append(cityName);
                 $("#cityId").append(option);
+                if(cityId != -1){
                     var area = $("#areaId");
                     $.ajax({
                         type: "GET",
@@ -413,23 +415,8 @@
                             addOption(json,price);
                         }
                     });
-
-                $.ajax({
-                    type: "post",
-                    url: "/tospur/wp-admin/admin-ajax.php",
-                    data: "action=searchHouse&cityId="+cityId+"&houseType=0",
-                    success:function(json){
-                        var result = json.result;
-                        for(var i = 0; i <result.length; i++){
-                            var name = result[i]["name"];
-                            var id = result[i]['id'];
-                            var imgUrl = json.images[id];
-                            var img = $("<img>").attr({"src":imgUrl,"height":100,"width":100});
-                            var li = $("<li>").attr("id",id).addClass("addImg").append(img).append(name);
-                            $("#houseList").append(li);
+                    addList(0);
                 }
-                    }
-                });
             });
 
             //区域联动板块
@@ -451,30 +438,7 @@
 
             //推荐房源下显示图片信息以及房名
             $("#areaId,#plateId,#buildProperty,#room,#acreage,#price").change(function(){
-                $("#houseList").find("li").remove();
-                var buildPropertyId = $("#buildProperty").val();
-                var room = $("#room").val();
-                var areaId = $("#areaId").val();
-                var cityId = $("#cityId").val();
-                var plateId = $("#plateId").val();
-                var acreage = $("#acreage").val();
-                var price = $("#price").val();
-                $.ajax({
-                        type: "post",
-                        url: "/tospur/wp-admin/admin-ajax.php",
-                        data: "action=searchHouse&cityId="+cityId+"&districtId="+areaId+"&plateId="+plateId+"&buildPropertyId="+buildPropertyId+"&roomId="+room+"&acreage="+acreage+"&totalPrice="+price+"&houseType=0",
-                        success:function(json){
-                            var result = json.result;
-                        for(var i = 0; i <result.length; i++){
-                            var name = result[i]["name"];
-                            var id = result[i]['id'];
-                            var imgUrl = json.images[id];
-                            var img = $("<img>").attr({"src":imgUrl,"height":100,"width":100});
-                            var li = $("<li>").attr("id",id).addClass("addImg").append(img).append(name);
-                            $("#houseList").append(li);
-                        }
-                    }
-                });
+                addList(0);
             });
 
             //添加房源中搜索框的搜索
@@ -567,13 +531,14 @@
 
             //新增房源相册
             $("#housePicture").click(function(){
-                var picDelet = $("<font>").append("删除").addClass("picDelet");
+                var checkBox = $("<input>").attr({"type":"radio","name":"frontCover","value":i});
+                var picDelet = $("<input>").attr({"type":"button","value":"删除"}).addClass("picDelet");
                 var file = $("<input>").attr({"type":"file","name":"files["+i+"]"}).addClass("picFiles");
                 var select = $("<select>").attr("name","data["+i+"][type]");
                 {% for item in photoType %}
                     select.append($("<option>").attr("value",{{item.id}}).append('{{item.value}}'));
                 {% endfor%}
-                var p = $("<p>").append(select).append(file).append(picDelet);
+                var p = $("<p>").append(checkBox).append(select).append(file).append(picDelet);
                 $("#picList").append(p);
                 i++
             });
@@ -588,7 +553,9 @@
             $("#houseImg,#consultantImg,#picList").on("click",".imgCancel,.consultantCancel,.picDelet",function(){
                 $(this).parent("p").remove();
             });
-
+            $("#preview,#picList,#houseImg,#consultantImg").on("click",".existsCancel",function(){
+                $(this).parent().remove();
+            });
 
             $("#submit").click(function(){
                 if($("#housename").val()==""){
@@ -651,9 +618,54 @@
                }
             }
 
-            $("#preview,#picList,#houseImg,#consultantImg").on("click",".existsCancel",function(){
-                $(this).parent().remove();
+
+
+            function getUrlParmas(){
+                var href = location.search.substr(1,location.search.length-1);
+                var params = href.split("&");
+                var map = {};
+                for(item in params){
+                    var key = params[item].split("=")[0] || "";
+                    var value = params[item].split("=")[1] || "";
+                    map[key] = value;
+                }
+                return map;
+            }
+
+            function addList($houseType){
+                $("#houseList").find("li").remove();
+                var cityId = $("#baseCity").val();
+                var buildPropertyId = $("#buildProperty").val();
+                var room = $("#room").val();
+                var areaId = $("#areaId").val();
+                var cityId = $("#cityId").val();
+                var plateId = $("#plateId").val();
+                var acreage = $("#acreage").val();
+                var price = $("#price").val();
+                $.ajax({
+                    type: "post",
+                    url: "/tospur/wp-admin/admin-ajax.php",
+                    data: "action=searchHouse&cityId="+cityId+"&districtId="+areaId+"&plateId="+plateId+"&buildPropertyId="+buildPropertyId+"&roomId="+room+"&acreage="+acreage+"&totalPrice="+price+"&houseType="+$houseType,
+                    success:function(json){
+                        var result = json.result;
+                        var urlParams = getUrlParmas();
+                        for(var i = 0; i <result.length; i++){
+                            var name = result[i]["name"];
+                            var id = result[i]['id'];
+                            var imgUrl = result[i]['path'];
+                            var img = $("<img>").attr({"src":imgUrl,"height":100,"width":100});
+                            var li = $("<li>").attr("id",id).addClass("addImg").append(img).append(name);
+                            if(urlParams["id"]){
+                                if(urlParams["id"]!=id){
+                                    $("#houseList").append(li);
+                                }
+                            }else{
+                                $("#houseList").append(li);
+                            }
+                        }
+                    }
                 });
+            }
         });
     })(jQuery);
 

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

@@ -89,13 +89,13 @@
             <th><label for="from">所属地区</label></th>
             <td>
                 <select id="baseCity" name="baseCity">
-                    <option value=""> 城市</option>
+                    <option value="-1"> 城市</option>
                     {% for item in city %}
                     <option {{ item.id == result.city_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
                     {% endfor %}
                 </select>
                 <select id="baseAreaId" name="baseAreaId">
-                    <option value = "">区域</option>
+                    <option value = -1">区域</option>
                     {% if district %}
                     {% for item in district %}
                     <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
@@ -103,7 +103,7 @@
                     {% endif %}
                 </select>
                 <select id="basePlateId" name="basePlateId">
-                    <option value = "">板块</option>
+                    <option value = "-1">板块</option>
                     {% if district %}
                     {% for item in plate %}
                     <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
@@ -154,6 +154,7 @@
                     {% endif %}
                     {% set exists_photo_ids = exists_photo_ids~item.image_id %}
                     <p>
+                        <input type="radio" name="frontCover" value="{{item.image_id}}" {{ result.frontCover_id == item.image_id?"checked":"" }} />
                         <select name="exists_photo[{{ item.image_id }}][type]">
                             {% for i in photoType %}
                             <option {{ i.id == item.image_type?"selected":"" }} value="{{ i.id }}">{{ i.value }}</option>
@@ -202,7 +203,7 @@
             <td>
                 <select id="status" name="status">
                     {% for item in status %}
-                    <option value={{item.status_id}}>{{item.status_name}}</option>
+                    <option value={{item.id}}>{{item.value}}</option>
                     {% endfor %}
                 </select>
             </td>
@@ -335,6 +336,7 @@
                 var option = $("<option>").attr("value",cityId).append(cityName);
                 $("#cityId").append(option);
                 var area = $("#areaId");
+                if(cityId != -1){
                     $.ajax({
                         type: "GET",
                         url: "/tospur/wp-admin/admin-ajax.php",
@@ -362,24 +364,9 @@
                             addOption(json,price);
                         }
                     });
-
-                $.ajax({
-                    type: "post",
-                    url: "/tospur/wp-admin/admin-ajax.php",
-                    data: "action=searchHouse&cityId="+cityId+"&houseType=2",
-                    success:function(json){
-                        var result = json.result;
-                        for(var i = 0; i <result.length; i++){
-                            var name = result[i]["name"];
-                            var id = result[i]['id'];
-                            var imgUrl = json.images[id];
-                            var img = $("<img>").attr({"src":imgUrl,"height":100,"width":100});
-                            var li = $("<li>").attr("id",id).addClass("addImg").append(img).append(name);
-                            $("#houseList").append(li);
-                        }
+                    addList(2);
                 }
             });
-            });
 
 
             //区域联动板块
@@ -401,37 +388,7 @@
 
             //推荐房源下显示图片信息以及房名
             $("#areaId,#plateId,#buildProperty,#room,#acreage,#price").change(function(){
-                $("#houseList").find("li").remove();
-                var buildPropertyId = $("#buildProperty").val();
-                var room = $("#room").val();
-                var areaId = $("#areaId").val();
-                var cityId = $("#cityId").val();
-                var plateId = $("#plateId").val();
-                var acreage = $("#acreage").val();
-                var price = $("#price").val();
-                $.ajax({
-                    type: "post",
-                    url: "/tospur/wp-admin/admin-ajax.php",
-                    data: "action=searchHouse&cityId="+cityId+"&districtId="+areaId+"&plateId="+plateId+"&buildPropertyId="+buildPropertyId+"&roomId="+room+"&acreage="+acreage+"&totalPrice="+price+"&houseType=2",
-                    success:function(json){
-                        var result = json.result;
-                        var urlParams = getUrlParmas();
-                        for(var i = 0; i <result.length; i++){
-                            var name = result[i]["name"];
-                            var id = result[i]['id'];
-                            var imgUrl = json.images[id];
-                            var img = $("<img>").attr({"src":imgUrl,"height":100,"width":100});
-                            var li = $("<li>").attr("id",id).addClass("addImg").append(img).append(name);
-                            if(urlParams["id"]){
-                                if(urlParams["id"]!=id){
-                                    $("#houseList").append(li);
-                                }
-                            }else{
-                                $("#houseList").append(li);
-                            }
-                        }
-                    }
-                });
+                addList(2);
             });
 
             //添加房源中搜索框的搜索
@@ -524,13 +481,14 @@
 
             //新增房源相册
             $("#housePicture").click(function(){
-                var picDelet = $("<font>").append("删除").addClass("picDelet");
+                var checkBox = $("<input>").attr({"type":"radio","name":"frontCover","value":i});
+                var picDelet = $("<input>").attr({"type":"button","value":"删除"}).addClass("picDelet");
                 var file = $("<input>").attr({"type":"file","name":"files["+i+"]"}).addClass("picFiles");
                 var select = $("<select>").attr("name","data["+i+"][type]");
                 {% for item in photoType %}
                     select.append($("<option>").attr("value",{{item.id}}).append('{{item.value}}'));
                 {% endfor%}
-                var p = $("<p>").append(select).append(file).append(picDelet);
+                var p = $("<p>").append(checkBox).append(select).append(file).append(picDelet);
                 $("#picList").append(p);
                 i++
             });
@@ -545,6 +503,9 @@
             $("#houseImg,#consultantImg,#picList").on("click",".imgCancel,.consultantCancel,.picDelet",function(){
                 $(this).parent("p").remove();
             });
+            $("#picList,#houseImg,#consultantImg").on("click",".existsCancel",function(){
+                $(this).parent().remove();
+            });
 
             $("#submit").click(function(){
                 if($("#housename").val()==""){
@@ -622,9 +583,42 @@
                 }
                 return map;
             }
-            $("#picList,#houseImg,#consultantImg").on("click",".existsCancel",function(){
-                $(this).parent().remove();
+
+            function addList($houseType){
+                $("#houseList").find("li").remove();
+                var cityId = $("#baseCity").val();
+                var buildPropertyId = $("#buildProperty").val();
+                var room = $("#room").val();
+                var areaId = $("#areaId").val();
+                var cityId = $("#cityId").val();
+                var plateId = $("#plateId").val();
+                var acreage = $("#acreage").val();
+                var price = $("#price").val();
+                $.ajax({
+                    type: "post",
+                    url: "/tospur/wp-admin/admin-ajax.php",
+                    data: "action=searchHouse&cityId="+cityId+"&districtId="+areaId+"&plateId="+plateId+"&buildPropertyId="+buildPropertyId+"&roomId="+room+"&acreage="+acreage+"&totalPrice="+price+"&houseType="+$houseType,
+                    success:function(json){
+                        var result = json.result;
+                        var urlParams = getUrlParmas();
+                        for(var i = 0; i <result.length; i++){
+                            var name = result[i]["name"];
+                            var id = result[i]['id'];
+                            var imgUrl = result[i]['path'];
+                            var img = $("<img>").attr({"src":imgUrl,"height":100,"width":100});
+                            var li = $("<li>").attr("id",id).addClass("addImg").append(img).append(name);
+                            if(urlParams["id"]){
+                                if(urlParams["id"]!=id){
+                                    $("#houseList").append(li);
+                                }
+                            }else{
+                                $("#houseList").append(li);
+                            }
+                        }
+                    }
                 });
+            }
+
 
         });
     })(jQuery);

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

@@ -6,61 +6,55 @@
         <input type="hidden" name="page" value="{{page}}"/>
         <input type="hidden" name="hasSearch" value="1"/>
         <select id="listCity" name="listCity">
-            {% if hasSearch and options.cityName %}
-            <option value="{{options.cityId}}"> {{options.cityName}}</option>
-            {% else %}
             <option value="0"> 城市</option>
-            {% endif %}
+            {% for item in city %}
+            <option {{ item.id == cityId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <select id="listDistrict" name="listDistrict">
-            {% if hasSearch and options.districtName %}
-            <option value="{{options.districtId}}"> {{options.districtName}}</option>
-            {% else %}
             <option value="0">区域</option>
+            {% if district %}
+            {% for item in district %}
+            <option {{ item.id == districtId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
         <select  id="listPlate" name="listPlate">
-            {% if hasSearch and options.districtName and options.plateName %}
-            <option value="{{options.plateId}}">{{options.plateName}}</option>
-            {% else %}
             <option value="0">板块</option>
+            {% if plate %}
+            {% for item in plate %}
+            <option {{ item.id == plateId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
         <select id="totalPrice" name="totalPrice">
-            {% if hasSearch and totalPrice %}
-            <option value="{{totalPrice}}"> {{totalPrice}}</option>
-            {% else %}
             <option value ="">价格</option>
+            {% if dicTotalPrice %}
+            {% for item in dicTotalPrice %}
+            <option {{ item.value == totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
         <select id="buildProperty" name="buildProperty">
-            {% if hasSearch and buildProperty %}
-            <option value="{{buildPropertyId}}"> {{buildProperty}}</option>
-            {% else %}
             <option value="0"> 房型</option>
-            {% endif %}
+            {% for item in buildProperty %}
+            <option {{ item.id == buildPropertyId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
+
         </select>
         <select id="acreage" name="acreage">
-            {% if hasSearch and acreage %}
-            <option value="{{acreage}}"> {{acreage}}</option>
-            {% else %}
             <option value ="">面积</option>
+            {% if acreage %}
+            {% for item in dicArea %}
+            <option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+            {% endfor %}
             {% 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>
-            <option value="3">他售</option>
-            <option value="4">无效</option>
-            <option value="5">重激活</option>
+            {% for item in status%}
+            <option {{ item.id == statusId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <input type="text" placeholder="请出入楼盘名/地段名搜索" name="searchText">
         <input type="submit" id="submit" class="button action" value="搜索">
@@ -71,38 +65,6 @@
 <script>
     (function ($) {
         $(document).ready(function(){
-            //获取城市信息AJAX
-            var listCity = $("#listCity");
-            var room = $("#room");
-            var buildProperty =$("#buildProperty");
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=serachCity",
-                success:function(data){
-                    addOption(data,listCity)
-                }
-            })
-            //获取类型信息AJAX
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=searchRoom",
-                success:function(data){
-                    addOption(data,room)
-                }
-            })
-            //获取房型信息AJAX
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=searchBuildProperty",
-                success:function(data){
-                    addOption(data,buildProperty)
-                }
-            })
-
-
             $("#listCity").change(function(){
                 var listCityId = $("#listCity").val();
                 var district =$("#listDistrict");

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

@@ -6,66 +6,55 @@
         <input type="hidden" name="page" value="{{page}}"/>
         <input type="hidden" name="hasSearch" value="1"/>
         <select id="listCity" name="listCity">
-            {% if hasSearch and options.cityName %}
-            <option value="{{options.cityId}}"> {{options.cityName}}</option>
-            {% else %}
             <option value="0"> 城市</option>
-            {% endif %}
+            {% for item in city %}
+            <option {{ item.id == cityId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <select id="listDistrict" name="listDistrict">
-            {% if hasSearch and options.districtName %}
-            <option value="{{options.districtId}}"> {{options.districtName}}</option>
-            {% else %}
             <option value="0">区域</option>
+            {% if district %}
+            {% for item in district %}
+            <option {{ item.id == districtId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
         <select  id="listPlate" name="listPlate">
-            {% if hasSearch and options.districtName and options.plateName %}
-            <option value="{{options.plateId}}">{{options.plateName}}</option>
-            {% else %}
             <option value="0">板块</option>
+            {% if plate %}
+            {% for item in plate %}
+            <option {{ item.id == plateId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
         <select id="totalPrice" name="totalPrice">
-            {% if hasSearch and totalPrice %}
-            <option value="{{totalPrice}}"> {{totalPrice}}</option>
-            {% else %}
             <option value ="">价格</option>
+            {% if dicTotalPrice %}
+            {% for item in dicTotalPrice %}
+            <option {{ item.value == totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
         <select id="buildProperty" name="buildProperty">
-            {% if hasSearch and buildProperty %}
-            <option value="{{buildPropertyId}}"> {{buildProperty}}</option>
-            {% else %}
             <option value="0"> 房型</option>
-            {% endif %}
+            {% for item in buildProperty %}
+            <option {{ item.id == buildPropertyId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
+
         </select>
         <select id="acreage" name="acreage">
-            {% if hasSearch and acreage %}
-            <option value="{{acreage}}"> {{acreage}}</option>
-            {% else %}
             <option value ="">面积</option>
+            {% if acreage %}
+            {% for item in dicArea %}
+            <option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+            {% endfor %}
             {% endif %}
         </select>
-        <select id="characteristic" name="characteristic">
-            <option value ="">特色</option>
-            <option value ="">满5</option>
-            <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>
-            <option value="3">他售</option>
-            <option value="4">无效</option>
-            <option value="5">重激活</option>
+            {% for item in status%}
+            <option {{ item.id == statusId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+            {% endfor %}
         </select>
         <input type="text" placeholder="请出入楼盘名/地段名搜索" name="searchText">
         <input type="submit" id="submit" class="button action" value="搜索">
@@ -76,38 +65,6 @@
 <script>
     (function ($) {
         $(document).ready(function(){
-            //获取城市信息AJAX
-            var listCity = $("#listCity");
-            var room = $("#room");
-            var buildProperty =$("#buildProperty");
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=serachCity",
-                success:function(data){
-                    addOption(data,listCity)
-                }
-            })
-            //获取类型信息AJAX
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=searchRoom",
-                success:function(data){
-                    addOption(data,room)
-                }
-            })
-            //获取房型信息AJAX
-            $.ajax({
-                type: "GET",
-                url: "/tospur/wp-admin/admin-ajax.php",
-                data: "action=searchBuildProperty",
-                success:function(data){
-                    addOption(data,buildProperty)
-                }
-            })
-
-
             $("#listCity").change(function(){
                 var listCityId = $("#listCity").val();
                 var district =$("#listDistrict");
@@ -141,7 +98,7 @@
                 $.ajax({
                     type: "GET",
                     url: "/tospur/wp-admin/admin-ajax.php",
-                    data: "action=searchUnitPriceRange&cityId="+listCityId,
+                    data: "action=searchTotalPrice&cityId="+listCityId,
                     success:function(json){
                         for(var i = 0; i <=json.length-1; i++){
                             var id = json[i]["id"];

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

@@ -68,6 +68,7 @@ class InsertDao{
         global $wpdb;
         //图片信息
         $uploadedfile = $_FILES['files'];
+        $frontCover = $_POST["frontCover"];
         //主力房源的图片与房子信息关联插入数据库
         if(isset($uploadedfile["name"])){
             foreach($uploadedfile["name"] as $key=> $value) {
@@ -106,8 +107,13 @@ class InsertDao{
                         if (!$imgRes) {
                             return 501;
                         }
+
                         //获取插入图片的id
                         $imgid = $wpdb->insert_id;
+                        if($_POST["frontCover"] == $key){
+                            $frontCover =$imgid;
+                        }
+
                         //房源类型、面积与图片关联表
                         if($data[$key]["type"] == "0"){
                             $houseTypeArea = array(
@@ -136,6 +142,7 @@ class InsertDao{
                 }
             }
         }
+        $wpdb->update(Config::TOSPUR_HOUSE_TABLE,array("frontCover_id"=>$frontCover),array("id"=>$houseId));
     }
 
     public static function addRecommend($houseId,$data){
@@ -172,6 +179,23 @@ class InsertDao{
             }
         }
     }
+    public static function addHouseFeature($houseId,$data){
+        global $wpdb;
+        if($data["houseFeature"]){
+            foreach($data["houseFeature"] as $val){
+                $a_house_feature = array(
+                    "house_id" => $houseId,
+                    "tag_id" =>$val
+                );
+
+                $a_house_featureRes = $wpdb->insert(Config::A_HOUSE_TAG_TABLE,$a_house_feature);
+                if(!$a_house_featureRes){
+                    return 506;
+                }
+            }
+        }
+    }
+
 
     public static function addHouseTag($tags, $house_id)
     {
@@ -183,7 +207,7 @@ class InsertDao{
         //房源的标签id数组
         $tags_ids = array();
         //查询存在的标签
-        $sql = "select * from tospur_tag where name in " . $tags_string;
+        $sql = "select * from tospur_tag where name in " . $tags_string." and type=0";
         $has_tags_result = $wpdb->get_results($sql);
         //排除存在的标签，剩下未有的标签和存在标签id数组
         foreach ($has_tags_result as $key => $value) {
@@ -205,11 +229,12 @@ class InsertDao{
             }
         }
         //删除该房源的标签关联后，添加新的标签关联
-        $wpdb->delete(
-            'a_house_tag',
-            array(
-                'house_id' => $house_id
-            )
+        $wpdb->query(
+            $wpdb->prepare(
+                "DELETE FROM a_house_tag
+                WHERE tag_id in(select tag_id from (select tag_id,tt.type from a_house_tag as aht
+                left JOIN tospur_tag tt on aht.tag_id = tt.id) as a
+                where house_id = %d and a.type = 0);", $house_id)
         );
         foreach ($tags_ids as $value) {
             $wpdb->insert(

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

@@ -231,8 +231,12 @@ class SearchDao
 			$areaArray = explode("-", $array['acreage']);
 			$params[] = $areaArray[0];
 			$params[] = $areaArray[1];
+			if ($array['houseType'] == 0) {
+				$sql = $sql . " and ada.house_area between %d and %d";
+			}else{
 				$sql = $sql . " and covered_area between %d and %d";
 			}
+		}
 		if ($array['totalPrice'] > -1) {
 			$priceArray = explode("-", $array['totalPrice']);
 			$params[] = $priceArray[0];
@@ -325,10 +329,18 @@ class SearchDao
 		return $array;
 	}
 
+	public static function searchFeatureByHouse($hid){
+		global $wpdb;
+		$featureSql ="select tag_id,name from a_house_tag aht
+        LEFT JOIN (select id as tid,name ,type from tospur_tag) tt on aht.tag_id = tt.tid where aht.house_id = %d and type = 1";
+		$feature = $wpdb->get_results($wpdb->prepare($featureSql,$hid));
+		return $feature;
+	}
+
 	public static function searchFeature()
 	{
-        $sql = 'select id,name as value from '.Config::TOSPUR_TAG_TABLE.' where type = 1;';
 		global $wpdb;
+		$sql = 'select id,name as value from '.Config::TOSPUR_TAG_TABLE.' where type = 1;';
 		return $wpdb->get_results($sql);
 	}
 
@@ -358,7 +370,10 @@ class SearchDao
 
     public static function getDetailInfo($hid,$type = NULL){
         global $wpdb;
-        $sql = "select * from ".Config::TOSPUR_HOUSE_TABLE." where id = %d";
+        $sql = "select *,dr.literal as room,db.literal as buildproperty from ".Config::TOSPUR_HOUSE_TABLE." th
+			left JOIN ".Config::DIC_ROOM_TABLE." dr on th.room_id = dr.id
+			left JOIN dic_buildproperty db on th.buildproperty_id = db.value
+			where th.id = %d";
         $result = $wpdb->get_row($wpdb->prepare($sql,$hid));
         $context = array();
         $context['result'] = $result;
@@ -373,22 +388,26 @@ class SearchDao
             where ada.house_id = %d";
             $mainImage = $wpdb->get_results($wpdb->prepare($mainImagesSql,$hid));
             foreach($mainImage as $key => $value){
-                $value->path = Image::getImage($value->path,'small');
+                $value->path = Image::getImage($value->path,'big');
             }
             $context['mainImage'] = $mainImage;
+
+	        $recommendSql = "select th.id,th.name,th.average_price,th.latest_news,th.address,ti.path,dr.literal,(SELECT GROUP_CONCAT(left(tt.name,3)) from a_house_tag aht
+			LEFT JOIN tospur_tag tt on tt.id = aht.tag_id
+			where aht.house_id = th.id) as tags from tospur_house th
+			LEFT JOIN tospur_image ti on th.frontCover_id = ti.id
+			LEFT JOIN dic_room dr on dr.value = th.room_id
+			where th.id in(select recommend_id from a_house_recommend where house_id = %d);";
+        }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 a_house_tag aht
+			LEFT JOIN tospur_tag tt on tt.id = aht.tag_id
+			where aht.house_id = th.id) as tags from tospur_house th
+			LEFT JOIN dic_room dr on dr.id = th.room_id
+			LEFT JOIN tospur_image ti on th.frontCover_id = ti.id
+			where th.id in(select recommend_id from a_house_recommend where house_id = %d);";
         }
 
-        $recommendSql = "select ahi.house_id as id,ti.path from a_house_image ahi
-            left join tospur_image ti on ahi.image_id = ti.id
-            where ti.image_type in (1,5) and house_id
-            in (select recommend_id from a_house_recommend where house_id = %d) group by house_id";
         $recommends = $wpdb->get_results($wpdb->prepare($recommendSql,$hid));
-        if(count($recommends) == 0){
-            $recommendSql = "select ahi.house_id as id,ti.path from a_house_image ahi
-            left join tospur_image ti on ahi.image_id = ti.id
-            where house_id in (select recommend_id from a_house_recommend where house_id = %d) group by house_id";
-            $recommends = $wpdb->get_results($wpdb->prepare($recommendSql,$hid));
-        }
         foreach($recommends as $key => $value){
             $value->path = Image::getImage($value->path,'small');
         }
@@ -426,7 +445,7 @@ class SearchDao
         global $wpdb;
         $sql = "select tt.name from a_house_tag aht
         LEFT JOIN tospur_tag tt on aht.tag_id = tt.id
-        where aht.house_id = %d;";
+        where aht.house_id = %d and type = 0;";
         $results = $wpdb->get_results($wpdb->prepare($sql,$houseId));
         $tags = array();
         foreach($results as $item){
@@ -437,42 +456,9 @@ class SearchDao
 
     public static function searchStatusType($statusType){
         global $wpdb;
-        $sql="select status_type,status_id,status_name from tospur_status where status_type = %d";
+	    $sql="select status_id as id,status_name as value from tospur_status where status_type = %d";
         $results = $wpdb->get_results($wpdb->prepare($sql,$statusType));
         return $results;
 
     }
-
-    public static function searchForCDP($cityId=null,$districtId=null,$plateId=null){
-        global $wpdb;
-        $selectName = "";
-        $where = " where 1=1 ";
-        $params = array();
-        if($cityId != 0){
-            $where .= " and cityId = %d";
-            $selectName = "cityId,cityName";
-            $params[] = $cityId;
-        }
-        if($districtId != 0){
-            $where .= " and districtId = %d";
-            $selectName = "cityId,cityName,districtId,districtName";
-            $params[] = $districtId;
-        }
-        if($plateId != 0){
-            $where .= " and plateId = %d";
-            $selectName = "cityId,cityName,districtId,districtName,plateId,plateName";
-            $params[] = $plateId;
-        }
-        $result = $wpdb->get_row($wpdb->prepare('select ' . $selectName . ' from ' . Config::DIC_CITY_TABLE . $where,$params));
-        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/plugins/tospur/index.php

@@ -23,7 +23,6 @@ function tospur_init()
     require_once(PLUGIN_DIR . 'Admin/rentHouse.php');
     require_once(PLUGIN_DIR . 'Admin/rentHouseList.php');
 	require_once(PLUGIN_DIR . 'Admin/feature.php');
-    require_once(PLUGIN_DIR . 'Admin/introduction.php');
     require_once('consultant_score.php');
     require_once('view_house.php');
     add_action('admin_menu', 'reset_menu');
@@ -34,8 +33,8 @@ function tospur_init()
 
 function tospur_theme_format(){
     //移除
-    add_filter('admin_footer_text', 'tospur_remove_admin_footer_text', 1000);
-    add_filter('update_footer', 'tospur_remove_admin_footer_upgrade', 1000);
+    add_filter('admin_footer_text', tospur_remove_admin_footer_text, 1000);
+    add_filter('update_footer', tospur_remove_admin_footer_upgrade, 1000);
     add_action('login_enqueue_scripts', 'tospur_login_logo');
     //admin bar
     add_action('wp_before_admin_bar_render', 'tospur_remove_admin_bar');
@@ -69,9 +68,11 @@ function tospur_theme_format(){
 
 function tospur_register_script_style(){
     wp_register_script('jquery-ui',plugins_url('Admin/views', __FILE__)."/js/jquery-ui.js");
+    wp_register_script('validate',plugins_url('Admin/views', __FILE__)."/js/jquery.validate.js");
     wp_register_script('bootstrapjs',plugins_url('Admin/views', __FILE__)."/js/bootstrap.min.js");
     wp_register_style('jquery-ui_css', plugins_url('Admin/views', __FILE__)."/css/jquery-ui.css");
     wp_register_style('bootstrapcss', plugins_url('Admin/views', __FILE__)."/css/bootstrap.css");
+    wp_register_style('bootstrapMinCss', plugins_url('Admin/views', __FILE__)."/css/bootstrap.min.css");
 }
 
 function tospur_ajax_set()
@@ -90,14 +91,12 @@ function tospur_ajax_set()
     add_action('wp_ajax_nopriv_searchTotalPrice', 'SearchDao::ajax_searchTotalPrice');
     add_action('wp_ajax_searchOrganization', 'SearchDao::ajax_searchOrganization');
     add_action('wp_ajax_nopriv_searchOrganization', 'SearchDao::ajax_searchOrganization');
-    add_action('wp_ajax_searchHouse', 'SearchDao::ajax_searchHouse');
-    add_action('wp_ajax_nopriv_searchHouse', 'SearchDao::ajax_searchHouse');
-    add_action('wp_ajax_searchConsultant', 'SearchDao::ajax_searchConsultant');
-    add_action('wp_ajax_nopriv_searchConsultant', 'SearchDao::ajax_searchConsultant');
+    add_action( 'wp_ajax_searchHouse', 'SearchDao::ajax_searchHouse' );
+    add_action( 'wp_ajax_nopriv_searchHouse', 'SearchDao::ajax_searchHouse');
+    add_action( 'wp_ajax_searchConsultant', 'SearchDao::ajax_searchConsultant' );
+    add_action( 'wp_ajax_nopriv_searchConsultant', 'SearchDao::ajax_searchConsultant');
 	add_action('wp_ajax_add_feature', 'feature::ajax_add_feature');
 	add_action('wp_ajax_nopriv_add_feature', 'feature::ajax_add_feature');
-    add_action('wp_ajax_submit_introduction', 'introduction::ajax_submit_introduction');
-    add_action('wp_ajax_nopriv_submit_introduction', 'introduction::ajax_submit_introduction');
     //后台处理 置业顾问评分
     add_action('wp_ajax_valid_consultant_score', 'valid_consultant_score');
     //后台处理 置业顾问
@@ -138,15 +137,13 @@ function update_consultant()
 function reset_menu()
 {
     add_menu_page("sync", "同步数据", "manage_options", "1", "do_sync");
-    add_menu_page('nesHouseList','新房列表', 'moderate_comments', 'newHouseList', 'newHouseList', 'dashicons-menu', 6);
+	add_menu_page('nesHouseList','新房列表', 'moderate_comments', 'newHouseList', 'function_newHouseList', 'dashicons-menu', 6);
 	add_submenu_page('newHouseList', '添加新房', '添加新房', 'moderate_comments', 'newHouse', 'House::init_view');
-    add_menu_page('secHandHouseList','二手房列表', 'moderate_comments', 'secHandHouseList', 'secHandHouseList', 'dashicons-menu', 7);
+	add_menu_page('secHandHouseList','二手房列表', 'moderate_comments', 'secHandHouseList', 'function_secHandHouseList', 'dashicons-menu', 7);
     add_submenu_page('secHandHouseList', '添加二手房', '添加二手房', 'moderate_comments', 'secHandHouse', 'SecHandHouse::secHandHouse_html');
-    add_submenu_page('secHandHouseList', '特色列表', '特色列表', 'moderate_comments', 'feature_list', 'feature::feature_list_html');
-    add_submenu_page('secHandHouseList', '添加特色', '添加特色', 'moderate_comments', 'add_feature', 'feature::add_feature_html');
-    add_menu_page('rentHouseList','租房列表', 'moderate_comments', 'rentHouseList', 'rentHouseList', 'dashicons-menu', 8);
+	add_submenu_page('secHandHouseList', '添加特色', '添加特色', 'moderate_comments', 'feature', 'feature::feature_html');
+    add_menu_page('rentHouseList','租房列表', 'moderate_comments', 'rentHouseList', 'function_rentHouseList', 'dashicons-menu', 8);
     add_submenu_page('rentHouseList', '添加租房', '添加租房', 'moderate_comments', 'rentHouse', 'RentHouse::rentHouse_html');
-    add_menu_page("introduction", "诚信宣言", "editor", "introduction", "introduction::introduction_html", 'dashicons-menu', 9);
     //移除更新信息
     remove_action( 'admin_notices', 'update_nag', 3 );
     global $menu;

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

@@ -443,10 +443,11 @@ a:hover {
   background-color: #f9f9f9;
 }
 .footer .btn {
-  width: 45%;
+  width: 94%;
+  display: block;
   color: #ffffff;
   font-weight: bold;
-  margin: 5px 2%;
+  margin: 5px auto;
   padding: 1px;
   background-color: #008cd7;
   border-top-left-radius: 4px;

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

@@ -526,8 +526,9 @@ body {
   margin-right: 5px;
   font-size: 14px;
 }
-.detail_row #wrapper #scroller ul li p img {
-  width: 100%;
+.detail_row #wrapper #scroller ul li p:nth-child(1) {
+  height: 70px;
+  overflow: hidden;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
   border-bottom-left-radius: 6px;
@@ -537,6 +538,9 @@ body {
   -webkit-border-bottom-left-radius: 6px;
   -webkit-border-bottom-right-radius: 6px;
 }
+.detail_row #wrapper #scroller ul li p:nth-child(1) img {
+  height: 100%;
+}
 .detail_row #wrapper #scroller ul li p em {
   font-style: normal;
   font-size: 7px;

wp-content/themes/tospur/detail.php

@@ -7,6 +7,7 @@
     if(isset($_GET['hid'])){
         $hid = $_GET['hid'];
         $context['hid'] = $hid;
+        $context['cityName'] = SearchDao::getCityNameWithId($result->city_id);
         $context = array_merge($context,SearchDao::getDetailInfo($hid));
         $houseType = $context['result']->house_type;
         if($houseType !=0){

wp-content/themes/tospur/functions.php

@@ -53,9 +53,6 @@ function page_template($template)
             case 'loan_calculator':
                 $page = $theme . '/loan_calculator.php';
                 break;
-            case 'loan_result':
-                $page = $theme . '/loan_result.php';
-                break;
         }
         return $page;
     } else {

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>
@@ -63,9 +63,6 @@
     </div>
 </div>
 <footer class="footer navbar-fixed-bottom">
-    <a class="btn btn-wechat">
-        <span></span>微信联系
-    </a>
     <a href="tel:{{ consultant_mobile }}" class="btn btn-phone">
         <span></span>电话联系
     </a>
@@ -141,14 +138,66 @@
         </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 }}';
     var index = 0;
     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: 'search_house',
             cityId: {{ consultant.cityId }},

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

@@ -16,9 +16,12 @@
     <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;
+
+        $(document).ready(function(){
             window.addEventListener("load",function(){
                 var bullets = document.getElementById('indicator').getElementsByTagName('li');
                 window.mySwipe = new Swipe(document.getElementById('slider'), {
@@ -40,10 +43,14 @@
                 });
 
             },false);
-
-        $(document).ready(function(){
             $("#slider").bind("tap",function(){
-                $("#carousel_wrapper").parent().show();
+                $("#carouselModal").modal('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,15 +64,10 @@
                     $("#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(){
-                $(this).hide();
+            $("#carouselModal,#photoModal").bind("click",function(){
+                $(this).modal('hide');
                 return false;
             });
 
@@ -91,13 +93,22 @@
             $(".map").bind("tap",function(){
                 location.href = "{{ siteUrl }}/?page=map&a={{result.address}}&c={{cityName}}&hn={{result.community_name}}<br>{{result.address}}&p={{result.location}}";
             });
+
+            $(".recommendCont").on("tap",".row",function(){
+                window.location.href =  '{{ siteUrl }}/?page=detail&hid=' + $(this).attr("data-id");
+            });
+
+            $("#scroller").on("tap","*[data-image-url]",function(){
+                $("#photoModal").find("img").eq(0).attr("src",$(this).attr("data-image-url"));
+                $("#photoModal").modal("show");
+                return false;
+            });
         });
     </script>
 </head>
 <body>
 
-<p class="collect">
-</p>
+<p class="collect"></p>
 
 <!-- 图片滚动 -->
 <div class="addWrap">
@@ -122,7 +133,14 @@
     <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" id="calculator">房贷计算器</button>
@@ -139,10 +157,10 @@
         <div id="scroller">
             <ul class="list-inline text-nowrap">
                 {% for item in mainImage %}
-                    <li>
+                    <li data-image-url="{{siteUrl}}{{ item.path }}">
                         <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>
@@ -150,8 +168,10 @@
     </div>
 </div>
 <div class="detail_row">
-    <p class="detail_title">位置及周边</p>
-    <ul class="list-unstyled">
+    <a class="collapsed" data-toggle="collapse" href="#collapseExample">
+        <p class="detail_title">位置及周边<span class="pull-right"></span></p>
+    </a>
+    <ul class="list-unstyled collapse" id="collapseExample" style="min-height:60px;display:block;overflow:hidden;height:0;">
         <li>地址：{{result.address}}</li>
         <li>交通线路：{{result.traffic}}</li>
         <li>周边配套：{{result.periphery}}</li>
@@ -160,10 +180,12 @@
     </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="#collapseInfoCont">
+        <p class="detail_title">基本信息<span class="pull-right"></span></p>
+    </a>
+    <ul class="list-unstyled collapse infoCont" id="collapseInfoCont" style="min-height:60px;display:block;overflow:hidden;height:0;">
         <li>开发商：<span>{{result.developer}}</span></li>
-        <li>建筑类型：{{result.periphery}}</li>
+        <li>建筑类型：{{result.room}}</li>
         <li>装修状况：{{result.decoration}}</li>
         <li>容积率：{{result.volume_rate}}</li>
         <li>规划户数：{{result.households}}</li>
@@ -177,18 +199,55 @@
     </ul>
 </div>
 <div class="detail_row">
-    <p class="detail_title">楼盘概述</p>
-    <p>{{result.overview}}</p>
+    <a class="collapsed" data-toggle="collapse" href="#collapseSummary">
+        <p class="detail_title">楼盘概述<span class="pull-right"></span></p>
+    </a>
+    <p class="collapse" id="collapseSummary" style="min-height:60px;display:block;overflow:hidden;height:0;">
+        {{result.overview}}
+    </p>
 </div>
-<div class="detail_row">
-    <p class="detail_title pull-left">推荐房源</p>
-    <ul class="list-unstyled recommendCont">
+{% if recommends %}
+    <div class="detail_row recommend">
+        <p class="detail_title">推荐房源</p>
+        <div class="recommendCont">
             {% for item in recommends %}
-            <a href="{{siteUrl}}?page=detail&hid={{item.id}}"><li class="col-xs-3"><p style="background-image:url({{siteUrl}}{{ item.path }});"></p></li></a>
+                <div data-id="{{item.id}}" class="row">
+                    <p>
+                        {% if item.path %}
+                            <img src="{{siteUrl}}{{item.path}}">
+                        {% else %}
+                            <img src="{{siteUrl}}/wp-content/themes/tospur/img/img.jpg">
+                        {% endif %}
+                    </p>
+                    <ul class="list-unstyled">
+                        <li class="address">
+                            <span>{{item.name}}</span>
+                            <span class="pull-right">{{item.literal}}</span>
+                        </li>
+                        <li>{{item.address}}</li>
+                        <li>{{item.latest_news}}</li>
+                        <li>
+                            {% for tag in item.tags|split(',') %}
+                                <span class="label">{{tag}}</span>
                             {% endfor %}
+                        <span class="pull-right">
+                            <em>
+                                {% if item.average_price>=10000 %}
+                                    {{(item.average_price/10000)|round(2, 'floor')}}万
+                                {% else %}
+                                    {{item.average_price}}元
+                                {% endif %}
+                            </em>/m<em>2</em>
+                        </span>
+                        </li>
                     </ul>
-</div>
-<div class="detail_row" id="consultantDiv">
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+{% endif %}
+{% if consultant %}
+    <div class="detail_row" id="consultantDiv">
         <p class="detail_title">置业顾问</p>
         <ul class="list-unstyled peopleCont">
             {% for item in consultant %}
@@ -225,7 +284,8 @@
                     </a>
             {% endfor %}
         </ul>
-</div>
+    </div>
+{% endif %}
 
 <footer class="footer navbar-fixed-bottom">
     <a href="#consultantDiv" class="btn">置业顾问</a>
@@ -244,7 +304,7 @@
     <!-- 二手房详细 -->
 </footer>
 
-<div class="modal">
+<div class="modal" id="carouselModal">
     <div id="carousel_wrapper">
         <div id="carousel_scroller">
             <ul class="list-inline text-nowrap">
@@ -264,6 +324,10 @@
         </ul>
     </div>
 </div>
-
+<div class="modal" id="photoModal">
+    <p>
+        <span><img></span>
+    </p>
+</div>
 </body>
 </html>
\ No newline at end of file

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

@@ -19,6 +19,8 @@
     <script type="text/javascript">
         var myScroll;
         var carouselScroll;
+
+        $(document).ready(function(){
             window.addEventListener("load",function(){
                 var bullets = document.getElementById('indicator').getElementsByTagName('li');
                 window.mySwipe = new Swipe(document.getElementById('slider'), {
@@ -40,10 +42,8 @@
                 });
 
             },false);
-
-        $(document).ready(function(){
             $("#slider").bind("tap",function(){
-                $("#carousel_wrapper").parent().show();
+                $("#carouselModal").modal("show");
                 var carousel = $("#carousel_wrapper");
                 var carouselWidth = carousel.width();
                 carousel.find("#carousel_scroller ul li").css({"width":carouselWidth});
@@ -65,8 +65,8 @@
                 });
                 return false;
             });
-            $("#carousel_wrapper").parent().bind("click",function(){
-                $(this).hide();
+            $("#carouselModal").bind("click",function(){
+                $("#carouselModal").modal("hide");
                 return false;
             });
 
@@ -89,15 +89,24 @@
                 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 }}";
             });
+
+            $(".recommendCont").on("tap",".row",function(){
+                window.location.href =  '{{ siteUrl }}/?page=detail&hid=' + $(this).attr("data-id");
+            });
         });
     </script>
 </head>
 <body>
 
 <p class="collect">
+    <i class="iconfont"></i>
 </p>
 
 <!-- 图片滚动 -->
@@ -121,23 +130,48 @@
 
 <div class="detail_row priceCont">
     <p class="detail_title">{{result.name}}</p>
+    <!-- <ul class="list-unstyled">
+        <li class="col-xs-7 price">
+            均价：<span><em>2.35万</em>/m<em>2</em></span>
+        </li>
+        <li class="col-xs-5">
+            <button type="button" class="btn btn-xs">房贷计算器</button>
+        </li>
+    </ul>-->
+
+    <!-- 二手房详细 -->
     <ul class="list-unstyled">
         <li class="col-xs-7">房源编号：{{result.house_number}}</li>
+        {% if result.house_type == 1%}
             <li class="col-xs-5">
                 <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>
+        {% else %}
+            <li class="col-xs-5">
+            </li>
+            <li class="col-xs-7 price">
+                租金：<span><em>{{result.rent}}/月</em></span>
+            </li>
+        {% endif %}
     </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>
+    <ul class="list-unstyled collapse infoCont" id="collapseExample" style="min-height:60px;display:block;overflow:hidden;height:0;">
+        <li>户型：{{result.buildproperty}}</li>
         <li>面积：{{result.covered_area}}</li>
         <li>楼层：{{result.floor}}</li>
         <li>朝向：{{result.faceto}}</li>
@@ -146,27 +180,78 @@
     </ul>
 </div>
 <div class="detail_row">
-    <p class="detail_title">房源点评</p>
-    <p>{{result.overview}}</p>
+    <a class="collapsed" data-toggle="collapse" href="#collapseSummary" aria-expanded="false">
+        <p class="detail_title">房源点评<span class="pull-right"></span></p>
+    </a>
+    <p class="collapse" id="collapseSummary" style="min-height: 60px; display: block; overflow: hidden; height: 0px;" aria-expanded="false">
+        {{result.overview}}
+    </p>
 </div>
 <div class="detail_row">
-    <p class="detail_title">位置及周边</p>
-    <ul class="list-unstyled">
+    <a class="collapsed" data-toggle="collapse" href="#collapseAddress">
+        <p class="detail_title">位置及周边<span class="pull-right"></span></p>
+    </a>
+    <ul class="list-unstyled collapse" id="collapseAddress" style="min-height:60px;display:block;overflow:hidden;height:0;">
         <li>地址：{{result.address}}</li>
         <li>交通线路：{{result.traffic}}</li>
         <li>周边配套：{{result.periphery}}</li>
     </ul>
-    <p class="map">
-    </p>
+    <p class="map"></p>
 </div>
-<div class="detail_row">
-    <p class="detail_title pull-left">推荐房源</p>
-    <ul class="list-unstyled recommendCont">
+{% if recommends %}
+    <div class="detail_row recommend">
+        <p class="detail_title">推荐房源</p>
+        <div class="recommendCont">
             {% for item in recommends %}
-        <a href="{{siteUrl}}?page=detail&hid={{item.id}}"><li class="col-xs-3"><p style="background-image:url({{siteUrl}}{{ item.path }});"></p></li></a>
+            <div data-id="{{item.id}}" class="row">
+                <p>
+                    {% if item.path %}
+                    <img src="{{siteUrl}}{{item.path}}">
+                    {% else %}
+                    <img src="{{siteUrl}}/wp-content/themes/tospur/img/img.jpg">
+                    {% endif %}
+                </p>
+                <ul class="list-unstyled">
+                    <li class="multiLine_omit">
+                        {{item.name}}
+                    </li>
+                    <li>{{item.community_name}}</li>
+                    <li>
+                        <span>{{item.value}}</span>
+                        {% if result.house_type == 2 %}
+                            <span>{{item.decoration}}</span>
+                        {% endif %}
+                        <span>{{item.covered_area}}平米</span>
+                    </li>
+                    <li>
+                        {% for tag in item.tags|split(',') %}
+                            {% if loop.index <=3 %}
+                                <span class="label">{{tag}}</span>
+                            {% endif %}
                         {% endfor %}
+                        <span class="pull-right">
+                            {% if result.house_type == 1 %}
+                                <em>
+                                    {{(item.total_price/10000)|round(2, 'floor')}}万
+                                </em>
+                            {% elseif result.house_type == 2 %}
+                                <em>
+                                    {% if item.rent>=10000 %}
+                                    {{(item.rent/10000)|round(2, 'floor')}}万
+                                    {% else %}
+                                    {{item.rent}}
+                                    {% endif %}
+                                    /月
+                                </em>
+                            {% endif %}
+                        </span>
+                    </li>
                 </ul>
-</div>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+{% endif %}
 {% if consultant[0] %}
 <footer class="footer navbar-fixed-bottom">
         <ul class="list-unstyled">
@@ -195,17 +280,17 @@
                         <span>电话联系</span>
                     </a>
                 {% endif %}
-                <!--<a href="#" class="btn btn-wechat">
+                <a href="{{siteUrl}}?page=view&house_id={{hid}}&consultant_id={{consultant[0].id}}" class="btn btn-wechat">
                     <span></span>
-                    <span>微信联系</span>
-                </a>-->
+                    <span>一键预约</span>
+                </a>
             </li>
         </ul>
     <!-- 二手房详细 -->
 </footer>
 {% endif %}
 
-<div class="modal">
+<div class="modal" id="carouselModal">
     <div id="carousel_wrapper">
         <div id="carousel_scroller">
             <ul class="list-inline text-nowrap">