Merge branch 'felix' into shz

Conflicts:
	wp-content/plugins/tospur/Admin/introduction.php
	wp-content/plugins/tospur/Admin/views/introduction.html

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

+<<<<<<< HEAD
 <?php
 
 class introduction
@@ -48,4 +49,56 @@ class introduction
     }
 }
 
+=======
+<?php
+
+class introduction
+{
+    public static function ajax_submit_introduction()
+    {
+        $introduction = $_POST['introduction'];
+        $user_id = $_POST['user_id'];
+        wp_send_json(introduction::submit_introduction($introduction, $user_id));
+    }
+
+    public static function submit_introduction($introduction, $user_id)
+    {
+        global $wpdb;
+        $result = $wpdb->update(
+            Config::TOSPUR_CONSULTANT,
+            array(
+                'introduction' => $introduction
+            ),
+            array('id' => $user_id)
+        );
+        return $result;
+    }
+
+    public static function search_introduction()
+    {
+        global $wpdb;
+        $user_id = introduction::get_user_id();
+        $sql = "select introduction from " . Config::TOSPUR_CONSULTANT . " where id = " . $user_id;
+        $result = $wpdb->get_var($sql);
+        return $result;
+    }
+
+    public static function introduction_html()
+    {
+        $context = array();
+        $context['url'] = home_url();
+        $context['introduction'] = introduction::search_introduction();
+        $user_id = introduction::get_user_id();
+        $context['user_id'] = $user_id;
+        Timber::render('introduction.html', $context);
+    }
+
+    public static function get_user_id()
+    {
+        $current_user = wp_get_current_user();
+        return $current_user->ID;
+    }
+}
+
+>>>>>>> felix
 ?>
\ No newline at end of file

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

+<<<<<<< HEAD
 <h2>诚信宣言</h2>
 <label for="introduction">
     <textarea id="introduction" placeholder="请输入诚信宣言" rows="10" cols="50" style="resize: none;">{{ introduction }}</textarea>
@@ -30,4 +31,38 @@
             });
         });
     })(jQuery);
+=======
+<h2>诚信宣言</h2>
+<label for="introduction">
+    <textarea id="introduction" placeholder="请输入诚信宣言" rows="10" cols="50" style="resize: none;">{{ introduction }}</textarea>
+</label>
+<p>
+    <input type="hidden" id="user_id" value="{{ user_id }}">
+    <input type="submit" id="submit" class="button">
+</p>
+<script>
+    (function ($) {
+        var oldIntroduction = '{{ introduction }}';
+        $(document).ready(function () {
+            $('#submit').click(function () {
+                var introduction = $('#introduction').val();
+                var user_id = $('#user_id').val();
+                if (introduction.trim() != '' && oldIntroduction != introduction) {
+                    $.ajax({
+                        type: 'POST',
+                        url: '{{ url }}/wp-admin/admin-ajax.php/',
+                        data: 'action=submit_introduction&introduction=' + introduction + '&user_id=' + user_id,
+                        success: function (data) {
+                            if (data) {
+                                alert('提交成功');
+                            }
+                        }
+                    });
+                }else{
+                    alert('请修改诚信宣言');
+                }
+            });
+        });
+    })(jQuery);
+>>>>>>> felix
 </script>
\ No newline at end of file

wp-content/plugins/tospur/index.php

@@ -23,6 +23,7 @@ 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');
@@ -97,6 +98,8 @@ function tospur_ajax_set()
     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');
     //后台处理 置业顾问
@@ -141,9 +144,11 @@ function reset_menu()
 	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', 'feature::feature_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', '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;