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);
 
-            InsertDao::addHouseTag($_POST['mark'],$houseId);
+            if(isset($_POST['mark'])&&$_POST['mark']!=""){
+                InsertDao::addHouseTag($_POST['mark'],$houseId);
+            }
+
+            InsertDao::addHouseFeature($houseId,$data);
+
 
         }else{
             return 507;
@@ -137,17 +144,21 @@ 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];
-    }
-
 }
 

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/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/index.php

@@ -13,7 +13,7 @@ add_action('init', 'tospur_init');
 function tospur_init()
 {
     require_once(PLUGIN_DIR . 'Config.php');
-    require_once(PLUGIN_DIR . 'Tools/TCSync.php');
+   require_once(PLUGIN_DIR . 'Tools/TCSync.php');
     require_once(PLUGIN_DIR . 'Tools/Image.php');
     require_once(PLUGIN_DIR . 'Dao/SearchDao.php');
     require_once(PLUGIN_DIR . 'Admin/House.php');
@@ -22,8 +22,7 @@ function tospur_init()
     require_once(PLUGIN_DIR . 'Admin/secHandHouseList.php');
     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(PLUGIN_DIR . 'Admin/feature.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_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_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_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_submenu_page('newHouseList', '添加新房', '添加新房', 'moderate_comments', 'newHouse', 'House::init_view');
-    add_menu_page('secHandHouseList','二手房列表', 'moderate_comments', 'secHandHouseList', 'secHandHouseList', 'dashicons-menu', 7);
+	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', '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 }},