每日一更

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

@@ -318,10 +318,12 @@ class newHouseList extends UGEN_List_Table
         if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1) {
             $params[] = $_REQUEST["organization"];
             $sql = $sql . " and subsidiaryId=%d ";
-        } else if (trim($_REQUEST["searchText"]) != NULL) {
+        }
+        if (trim($_REQUEST["searchText"]) != NULL) {
             $params[] = '%' . $_REQUEST['searchText'] . '%';
             $sql = $sql . " and name like %s";
-        } else if (trim($_REQUEST["stuff"]) != NULL) {
+        }
+        if (trim($_REQUEST["stuff"]) != NULL) {
             $params[] = '%' . $_REQUEST['stuff'] . '%';
             $sql = $sql . " and consul_name like %s";
         }

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

@@ -349,10 +349,12 @@ class rentHouseList extends UGEN_List_Table
         if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1  && $_REQUEST["organization"] != 0) {
             $params[] = $_REQUEST["organization"];
             $sql = $sql . " and subsidiaryId=%d ";
-        } else if (trim($_REQUEST["searchText"] != NULL)) {
+        }
+        if (trim($_REQUEST["searchText"] != NULL)) {
             $params[] = '%' . $_REQUEST['searchText'] . '%';
             $sql = $sql . " and name like %s";
-        } else if (trim($_REQUEST["stuff"] != NULL)) {
+        }
+        if (trim($_REQUEST["stuff"] != NULL)) {
             $params[] = '%' . $_REQUEST['stuff'] . '%';
             $sql = $sql . " and consul_name like %s";
         }

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

@@ -375,10 +375,12 @@ class secHandHouseList extends UGEN_List_Table
         if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1 && $_REQUEST["organization"] != 0) {
             $params[] = $_REQUEST["organization"];
             $sql = $sql . " and subsidiaryId=%d ";
-        } else if (trim($_REQUEST["searchText"] != NULL)) {
+        }
+        if (trim($_REQUEST["searchText"] != NULL)) {
             $params[] = '%' . $_REQUEST['searchText'] . '%';
             $sql = $sql . " and name like %s";
-        } else if (trim($_REQUEST["stuff"] != NULL)) {
+        }
+        if (trim($_REQUEST["stuff"] != NULL)) {
             $params[] = '%' . $_REQUEST['stuff'] . '%';
             $sql = $sql . " and consul_name like %s";
         }

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

@@ -10,7 +10,7 @@
             </select>
         </div><br/><br/>
         <div class="form-group">
-            <input type="submit" value="同步" class="btn btn-success">
+            <input type="submit" value="同步" class="btn btn-info">
         </div>
     </form>
 </body>
\ No newline at end of file

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

@@ -37,8 +37,8 @@
             init_modal_myConsultantList(addConsultant);
 
             $("#consultantImg").on("click",".consultantCancel",function(){
-                $(this).parents("p").remove();
-                if( $("#consultantImg > p").length == 0){
+                $(this).parent().parent().remove();
+                if( $("#consultantImg > div").length == 0){
                     $("#subsidiaryId").remove();
                 }
             });
@@ -46,29 +46,28 @@
         });
         //点击模态框中的置业顾问后显示
         function addConsultant(data){
-            var row = $("<div>").addClass("row").css("margin-bottom","10px");
-            var left = $("<div>").addClass("col-md-3");
-            var img = $("<img>").attr({"src":data.imageUrl,"height":100,"width":100,"style":"margin-right:50px"});
-            left.append(img);
-            var mid = $("<div>").addClass("col-md-3");
-            var label = $("<label>").append(data.name);
-            mid.append(label);
-            var right = $("<div>").addClass("col-md-3");
+            var div = $("<div>").css({"display":"inline-block","margin-right":"10px"});
+            var p1 = $("<p>");
+            var img = $("<img>").attr({"src":data.imageUrl,"height":100,"width":100});
+            p1.append(img);
+            div.append(p1);
+            var p2 = $("<p>").css({"margin-top":"3px"});
+            var label = $("<label>").html(data.name);
+            p2.append(label);
             if ('{{role}}' == 'jl') {
                 var cancel = $("<input>").attr({
                     "type": "button",
                     "value": "删除"
-                }).addClass("btn btn-info consultantCancel");
-                right.append(cancel);
+                }).addClass("btn btn-info btn-xs consultantCancel").css({"float":"right"});
+                p2.append(cancel);
             }
+            div.append(p2);
             var recommendConsultant = $("<input>").attr({"type":"hidden","name":"data[recConsultant][]","value":data.id});
-            row.append(left).append(mid).append(right);
-            var p = $("<p>").append(row).append(recommendConsultant);
+            div.append(recommendConsultant);
             var subsidiaryId = $("<input>").attr({"type":"hidden","value":data.subsidiaryId,"id":"subsidiaryId"});
-            if($("#consultantImg > p").length == 0){
-                $("#consultantImg").append(p).append(subsidiaryId);
-            }else{
-                $("#consultantImg").append(p);
+            $("#consultantImg").append(div);
+            if($("#consultantImg > div").length == 0){
+                $("#consultantImg").append(subsidiaryId);
             }
             {% if (house_type == 1 or house_type == 2 or page == 'customer' or page == 'view_house') %}
             controlCommand("consultantImg",1,1);

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

-<table class="form-table" style="margin-bottom: 15px;">
-    <tbody>
-    <tr>
-        <td style="width: 75px;padding: 10px 0;">
-            <label class="control-label color-red">特色筛选:</label>
-        </td>
-        <td>
-            <div id="feature"></div>
-        </td>
-    </tr>
-    <tr>
-        <td style="display: inline;padding: 10px 0;margin-left: 75px;">
-            <button type="button" class="btn btn-success" id="addFeatureBtn">
-                添加特色
-            </button>
-        </td>
-    </tr>
-    </tbody>
-</table>
+<div class="row form-group">
+    <div class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">特色</span>
+            <input type="button" class="btn btn-success" id="addFeatureBtn" value="添加特色" />
+        </div>
+        <div id="feature" class="input-group" style="margin-left: 68px;margin-top: 10px;">
+        </div>
+    </div>
+</div>
 
 <script>
     $(document).ready(function () {
@@ -42,12 +33,21 @@
                 }
             });
         });
+        $("#feature").on("click",".featureCancel",function(){
+            var removeItem = $(this).parent().parent().find("input").val();
+            $.grep(featureArray, function(value) {
+                return value != removeItem;
+            });
+            $(this).parent().parent().parent().remove();
+        });
     });
     function addFeature(id, value) {
-        var houseFeature = $("<input>").attr({"type": "hidden", "name": "data[houseFeature][]", "value": id});
-        var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel ");
-        var span = $("<span>").attr("style", "margin-right:5px").append(value);
-        var divCol = $("<div>").append(houseFeature).append(span).append(cancel).addClass("col-md-3").attr("style", "margin-bottom:10px");
+        var houseTag = $("<input>").attr({"type": "hidden", "name": "data[houseTag][]", "value": id});
+        var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel ").css({"top":"3px","margin-left":"10px"});
+        var span = $("<span>").attr("style", "margin-right:5px").addClass("label label-info").append(value);
+        var h = $("<h4>");
+        h.append(span.append(cancel));
+        var divCol = $("<div>").append(houseTag).append(h).addClass("col-md-2").attr("style", "margin-bottom:10px");
         $("#feature").append(divCol);
     }
 </script>
\ No newline at end of file

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

@@ -23,7 +23,7 @@
                     <h4 class="modal-title"></h4>
                 </div>
                 <div id="featureTable">
-                    <table class="table" id="tagList">
+                    <table class="table" id="tagList" style="table-layout:fixed;">
                     </table>
                 </div>
             </div>
@@ -42,19 +42,25 @@
                     url: "/tospur/wp-admin/admin-ajax.php",
                     data: "action=searchTagOrFeature&type=" + search_type,
                     success: function (data) {
-                        var tr;
+                        var tr,lastIndex;
                         $.each(data, function (index, item) {
                             if (index % 4 == 0) {
                                 tr = $('<tr>');
                             }
                             tr.append('<td><span id="' + item.id + '">' + item.value + '</span></td>');
                             tagList.append(tr);
+                            lastIndex = index;
                         });
+                        for(var i = 0;i<=4-tr.find("td").length;i++){
+                            tr.append('<td></td>');
+                        }
                     }
                 });
             });
             tagList.on("click", "tr > td > span", function () {
-                search_callback($(this).attr('id'), $(this).text());
+                if($(this).attr('id') != null){
+                    search_callback($(this).attr('id'), $(this).text());
+                }
             });
             existsCancel();
         });

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

 <div class="wrap">
     <h2>收佣进度表</h2>
-    <form method="get">
+    <form method="get" class="form-horizontal">
         <input type="hidden" name="page" value="commissionList">
         {% import "selectOrganization.html" as macro %}
         {{ macro.selectOrganization("commission") }}
-        <div id="search_form">
-            <label for="year" class="hidden"></label>
-            <select name="year" id="year">
-                <option value="2015">2015</option>
-                <option value="2016">2016</option>
-            </select>
-            <label for="month" class="hidden"></label>
-            <select name="month" id="month">
-                <option value="-1">请选择月份</option>
-                <option value="1">一月</option>
-                <option value="2">二月</option>
-                <option value="3">三月</option>
-                <option value="4">四月</option>
-                <option value="5">五月</option>
-                <option value="6">六月</option>
-                <option value="7">七月</option>
-                <option value="8">八月</option>
-                <option value="9">九月</option>
-                <option value="10">十月</option>
-                <option value="11">十一月</option>
-                <option value="12">十二月</option>
-            </select>
-            <label for="search_consultant_name" class="hidden"></label>
-            <input type="text" placeholder="请输入置业顾问" name="search_consultant_name" id="search_consultant_name"
-                   value="{{ req.search_consultant_name }}">
+        <div class="row" id="search_form">
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">年份</span>
+                    <label for="year" class="hidden"></label>
+                    <select name="year" id="year" class="form-control widthAuto">
+                        <option value="2015">2015</option>
+                        <option value="2016">2016</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">月份</span>
+                    <select name="month" id="month" class="form-control widthAuto">
+                        <option value="-1">请选择月份</option>
+                        <option value="1">一月</option>
+                        <option value="2">二月</option>
+                        <option value="3">三月</option>
+                        <option value="4">四月</option>
+                        <option value="5">五月</option>
+                        <option value="6">六月</option>
+                        <option value="7">七月</option>
+                        <option value="8">八月</option>
+                        <option value="9">九月</option>
+                        <option value="10">十月</option>
+                        <option value="11">十一月</option>
+                        <option value="12">十二月</option>
+                    </select>
+                    <label for="month" class="hidden"></label>
+                </div>
+            </div>
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">置业顾问</span>
+                    <label for="search_consultant_name" class="hidden"></label>
+                    <input type="text" class="form-control" name="search_consultant_name" id="search_consultant_name"
+                           value="{{ req.search_consultant_name }}">
+                </div>
+            </div>
             <input type="submit" id="submit" class="btn btn-success" value="搜索">
         </div>
     </form>

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

@@ -11,7 +11,7 @@
     <div class="alert alert-danger" role="alert" id="messageBox1" style="display:none;">
 
     </div>
-    <form id="contract" action="" method="POST" enctype="multipart/form-data" class="form-inline">
+    <form id="contract" action="" method="POST" enctype="multipart/form-data">
         <div class="row">
             <div class="col-xs-10">
                 <!-- Nav tabs -->
@@ -30,80 +30,105 @@
                         <br />
                         <div class="row addBorder">
                             <div class="col-md-6" class="form-control">
-                                <label for="business" class="color-red">业务：</label>
-                                <select name="business" id="business" {{disabled}}>
-                                    <option value="-1">请选择</option>
-                                    <option value="0">新房</option>
-                                    <option value="1">二手房</option>
-                                    <option value="2">租房</option>
-                                </select>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">业务</span>
+                                    <select name="business" id="business" class="form-control" {{disabled}}>
+                                        <option value="-1">请选择</option>
+                                        <option value="0">新房</option>
+                                        <option value="1">二手房</option>
+                                        <option value="2">租房</option>
+                                    </select>
+                                </div>
                             </div>
                             {% if result.contractId %}
                             <div class="col-md-6" class="form-control">
-                                <label>合同编号：</label>
-                                <label>{{result.contractId}}</label>
+                                <div class="input-group">
+                                    <span class="input-group-addon">合同编号</span>
+                                    <input type="text" value="{{result.contractId}}" class="form-control" disabled>
+                                </div>
                             </div>
                             {% endif %}
                         </div>
                         <br />
                         <div class="row addBorder">
                             <div class="col-md-6">
-                                <label for="houseNumberText" class="color-red">房源编号：</label>
-                                <input name="houseNumberText" type="text" value="{{result.houseNumber}}" class="form-control" disabled>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">房源编号</span>
+                                    <input name="houseNumberText" type="text" value="{{result.houseNumber}}" class="form-control" disabled>
+                                </div>
                             </div>
                             <div class="col-md-6">
-                                <label for="addressText" class="color-red">房源地址：</label>
-                                <input name="addressText" type="text" value="{{result.address}}" class="form-control"  style="width:60%;" disabled>
-                                <input type="button" id="select_house" value="选择" data-toggle="modal" data-target="#myModal" class="form-control" {{disabled}}>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">房源地址</span>
+                                    <input name="addressText" type="text" value="{{result.address}}" class="form-control" disabled>
+                                    <span id="select_house" class="input-group-addon" data-toggle="modal" data-target="#myModal{{disabled}}">选择</span>
+                                </div>
                             </div>
                         </div>
                         <br />
                         <div class="row addBorder">
                             <div class="col-md-6">
-                                <label for="customerNumberText" class="color-red">客源编号：</label>
-                                <input name="customerNumberText" type="text" value="{{result.customerNumber}}" class="form-control"  style="width:60%;" disabled>
-                                <input type="button" id="select_customer" value="选择" data-toggle="modal" data-target="#addCustomer" class="form-control" {{disabled}}>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">客源编号</span>
+                                    <input name="customerNumberText" type="text" value="{{result.customerNumber}}" class="form-control" disabled>
+                                    <span id="select_customer" class="input-group-addon" data-toggle="modal" data-target="#addCustomer{{disabled}}">选择</span>
+                                </div>
                             </div>
                             <div class="col-md-6">
-                                <label for="signedDate" class="color-red">签约日：</label>
-                                <input name="signedDate" type="date" value="{{result.signedDate}}" class="form-control">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">签约日</span>
+                                    <input name="signedDate" type="date" value="{{result.signedDate}}" class="form-control">
+                                </div>
                             </div>
                         </div>
                         <br />
                         <div class="row addBorder">
                             <div class="col-md-6">
-                                <label for="permitNumber" class="color-red">产证：</label>
-                                <input name="permitNumber" id="permitNumber" type="text" value="{{result.permitNumber}}" class="form-control">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">产证</span>
+                                    <input name="permitNumber" id="permitNumber" type="text" value="{{result.permitNumber}}" class="form-control">
+                                </div>
                             </div>
                             <div class="col-md-6">
-                                <label for="area" class="color-red">面积：</label>
-                                <input name="area" id="area" type="text" value="{{result.area}}" class="form-control">平方米
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">面积</span>
+                                    <input name="area" id="area" type="text" value="{{result.area}}" class="form-control">
+                                    <span class="input-group-addon">㎡</span>
+                                </div>
                             </div>
                         </div>
                         <br />
                         <div class="row addBorder">
                             <div class="col-md-6">
-                                <label for="price" class="color-red">合同金额：</label>
-                                <input name="price" id="price" type="text" value="{{result.price}}" class="form-control" {{disabled}}>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">合同金额</span>
+                                    <input name="price" id="price" type="text" value="{{result.price}}" class="form-control" {{disabled}}>
+                                </div>
                             </div>
                             <div class="col-md-6">
-                                <label for="managerId" class="color-red">主管：</label>
-                                <select name="managerId" id="managerId" class="form-control">
-                                    {% for item in managers %}
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">主管</span>
+                                    <select name="managerId" id="managerId" class="form-control">
+                                        {% for item in managers %}
                                         <option  value="{{item.ID}}">{{item.display_name}}</option>
-                                    {% endfor%}
-                                </select>
+                                        {% endfor%}
+                                    </select>
+                                </div>
                             </div>
                         </div>
                         <br />
                         <div class="row addBorder">
                             <div class="col-md-6">
-                                <label for="paymentMethod">付款方式：</label>
-                                <textarea name="paymentMethod" id="paymentMethod" rows="8" class="form-control" style="width:80%;">{{result.paymentMethod}}</textarea>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">付款方式</span>
+                                    <textarea name="paymentMethod" id="paymentMethod" rows="8" class="form-control">{{result.paymentMethod}}</textarea>
+                                </div>
                             </div>
                             <div class="col-md-6">
-                                <label for="codicil">附加条款：</label>
-                                <textarea name="codicil" id="codicil" rows="8" class="form-control" style="width:80%;">{{result.codicil}}</textarea>
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">附加条款</span>
+                                    <textarea name="codicil" id="codicil" rows="8" class="form-control">{{result.codicil}}</textarea>
+                                </div>
                             </div>
                         </div>
                         <br />
@@ -143,48 +168,68 @@
                             <div class="col-md-6 ">
                                 <h4 class="addBorder">业主信息</h4>
                                 <p class="addBorder">
-                                    <label for="oName" class="color-red">业主姓名：</label>
-                                    <input name="oName" id="oName" type="text" value="{{result.oName}}" class="form-control ">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">业主姓名</span>
+                                        <input name="oName" id="oName" type="text" value="{{result.oName}}" class="form-control ">
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="oPhone" class="color-red">手机：</label>
-                                    <input name="oPhone" id="oPhone" type="text" value="{{result.oPhone}}" class="form-control" {{disabled}}>
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">手机</span>
+                                        <input name="oPhone" id="oPhone" type="text" value="{{result.oPhone}}" class="form-control" {{disabled}}>
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="oID" class="color-red">身份证：</label>
-                                    <input name="oID" id="oID" type="text" value="{{result.oID}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">身份证</span>
+                                        <input name="oID" id="oID" type="text" value="{{result.oID}}" class="form-control">
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="oAddress" class="color-red">地址：</label>
-                                    <input name="oAddress" id="oAddress" type="text" value="{{result.oAddress}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">地址</span>
+                                        <input name="oAddress" id="oAddress" type="text" value="{{result.oAddress}}" class="form-control">
+                                    </div>
                                 </p>
                                 <h4 class="addBorder">贷款</h4>
                                 <p class="addBorder">
-                                    <label for="oPayBack" class="color-red">偿还形式：</label>
-                                    <input name="oPayBack" id="oPayBack" type="text" value="{{result.oPayBack}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">偿还形式</span>
+                                        <input name="oPayBack" id="oPayBack" type="text" value="{{result.oPayBack}}" class="form-control">
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="oMoney" class="color-red">偿还金额：</label>
-                                    <input name="oMoney" id="oMoney" type="text" value="{{result.oMoney}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">偿还金额</span>
+                                        <input name="oMoney" id="oMoney" type="text" value="{{result.oMoney}}" class="form-control">
+                                    </div>
                                 </p>
                             </div>
                             <div class="col-md-6">
                                 <h4 class="addBorder">买方信息</h4>
                                 <p class="addBorder">
-                                    <label for="cName" class="color-red">买方姓名：</label>
-                                    <input name="cName" id="cName" type="text" value="{{result.cName}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">买方姓名</span>
+                                        <input name="cName" id="cName" type="text" value="{{result.cName}}" class="form-control">
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="cPhone" class="color-red">手机：</label>
-                                    <input name="cPhone" id="cPhone" type="text" value="{{result.cPhone}}" class="form-control" {{disabled}}>
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">手机</span>
+                                        <input name="cPhone" id="cPhone" type="text" value="{{result.cPhone}}" class="form-control" {{disabled}}>
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="cID" class="color-red">身份证：</label>
-                                    <input name="cID" id="cID" type="text" value="{{result.cID}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">身份证</span>
+                                        <input name="cID" id="cID" type="text" value="{{result.cID}}" class="form-control">
+                                    </div>
                                 </p>
                                 <p class="addBorder">
-                                    <label for="cAddress" class="color-red">地址：</label>
-                                    <input name="cAddress" id="cAddress" type="text" value="{{result.cAddress}}" class="form-control">
+                                    <div class="input-group">
+                                        <span class="input-group-addon color-red">地址</span>
+                                        <input name="cAddress" id="cAddress" type="text" value="{{result.cAddress}}" class="form-control">
+                                    </div>
                                 </p>
                             </div>
                         </div>
@@ -194,56 +239,56 @@
                         <div class="row addBorder">
                             <div class="col-md-8">
                                 <div id="staffImg_buy" >
-                                    {% if consultant[0] %}
-                                    <div style = "display: inline-block;">
-                                        <div class="row" style="margin-bottom:10px">
-                                            <div class="col-md-3">
-                                                <label>员工：</label>
-                                            </div>
-                                            <div class="col-md-5">
-                                                <img height="100" width="100" src="{{ consultant[0].imageUrl }}" style="margin-right: 50px">
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label>{{ consultant[0].name }}</label>
-                                            </div>
-                                        </div>
-                                        <div class="row" style="margin-top: 10px;">
-                                            <div class="col-md-12">
-                                                <label>部门：</label><label>{{ consultant[0].branchName }}</label>
-                                            </div>
-                                        </div>
-                                        <input type="hidden" name="buy[consultantId]" value="{{ consultant[0].consultantId }}">
+                                    <div class="input-group">
+                                        <span class="input-group-addon">员工</span>
+                                        <input type="text" class="form-control" style="width:100px;" value="{{ consultant[0].name }}" readonly />
+                                        {% if consultant[0] is null %}
+                                        <button type="button" class="btn btn-success" data-toggle="modal" data-target="#myConsultant" id="recConsultantBt_buy" {{disabled}}>
+                                        选择员工
+                                        </button>
+                                        {% endif %}
                                     </div>
-                                    {% else %}
-                                    <button type="button" class="btn btn-success" data-toggle="modal" data-target="#myConsultant" id="recConsultantBt_sell" {{disabled}}>
-                                    选择员工
-                                    </button>
-                                    {% endif %}
+                                    <div>
+                                        <img height="100" width="100" style="margin-left: 85px;margin-top: 10px;margin-bottom: 10px;{% if consultant[0] is null %}display:none;{% endif %}" src="{{ consultant[0].imageUrl }}">
+                                    </div>
+                                    <br />
+                                    <div class="input-group">
+                                        <span class="input-group-addon">部门</span>
+                                        <input type="text" class="form-control" style="width:100px;" value="{{ consultant[0].branchName }}" readonly />
+                                    </div>
+                                    <input type="hidden" name="buy[consultantId]" value="{{ consultant[0].consultantId }}">
                                 </div>
                             </div>
                         </div>
                         <br/>
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <label for="businessType" class="color-red">应佣类型：</label>
-                                <select name="businessType" {{disabled}}>
-                                    <option value="0">买卖</option>
-                                    <option value="1">租赁</option>
-                                </select>
+                            <div class="col-md-4">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">应佣类型</span>
+                                    <select name="businessType" {{disabled}}>
+                                        <option value="0">买卖</option>
+                                        <option value="1">租赁</option>
+                                    </select>
+                                </div>
                             </div>
                         </div>
                         <br/>
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <label for="buy[accounts]" class="color-red">应收佣金：</label>
-                                <input name="buy[accounts]" id="accounts_buy" type="text"  class="form-control" {% if commission[0] %}value = "{{commission[0].accounts}}" readonly {% endif %}>元
+                            <div class="col-md-4">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">应收佣金</span>
+                                    <input name="buy[accounts]" id="accounts_buy" type="text"  class="form-control" {% if commission[0] %}value = "{{commission[0].accounts}}" readonly {% endif %}>
+                                    <span class="input-group-addon">元</span>
+                                </div>
                             </div>
                         </div>
                         <br/>
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <label for="buy[mtime]" class="color-red">应收时间：</label>
-                                <input name="buy[mtime]" type="date"  class="form-control" {% if commission[0] %}value = "{{commission[0].mtime}}" readonly {% endif %}>
+                            <div class="col-md-4">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">应收时间</span>
+                                    <input name="buy[mtime]" type="date"  class="form-control" {% if commission[0] %}value = "{{commission[0].mtime}}" readonly {% endif %}>
+                                </div>
                             </div>
                         </div>
                         <br/>
@@ -290,58 +335,56 @@
                     <div role="tabpanel" class="tab-pane" id="sellCommissionManage">
                         <br />
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <div id="staffImg_sell">
-                                    {% if consultant[1] %}
-                                    <div style = "display: inline-block;">
-                                        <div class="row" style="margin-bottom:10px">
-                                            <div class="col-md-3">
-                                                <label>员工：</label>
-                                            </div>
-                                            <div class="col-md-5">
-                                                <img height="100" width="100" src="{{ consultant[1].imageUrl }}" style="margin-right: 50px">
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label>{{ consultant[1].name }}</label>
-                                            </div>
-                                        </div>
-                                        <div class="row" style="margin-top: 10px;">
-                                            <div class="col-md-12">
-                                                <label>部门：</label><label>{{ consultant[1].branchName }}</label>
-                                            </div>
-                                        </div>
-                                        <input type="hidden" name="sell[consultantId]" value="{{ consultant[1].consultantId }}">
-                                    </div>
-                                    {% else %}
-                                    <button type="button" class="btn btn-success" data-toggle="modal" data-target="#myConsultant" id="recConsultantBt_sell" {{disabled}}>
-                                    选择员工
-                                    </button>
+                            <div class="col-md-4" id="staffImg_sell">
+                                <div class="input-group">
+                                    <span class="input-group-addon">员工</span>
+                                    <input type="text" class="form-control" style="width:100px;" value="{{ consultant[1].name }}" readonly />
+                                    {% if consultant[1] is null %}
+                                        <button type="button" class="btn btn-success" data-toggle="modal" data-target="#myConsultant" id="recConsultantBt_sell" {{disabled}}>
+                                        选择员工
+                                        </button>
                                     {% endif %}
                                 </div>
+                                <div>
+                                    <img height="100" width="100" style="margin-left: 85px;margin-top: 10px;margin-bottom: 10px;{% if consultant[1] is null %}display:none;{% endif %}" src="{{ consultant[1].imageUrl }}">
+                                </div>
+                                <br />
+                                <div class="input-group">
+                                    <span class="input-group-addon">部门</span>
+                                    <input type="text" class="form-control" style="width:100px;" value="{{ consultant[1].branchName }}" readonly />
+                                </div>
+                                <input type="hidden" name="sell[consultantId]" value="{{ consultant[1].consultantId }}">
                             </div>
                         </div>
                         <br/>
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <label for="businessType" class="color-red">应佣类型：</label>
-                                <select name="businessType" {{disabled}}>
-                                    <option value="0">买卖</option>
-                                    <option value="1">租赁</option>
-                                </select>
+                            <div class="col-md-4">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">应佣类型</span>
+                                    <select name="businessType" {{disabled}}>
+                                        <option value="0">买卖</option>
+                                        <option value="1">租赁</option>
+                                    </select>
+                                </div>
                             </div>
                         </div>
                         <br/>
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <label for="sell[accounts]" class="color-red">应收佣金：</label>
-                                <input name="sell[accounts]" id="accounts_sell" type="text"  class="form-control" {% if commission[1] %}value = "{{commission[1].accounts}}" readonly {% endif %}>元
+                            <div class="col-md-4">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">应收佣金</span>
+                                    <input name="sell[accounts]" id="accounts_sell" type="text"  class="form-control" {% if commission[1] %}value = "{{commission[1].accounts}}" readonly {% endif %}>
+                                    <span class="input-group-addon">元</span>
+                                </div>
                             </div>
                         </div>
                         <br/>
                         <div class="row addBorder">
-                            <div class="col-md-8">
-                                <label for="sell[mtime]" class="color-red">应收时间：</label>
-                                <input name="sell[mtime]" type="date"  class="form-control" {% if commission[1] %}value = "{{commission[1].mtime}}" readonly {% endif %}>
+                            <div class="col-md-4">
+                                <div class="input-group">
+                                    <span class="input-group-addon color-red">应收时间</span>
+                                    <input name="sell[mtime]" type="date"  class="form-control" {% if commission[1] %}value = "{{commission[1].mtime}}" readonly {% endif %}>
+                                </div>
                             </div>
                         </div>
                         <br/>
@@ -638,30 +681,12 @@
         }else{
             $("#oBroker").val(data.name);
         }
-        if($("#staffImg_"+type+" > div").length >0 ){
-            $("#staffImg_"+type+" > div").remove();
-        }
-        var row = $("<div>").addClass("row").css("margin-bottom","10px");
-        var row2 = $("<div>").addClass("row").css("margin-top","10px");
-        var left = $("<div>").addClass("col-md-3");
-        var label3 = $("<label>").append("员工：");
-        left.append(label3);
-        var mid = $("<div>").addClass("col-md-5");
-        var img = $("<img>").attr({"src":data.imageUrl,"height":100,"width":100,"style":"margin-right:50px"});
-        mid.append(img);
-        var mid2 =$("<div>").addClass("col-md-4");
-        var label = $("<label>").append(data.name);
-        mid2.append(label);
-
-        var div = $("<div>").addClass("col-md-12");
-        var branchName = $("<label>").html(data.branchName);
-        var label2 = $("<label>").append("部门：");
-        div.append(label2).append(branchName);
-        var recommendConsultant = $("<input>").attr({"type":"hidden","name":type+"[consultantId]","value":data.id});
-        row.append(left).append(mid).append(mid2);
-        row2.append(div);
-        var div2 = $("<div>").append(row).append(row2).append(recommendConsultant).css("display","inline-block");
-        clickButton.before(div2);
+        var inputs = $("#staffImg_"+type).find("input");
+        inputs.eq(0).val(data.name);
+        inputs.eq(1).val(data.branchName);
+        inputs.eq(2).val(data.id);
+        var image = $("#staffImg_"+type).find("img");
+        image.attr("src",data.imageUrl).show();
     }
     var i = 0;
     $("#contractPicture").click(function(){

wp-content/plugins/tospur/Admin/views/css/public.css

@@ -42,13 +42,20 @@ p[class^=col-]{
 /*#the-list > tr >.column-id{*/
     /*border-left: 0px;*/
 /*}*/
-
+.wp-list-table > thead > tr > th > a > span,
+.wp-list-table > tfoot > tr > th > a > span{
+    font-weight:bold;
+}
+.striped>tbody> {
+    background-color: #fff;
+}
 /*#cb,.wp-list-table > tfoot > tr > .column-cb{*/
     /*border-right: 0px;*/
 /*}*/
 
 .color-red{
     color: red;
+    font-weight: bold;
 }
 
 .nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover{
@@ -78,4 +85,24 @@ p[class^=col-]{
 
 th.sortable a span, th.sorted a span{
     float: none;
+}
+
+#wpcontent,body{
+    background-color: #fff;
+}
+
+select.form-control{
+    height:34px;
+}
+
+span.input-group-addon{
+    width:83px;
+}
+
+div.input-group{
+    width:100%;
+}
+.widthAuto.widthAuto,
+span.widthAuto{
+    width:auto;
 }
\ No newline at end of file

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

@@ -12,7 +12,7 @@
 <body>
 <h2 class="title">{{ title }}</h2>
 <div class="alert alert-danger" role="alert" id="error" style="display:none;"></div>
-<form action="" method="POST" enctype="multipart/form-data" id="customerForm" class="form-inline">
+<form action="" method="POST" enctype="multipart/form-data" id="customerForm" class="form-horizontal">
     <div class="row">
         <div class="col-md-11">
             <ul class="nav nav-tabs" role="tablist">
@@ -20,7 +20,7 @@
                     <a href="#customer" aria-controls="customer" role="tab" data-toggle="tab">客户信息</a>
                 </li>
                 <li role="presentation">
-                    <a href="#customer_tracking" aria-controls="customer_tracking" role="tab" data-toggle="tab">房源跟进</a>
+                    <a href="#customer_tracking" aria-controls="customer_tracking" role="tab" data-toggle="tab">客户跟进</a>
                 </li>
                 {% if role != 'zygw' %}
                 <li role="presentation">
@@ -122,7 +122,7 @@
                 errorLabelContainer: error,
                 submitHandler: function (form) {
                     var consultantImg = $('#consultantImg');
-                    if (consultantImg.length == 1 && consultantImg.find('p').length == 0) {
+                    if (consultantImg.length == 1 && consultantImg.find('div').length == 0) {
                         error.html('<label class="my-error-class">请选择置业顾问</label>');
                         error.show();
                     } else {

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

 <br>
-<div class="row addBorder">
-    <div class="col-md-10" id="demand_type">
-        <label for="character" class="color-red">需求类型：</label>
-        <input type="hidden" name="demand_type_require">
-        <input type="checkbox" name="new_house" id="new_house" value="{{ result.new_house }}" style="margin: 0;"{% if
-        result.new_house == 1 %} checked {% endif %}>
-        <label for="new_house">新房</label>
-        <input type="checkbox" name="secondHand_house" id="secondHand_house" value="{{ result.secondHand_house }}"
-               style="margin: 0;"{% if result.secondHand_house == 1 %} checked {% endif %}>
-        <label for="secondHand_house">二手房</label>
-        <input type="checkbox" name="rent_house" id="rent_house" value="{{ result.rent_house }}" style="margin: 0;"{% if
-        result.rent_house == 1 %} checked {% endif %}>
-        <label for="rent_house">租房</label>
+<div class="row form-group">
+    <div class="col-md-4" id="demand_type">
+        <div class="input-group">
+            <span class="input-group-addon color-red">需求类型</span>
+            <input type="hidden" name="demand_type_require">
+            <span class="input-group-addon widthAuto">
+                <input type="checkbox" name="new_house" id="new_house" value="{{ result.new_house }}" style="margin: 0;"{% if
+                result.new_house == 1 %} checked {% endif %}>
+                <span>新房</span>
+            </span>
+            <span class="input-group-addon widthAuto">
+                <input type="checkbox" name="secondHand_house" id="secondHand_house" value="{{ result.secondHand_house }}"
+                       style="margin: 0;"{% if result.secondHand_house == 1 %} checked {% endif %}>
+                <span>二手房</span>
+            </span>
+            <span class="input-group-addon widthAuto">
+                <input type="checkbox" name="rent_house" id="rent_house" value="{{ result.rent_house }}" style="margin: 0;"{% if
+                result.rent_house == 1 %} checked {% endif %}>
+                <span>租房</span>
+            </span>
+        </div>
     </div>
-</div>
-<br>
-<div class="row addBorder">
-    <div class="col-md-6">
-        <label for="character">性质：</label>
-        <select name="character" id="character" class="form-control">
-            <option value="公客">公客</option>
-            <option value="私客">私客</option>
-        </select>
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">性质</span>
+            <select name="character" id="character" class="form-control">
+                <option value="公客">公客</option>
+                <option value="私客">私客</option>
+            </select>
+        </div>
     </div>
-    <div class="col-md-6">
-        <label for="origin">来源：</label>
-        <select name="origin" id="origin" class="form-control">
-            <option value="来电">来电</option>
-            <option value="来访">来访</option>
-            <option value="扫街">扫街</option>
-            <option value="网络">网络</option>
-            <option value="派单">派单</option>
-            <option value="广告">广告</option>
-            <option value="陌拜">陌拜</option>
-            <option value="微信">微信</option>
-            <option value="内部推荐">内部推荐</option>
-            <option value="老带新">老带新</option>
-            <option value="租转售">租转售</option>
-            <option value="售转租">售转租</option>
-            <option value="盘源">盘源</option>
-            <option value="CALL客">CALL客</option>
-            <option value="其他">其他</option>
-        </select>
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">来源</span>
+            <select name="origin" id="origin" class="form-control">
+                <option value="来电">来电</option>
+                <option value="来访">来访</option>
+                <option value="扫街">扫街</option>
+                <option value="网络">网络</option>
+                <option value="派单">派单</option>
+                <option value="广告">广告</option>
+                <option value="陌拜">陌拜</option>
+                <option value="微信">微信</option>
+                <option value="内部推荐">内部推荐</option>
+                <option value="老带新">老带新</option>
+                <option value="租转售">租转售</option>
+                <option value="售转租">售转租</option>
+                <option value="盘源">盘源</option>
+                <option value="CALL客">CALL客</option>
+                <option value="其他">其他</option>
+            </select>
+        </div>
     </div>
 </div>
 <br>
 <div id="new_secondHand_house_input">
-    <div class="row addBorder">
-        <div class="col-md-6">
-            <label for="payment_mode">付款：</label>
-            <select name="payment_mode" id="payment_mode" class="form-control" disabled="disabled">
-                <option value="其它">其它</option>
-                <option value="商业贷款">商业贷款</option>
-                <option value="公积金贷款">公积金贷款</option>
-                <option value="组合贷款">组合贷款</option>
-                <option value="全款">全款</option>
-            </select>
+    <div class="row form-group">
+        <div class="col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon">付款</span>
+                <select name="payment_mode" id="payment_mode" class="form-control" disabled="disabled">
+                    <option value="其它">其它</option>
+                    <option value="商业贷款">商业贷款</option>
+                    <option value="公积金贷款">公积金贷款</option>
+                    <option value="组合贷款">组合贷款</option>
+                    <option value="全款">全款</option>
+                </select>
+            </div>
         </div>
-        <br>
-    </div>
-    <br>
-
-    <div class="row addBorder">
-        <div class="col-md-6">
-            <label>总价：</label>
-            <label for="min_totalPrice" class="hidden"></label>
-            <input type="text" name="min_totalPrice" id="min_totalPrice" value="{{ result.min_totalPrice }}"
-                   class="form-control" disabled="disabled" style="width:35%">
-            —
-            <label for="max_totalPrice" class="hidden"></label>
-            <input type="text" name="max_totalPrice" id="max_totalPrice" value="{{ result.max_totalPrice }}"
-                   class="form-control" disabled="disabled"  style="width:35%">
-            万
+        <div class="col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon">总价</span>
+                <label for="min_totalPrice" class="hidden"></label>
+                <input type="text" name="min_totalPrice" id="min_totalPrice" value="{{ result.min_totalPrice }}"
+                       class="form-control" disabled="disabled">
+                <span class="input-group-addon">～</span>
+                <label for="max_totalPrice" class="hidden"></label>
+                <input type="text" name="max_totalPrice" id="max_totalPrice" value="{{ result.max_totalPrice }}"
+                       class="form-control" disabled="disabled">
+                <span class="input-group-addon">万</span>
+            </div>
         </div>
-        <div class="col-md-6">
-            <label>单价：</label>
-            <label for="min_unitPrice" class="hidden"></label>
-            <input type="text" name="min_unitPrice" id="min_unitPrice" value="{{ result.min_unitPrice }}"
-                   class="form-control" disabled="disabled"  style="width:35%">
-            —
-            <label for="max_unitPrice" class="hidden"></label>
-            <input type="text" name="max_unitPrice" id="max_unitPrice" value="{{ result.max_unitPrice }}"
-                   class="form-control" disabled="disabled"  style="width:35%">
-            元/m²
+        <div class="col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon">单价</span>
+                <label for="min_unitPrice" class="hidden"></label>
+                <input type="text" name="min_unitPrice" id="min_unitPrice" value="{{ result.min_unitPrice }}"
+                       class="form-control" disabled="disabled">
+                <span class="input-group-addon">~</span>
+                <label for="max_unitPrice" class="hidden"></label>
+                <input type="text" name="max_unitPrice" id="max_unitPrice" value="{{ result.max_unitPrice }}"
+                       class="form-control" disabled="disabled">
+                <span class="input-group-addon">元/m²</span>
+            </div>
         </div>
     </div>
 </div>
 <br>
 <div id="rent_house_input">
-    <div class="row addBorder">
-        <div class="col-md-6">
-            <label>月租：</label>
-            <label for="min_rent" class="hidden"></label>
-            <input type="text" name="min_rent" id="min_rent" value="{{ result.min_rent }}" class="form-control"
-                   disabled="disabled"  style="width:35%">
-            —
-            <label for="max_rent" class="hidden"></label>
-            <input type="text" name="max_rent" id="max_rent" value="{{ result.max_rent }}" class="form-control"
-                   disabled="disabled"  style="width:35%">
-            元/月
+    <div class="row form-group">
+        <div class="col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon">月租</span>
+                <label for="min_rent" class="hidden"></label>
+                <input type="text" name="min_rent" id="min_rent" value="{{ result.min_rent }}" class="form-control"
+                       disabled="disabled">
+                <span class="input-group-addon">~</span>
+                <label for="max_rent" class="hidden"></label>
+                <input type="text" name="max_rent" id="max_rent" value="{{ result.max_rent }}" class="form-control"
+                       disabled="disabled">
+                <span class="input-group-addon">元/月</span>
+            </div>
         </div>
-        <div class="col-md-3">
-            <label for="rent">整租：</label>
-            <select name="rent" id="rent" class="form-control" disabled="disabled">
-                <option value="不限">不限</option>
-                <option value="整租">整租</option>
-                <option value="合租">合租</option>
-            </select>
+        <div class="col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon">整租</span>
+                <select name="rent" id="rent" class="form-control" disabled="disabled">
+                    <option value="不限">不限</option>
+                    <option value="整租">整租</option>
+                    <option value="合租">合租</option>
+                </select>
+            </div>
         </div>
-        <div class="col-md-3">
-            <label for="tenancy">租期：</label>
-            <select name="tenancy" id="tenancy" class="form-control" disabled="disabled">
-                <option value="不限">不限</option>
-                <option value="一个月">一个月</option>
-                <option value="三个月">三个月</option>
-                <option value="半年">半年</option>
-                <option value="一年">一年</option>
-                <option value="一年以上">一年以上</option>
-            </select>
+        <div class="col-md-4">
+            <div class="input-group">
+                <span class="input-group-addon">租期</span>
+                <select name="tenancy" id="tenancy" class="form-control" disabled="disabled">
+                    <option value="不限">不限</option>
+                    <option value="一个月">一个月</option>
+                    <option value="三个月">三个月</option>
+                    <option value="半年">半年</option>
+                    <option value="一年">一年</option>
+                    <option value="一年以上">一年以上</option>
+                </select>
+            </div>
         </div>
     </div>
 </div>

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

 <br>
-<div class="row addBorder">
-    <div class="col-md-12">
-        <label class="color-red">城市：</label>
-        <label for="baseCity"></label>
-        <select id="baseCity" name="baseCity" class="form-control">
-            <option value="-1">城市</option>
-            {% for item in city %}
-            <option {{ item.id == result.city_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-            {% endfor %}
-        </select>
-        <label for="baseAreaId"></label>
-        <select id="baseAreaId" name="baseAreaId" class="form-control">
-            <option value="-1">区域</option>
-            {% if district %}
-                {% for item in district %}
-                <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            {% endif %}
-        </select>
-        <label for="basePlateId"></label>
-        <select id="basePlateId" name="basePlateId" class="form-control">
-            <option value="-1">板块</option>
-            {% if district %}
-                {% for item in plate %}
-                <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            {% endif %}
-        </select>
+<div class="row form-group">
+    <div class="col-md-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">城市</span>
+            <span>
+                <select id="baseCity" name="baseCity" class="form-control"  style="width: 75px;">
+                    <option value="-1"> 城市</option>
+                    {% for item in city %}
+                    <option  {% if result.city_id %}{{ item.id == result.city_id ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                </select>
+            </span>
+            <span>
+                <select id="baseAreaId" name="baseAreaId" class="form-control" style="width: 100px;">
+                    <option value = "-1">区域</option>
+                    {% if district %}
+                    {% for item in district %}
+                    <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                    {% endif %}
+                </select>
+            </span>
+            <span>
+                <select id="basePlateId" name="basePlateId" class="form-control" style="width: 100px;">
+                    <option value = "-1">板块</option>
+                    {% if district %}
+                    {% for item in plate %}
+                    <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                    {% endif %}
+                </select>
+            </span>
+        </div>
     </div>
 </div>
 <br>
-<div class="row addBorder">
+<div class="row form-group">
     <div class="col-md-6">
-        <label for="community_name">小区名称：</label>
-        <input type="text" name="community_name" id="community_name" value="{{ result.community_name }}" class="form-control">
+        <div class="input-group">
+            <span class="input-group-addon">小区名称</span>
+            <input type="text" name="community_name" id="community_name" value="{{ result.community_name }}" class="form-control">
+        </div>
     </div>
     <div class="col-md-6">
-        <label for="baseRoom">建筑类型：</label>
-        <select id="baseRoom" name="baseRoom" class="form-control">
-            {% for item in room %}
-            <option {{ item.id == result.room_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-            {% endfor %}
-        </select>
+        <div class="input-group">
+            <span class="input-group-addon">建筑类型</span>
+            <select id="baseRoom" name="baseRoom" class="form-control">
+                {% for item in room %}
+                <option {{ item.id == result.room_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                {% endfor %}
+            </select>
+        </div>
     </div>
 </div>
 <br>
-<div class="row addBorder">
+<div class="row form-group">
     <div class="col-md-4">
-        <label for="check_in_time">入住时间：</label>
-        <input type="date" name="check_in_time" id="check_in_time" value="{{ result.check_in_time }}" class="form-control">
+        <div class="input-group">
+            <span class="input-group-addon">入住时间</span>
+            <input type="date" name="check_in_time" id="check_in_time" value="{{ result.check_in_time }}" class="form-control">
+        </div>
     </div>
-</div>
-<br>
-<div class="row addBorder">
-    <div class="col-md-10">
-        <label>面积：</label>
-        <label for="min_coveredArea" class="hidden"></label>
-        <input type="text" name="min_coveredArea" id="min_coveredArea" value="{{ result.min_coveredArea }}" class="form-control">
-        —
-        <label for="max_coveredArea" class="hidden"></label>
-        <input type="text" name="max_coveredArea" id="max_coveredArea" value="{{ result.max_coveredArea }}" class="form-control">
-        m²
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">面积</span>
+            <label for="min_coveredArea" class="hidden"></label>
+            <input type="text" name="min_coveredArea" id="min_coveredArea" value="{{ result.min_coveredArea }}" class="form-control">
+            <span class="input-group-addon">~</span>
+            <label for="max_coveredArea" class="hidden"></label>
+            <input type="text" name="max_coveredArea" id="max_coveredArea" value="{{ result.max_coveredArea }}" class="form-control">
+            <span class="input-group-addon">m²</span>
+        </div>
     </div>
-</div>
-<br>
-<div class="row addBorder">
-    <div class="col-md-10">
-        <label>楼层：</label>
-        <label for="min_floor" class="hidden"></label>
-        <input type="text" name="min_floor" id="min_floor" value="{{ result.min_floor }}" class="form-control">
-        —
-        <label for="max_floor" class="hidden"></label>
-        <input type="text" name="max_floor" id="max_floor" value="{{ result.max_floor }}" class="form-control">
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">楼层</span>
+            <label for="min_floor" class="hidden"></label>
+            <input type="text" name="min_floor" id="min_floor" value="{{ result.min_floor }}" class="form-control">
+            <span class="input-group-addon">~</span>
+            <label for="max_floor" class="hidden"></label>
+            <input type="text" name="max_floor" id="max_floor" value="{{ result.max_floor }}" class="form-control">
+            <span class="input-group-addon">m²</span>
+        </div>
     </div>
 </div>
 <br>
-<div class="row addBorder">
-    <div class="col-md-6">
-        <label for="propertyRight">产权：</label>
-        <select name="propertyRight" id="propertyRight" class="form-control">
-            <option value="不限" selected="selected">不限</option>
-            <option value="个人产权">个人产权</option>
-            <option value="单位产权">单位产权</option>
-            <option value="售后产权">售后产权</option>
-            <option value="家庭成员共有">家庭成员共有</option>
-            <option value="使用权">使用权</option>
-            <option value="小产权">小产权</option>
-            <option value="协议房">协议房</option>
-            <option value="私产">私产</option>
-            <option value="公产">公产</option>
-            <option value="合同发票">合同发票</option>
-            <option value="三联单">三联单</option>
-            <option value="其他">其他</option>
-        </select>
+<div class="row form-group">
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">产权</span>
+            <select name="propertyRight" id="propertyRight" class="form-control">
+                <option value="不限" selected="selected">不限</option>
+                <option value="个人产权">个人产权</option>
+                <option value="单位产权">单位产权</option>
+                <option value="售后产权">售后产权</option>
+                <option value="家庭成员共有">家庭成员共有</option>
+                <option value="使用权">使用权</option>
+                <option value="小产权">小产权</option>
+                <option value="协议房">协议房</option>
+                <option value="私产">私产</option>
+                <option value="公产">公产</option>
+                <option value="合同发票">合同发票</option>
+                <option value="三联单">三联单</option>
+                <option value="其他">其他</option>
+            </select>
+        </div>
     </div>
-    <div class="col-md-6">
-        <label for="decoration">装修：</label>
-        <select name="decoration" id="decoration" class="form-control">
-            <option value="不限" selected="selected">不限</option>
-            <option value="毛坯">毛坯</option>
-            <option value="简单装修">简单装修</option>
-            <option value="中等装修">中等装修</option>
-            <option value="精装修">精装修</option>
-            <option value="豪华装修">豪华装修</option>
-        </select>
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">装修</span>
+            <select name="decoration" id="decoration" class="form-control">
+                <option value="不限" selected="selected">不限</option>
+                <option value="毛坯">毛坯</option>
+                <option value="简单装修">简单装修</option>
+                <option value="中等装修">中等装修</option>
+                <option value="精装修">精装修</option>
+                <option value="豪华装修">豪华装修</option>
+            </select>
+        </div>
+    </div>
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">年代</span>
+            <select name="age" id="age" class="form-control">
+                <option value="不限" selected="selected">不限</option>
+                {% for item in age %}
+                <option value="{{ item }}">{{ item }}</option>
+                {% endfor %}
+            </select>
+        </div>
     </div>
 </div>
 <br>
-<div class="row addBorder">
-    <div class="col-md-6">
-        <label for="age">年代：</label>
-        <select name="age" id="age" class="form-control">
-            <option value="不限" selected="selected">不限</option>
-            {% for item in age %}
-            <option value="{{ item }}">{{ item }}</option>
-            {% endfor %}
-        </select>
+<div class="row form-group">
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">朝向</span>
+            <select name="faceto" id="faceto" class="form-control">
+                <option value="不限" selected="selected">不限</option>
+                <option value="其他">其他</option>
+                <option value="东">东</option>
+                <option value="南">南</option>
+                <option value="西">西</option>
+                <option value="北">北</option>
+                <option value="东西">东西</option>
+                <option value="南北">南北</option>
+                <option value="南南">南南</option>
+                <option value="东南">东南</option>
+                <option value="东北">东北</option>
+                <option value="西南">西南</option>
+                <option value="西北">西北</option>
+            </select>
+        </div>
     </div>
-    <div class="col-md-6">
-        <label for="faceto">朝向：</label>
-        <select name="faceto" id="faceto" class="form-control">
-            <option value="不限" selected="selected">不限</option>
-            <option value="其他">其他</option>
-            <option value="东">东</option>
-            <option value="南">南</option>
-            <option value="西">西</option>
-            <option value="北">北</option>
-            <option value="东西">东西</option>
-            <option value="南北">南北</option>
-            <option value="南南">南南</option>
-            <option value="东南">东南</option>
-            <option value="东北">东北</option>
-            <option value="西南">西南</option>
-            <option value="西北">西北</option>
-        </select>
+    <div class="col-md-8">
+        <div class="input-group">
+            <span class="input-group-addon">户型</span>
+            <select name="bedroom" id="bedroom" class="form-control">
+                <option value="-1" selected="selected">不限</option>
+                <option value="0">0</option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+                <option value="5">5</option>
+                <option value="6">6</option>
+                <option value="7">7</option>
+                <option value="8">8</option>
+            </select>
+            <span class="input-group-addon">室</span>
+            <select name="hall" id="hall" class="form-control">
+                <option value="-1" selected="selected">不限</option>
+                <option value="0">0</option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+            </select>
+            <span class="input-group-addon">厅</span>
+            <select name="bathroom" id="bathroom" class="form-control">
+                <option value="-1" selected="selected">不限</option>
+                <option value="0">0</option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+            </select>
+            <span class="input-group-addon">卫</span>
+        </div>
     </div>
 </div>
 <br>
-<div class="row addBorder">
+<div class="row form-group">
     <div class="col-md-6">
-        <label>户型：</label>
-        <select name="bedroom" id="bedroom" class="form-control">
-            <option value="-1" selected="selected">不限</option>
-            <option value="0">0</option>
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-            <option value="5">5</option>
-            <option value="6">6</option>
-            <option value="7">7</option>
-            <option value="8">8</option>
-        </select>
-        <label for="bedroom">室</label>
-        <select name="hall" id="hall" class="form-control">
-            <option value="-1" selected="selected">不限</option>
-            <option value="0">0</option>
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-        </select>
-        <label for="hall">厅</label>
-        <select name="bathroom" id="bathroom" class="form-control">
-            <option value="-1" selected="selected">不限</option>
-            <option value="0">0</option>
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-        </select>
-        <label for="bathroom">卫</label>
-    </div>
-</div>
-<br>
-<div class="row addBorder">
-    <div class="col-md-8">
-        <label for="origin_remark">客源备注：</label><br>
-        <textarea name="origin_remark" id="origin_remark" rows="5" cols="50" class="form-control">{{ result.origin_remark }}</textarea>
+        <div class="input-group">
+            <span class="input-group-addon">客源备注</span>
+            <textarea name="origin_remark" id="origin_remark" rows="5" cols="50" class="form-control">{{ result.origin_remark }}</textarea>
+        </div>
     </div>
 </div>
\ No newline at end of file

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

 <br>
-<div class="row addBorder">
-    <div class="col-md-6">
-        <label for="name" class="color-red">姓名：</label>
-        <input type="text" name="name" id="name" value="{{ result.name }}" class="form-control">
+<div class="row form-group">
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon color-red">姓名</span>
+            <input type="text" name="name" id="name" value="{{ result.name }}" class="form-control">
+        </div>
     </div>
-    <div class="col-md-6">
-        <label for="customer_type">等级：</label>
-        <select name="customer_type" id="customer_type" class="form-control">
-            {% for item in customer_type %}
-            <option{% if(item.id == result.customer_type) %} selected="selected"{% endif %} value="{{ item.id }}">{{ item.value }}</option>
-            {% endfor %}
-        </select>
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon color-red">电话</span>
+            <input type="text" name="phone" id="phone" value="{{ result.phone }}" class="form-control">
+        </div>
     </div>
-</div>
-<br>
-<div class="row addBorder">
-    <div class="col-md-8">
-        <label for="phone" class="color-red">电话：</label>
-        <input type="text" name="phone" id="phone" value="{{ result.phone }}" class="form-control">
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-addon">等级</span>
+            <select name="customer_type" id="customer_type" class="form-control">
+                {% for item in customer_type %}
+                <option{% if(item.id == result.customer_type) %} selected="selected"{% endif %} value="{{ item.id }}">{{ item.value }}</option>
+                {% endfor %}
+            </select>
+        </div>
     </div>
 </div>
 <br>
-<div class="row addBorder">
-    <div class="col-md-8">
-        <label for="customer_remark">客户备注：</label><br>
-        <textarea name="customer_remark" id="customer_remark" rows="5" cols="50" class="form-control">{{ result.customer_remark }}</textarea>
+<div class="row form-group">
+    <div class="col-md-6">
+        <div class="input-group">
+            <span class="input-group-addon">客户备注</span>
+            <textarea name="customer_remark" id="customer_remark" rows="5" cols="50" class="form-control">{{ result.customer_remark }}</textarea>
+        </div>
     </div>
 </div>
 

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

 <div class="wrap">
     <h2>客户列表</h2>
-    <form method="get" id="search_form">
+    <form method="get" id="search_form" class="form-horizontal">
         <input type="hidden" name="page" value="customerList">
-        <div>
-            <input type="hidden" name="hasSearch" value="1"/>
-            {% if role != 'zygw' %}
-                {% import "selectOrganization.html" as macro %}
-                {{ macro.selectOrganization("customer") }}
-            {% endif %}
-            <label for="status" class="hidden"></label>
-            <select name="status" id="status">
-                <option value="-1">状态</option>
-                {% set customer_status_array = function('SearchDao::searchStatusType', 5) %}
-                {% for item in customer_status_array %}
-                <option {{ item.id == req.status ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <label for="customer_type" class="hidden"></label>
-            <select name="customer_type" id="customer_type">
-                <option value="-1">客户类型</option>
-                {% set customer_type_array = function('SearchDao::searchStatusType', 6) %}
-                {% for item in customer_type_array %}
-                <option {{ item.id == req.customer_type ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <label for="demand_type" class="hidden"></label>
-            <select name="demand_type" id="demand_type">
-                <option value="-1">需求类型</option>
-                <option value="0">新房</option>
-                <option value="1">二手房</option>
-                <option value="2">租房</option>
-            </select>
-            <label for="listCity" class="hidden"></label>
-            <select id="listCity" name="listCity">
-                <option value="-1"> 城市</option>
-                {% for item in city %}
-                <option {{ item.id == req.listCity ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <label for="listDistrict" class="hidden"></label>
-            <select id="listDistrict" name="listDistrict">
-                <option value="-1">区域</option>
-                {% set district = function('SearchDao::searchCity', req.listCity) %}
-                {% if district %}
-                {% for item in district %}
-                <option {{ item.id == req.listDistrict ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            <label for="listPlate" class="hidden"></label>
-            <select id="listPlate" name="listPlate">
-                <option value="-1">板块</option>
-                {% set plate = function('SearchDao::searchCity', req.listCity, req.listDistrict) %}
-                {% if plate %}
-                {% for item in plate %}
-                <option {{ item.id == req.listPlate ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            <label for="totalPrice" class="hidden"></label>
-            <select id="totalPrice" name="totalPrice" class="hidden">
-                <option value="-1">总价</option>
-                {% set dicTotalPrice = function('SearchDao::searchTotalPrice', req.listCity) %}
-                {% if dicTotalPrice %}
-                {% for item in dicTotalPrice %}
-                <option {{ item.value == req.totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            <label for="rentalPrice" class="hidden"></label>
-            <select id="rentalPrice" name="rentalPrice" class="hidden">
-                <option value ="-1">月租</option>
-                {% set dicRentalPrice = function('SearchDao::searchRentalPrice', req.listCity) %}
-                {% if dicRentalPrice %}
-                {% for item in dicRentalPrice %}
-                <option {{ item.value == req.rentalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            <label for="buildProperty" class="hidden"></label>
-            <select id="buildProperty" name="buildProperty">
-                <option value="-1">房型</option>
-                {% set buildProperty_array = function('SearchDao::searchBuildProperty') %}
-                {% for item in buildProperty_array %}
-                <option {{ item.id == req.buildProperty ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <label for="acreage" class="hidden"></label>
-            <select id="acreage" name="acreage">
-                <option value="-1">面积</option>
-                {% if req.listCity != null %}
-                    {% set dicArea = function('SearchDao::searchArea', req.listCity) %}
-                    {% if dicArea %}
-                    {% for item in dicArea %}
-                    <option {{ item.value == req.acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                    {% endfor %}
-                    {% endif %}
-                {% endif %}
-            </select>
+        <input type="hidden" name="hasSearch" value="1"/>
+        {% if role != 'zygw' %}
+        {% import "selectOrganization.html" as macro %}
+        {{ macro.selectOrganization("customer") }}
+        {% endif %}
+        <div class="row">
+            <div class="col-md-12">
+                <div class="input-group">
+                    <span class="input-group-addon">筛选</span>
+                    <label for="status" class="hidden"></label>
+                    <select name="status" id="status">
+                        <option value="-1">状态</option>
+                        {% set customer_status_array = function('SearchDao::searchStatusType', 5) %}
+                        {% for item in customer_status_array %}
+                        <option {{ item.id == req.status ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    <label for="customer_type" class="hidden"></label>
+                    <select name="customer_type" id="customer_type">
+                        <option value="-1">客户类型</option>
+                        {% set customer_type_array = function('SearchDao::searchStatusType', 6) %}
+                        {% for item in customer_type_array %}
+                        <option {{ item.id == req.customer_type ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    <label for="demand_type" class="hidden"></label>
+                    <select name="demand_type" id="demand_type">
+                        <option value="-1">需求类型</option>
+                        <option value="0">新房</option>
+                        <option value="1">二手房</option>
+                        <option value="2">租房</option>
+                    </select>
+                    <label for="listCity" class="hidden"></label>
+                    <select id="listCity" name="listCity">
+                        <option value="-1"> 城市</option>
+                        {% for item in city %}
+                        <option {{ item.id == req.listCity ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    <label for="listDistrict" class="hidden"></label>
+                    <select id="listDistrict" name="listDistrict">
+                        <option value="-1">区域</option>
+                        {% set district = function('SearchDao::searchCity', req.listCity) %}
+                        {% if district %}
+                        {% for item in district %}
+                        <option {{ item.id == req.listDistrict ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    <label for="listPlate" class="hidden"></label>
+                    <select id="listPlate" name="listPlate">
+                        <option value="-1">板块</option>
+                        {% set plate = function('SearchDao::searchCity', req.listCity, req.listDistrict) %}
+                        {% if plate %}
+                        {% for item in plate %}
+                        <option {{ item.id == req.listPlate ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    <label for="totalPrice" class="hidden"></label>
+                    <select id="totalPrice" name="totalPrice" class="hidden">
+                        <option value="-1">总价</option>
+                        {% set dicTotalPrice = function('SearchDao::searchTotalPrice', req.listCity) %}
+                        {% if dicTotalPrice %}
+                        {% for item in dicTotalPrice %}
+                        <option {{ item.value == req.totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    <label for="rentalPrice" class="hidden"></label>
+                    <select id="rentalPrice" name="rentalPrice" class="hidden">
+                        <option value ="-1">月租</option>
+                        {% set dicRentalPrice = function('SearchDao::searchRentalPrice', req.listCity) %}
+                        {% if dicRentalPrice %}
+                        {% for item in dicRentalPrice %}
+                        <option {{ item.value == req.rentalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    <label for="buildProperty" class="hidden"></label>
+                    <select id="buildProperty" name="buildProperty">
+                        <option value="-1">房型</option>
+                        {% set buildProperty_array = function('SearchDao::searchBuildProperty') %}
+                        {% for item in buildProperty_array %}
+                        <option {{ item.id == req.buildProperty ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    <label for="acreage" class="hidden"></label>
+                    <select id="acreage" name="acreage">
+                        <option value="-1">面积</option>
+                        {% if req.listCity != null %}
+                        {% set dicArea = function('SearchDao::searchArea', req.listCity) %}
+                        {% if dicArea %}
+                        {% for item in dicArea %}
+                        <option {{ item.value == req.acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                        {% endif %}
+                    </select>
+                </div>
+            </div>
         </div>
-        <div style="margin-top: 10px;">
-            <input type="text" placeholder="请输入姓名" name="search_name" value="{{ req.search_name }}">
-            <input type="text" placeholder="请输入置业顾问" name="search_consultant_name" value="{{ req.search_consultant_name }}">
-            <input type="text" placeholder="请输入电话" name="search_phone" value="{{ req.search_phone }}">
+        <br />
+        <div class="row">
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">姓名</span>
+                    <input type="text" class="form-control" name="search_name" value="{{ req.search_name }}">
+                </div>
+            </div>
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">置业顾问</span>
+                    <input type="text" class="form-control" name="search_consultant_name" value="{{ req.search_consultant_name }}">
+                </div>
+            </div>
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">电话</span>
+                    <input type="text" class="form-control" name="search_phone" value="{{ req.search_phone }}">
+                </div>
+            </div>
         </div>
-        <div style="margin-top: 10px;">
-            <label>日期:</label>
-            <label for="search_min_time" class="hidden"></label>
-            <input type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
-            —
-            <label for="search_max_time" class="hidden"></label>
-            <input type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
-            <input type="submit" id="submit" class="btn btn-success" value="搜索">
+        <br />
+        <div class="row">
+            <div class="col-md-6">
+                <div class="input-group">
+                    <span class="input-group-addon">日期</span>
+                    <label for="search_min_time" class="hidden"></label>
+                    <input type="date" class="form-control" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
+                    <span class="input-group-addon">到</span>
+                    <label for="search_max_time" class="hidden"></label>
+                    <input type="date" class="form-control" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
+                </div>
+            </div>
+            <div class="col-md-2">
+                <input type="submit" id="submit" class="btn btn-success" value="搜索">
+            </div>
         </div>
     </form>
     <form method="post">

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

@@ -3,29 +3,43 @@
 
     <form method="get" id="search_form">
         <input type="hidden" name="page" value="customerTrackingList">
-
-        <div>
-            {% if role != 'zygw' %}
-                {% import "selectOrganization.html" as macro %}
-                {{ macro.selectOrganization("customerTracking") }}
-            {% endif %}
-            <label for="status_type" class="hidden"></label>
-            <select name="status_type" id="status_type">
-                <option value="-1">跟进类型</option>
-                {% for item in status %}
-                <option
-                {{ item.id == (req.status_type) ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <label for="search_consultant_name" class="hidden"></label>
-            <input type="text" placeholder="请输入置业顾问" name="search_consultant_name" id="search_consultant_name"
-                   value="{{ req.search_consultant_name }}">
-            <label>日期:</label>
-            <label for="search_min_time" class="hidden"></label>
-            <input type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
-            —
-            <label for="search_max_time" class="hidden"></label>
-            <input type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
+        {% if role != 'zygw' %}
+        {% import "selectOrganization.html" as macro %}
+        {{ macro.selectOrganization("customerTracking") }}
+        {% endif %}
+        <div class="row">
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">跟进类型</span>
+                    <label for="status_type" class="hidden"></label>
+                    <select name="status_type" id="status_type" class="form-control widthAuto">
+                        <option value="-1">请选择</option>
+                        {% for item in status %}
+                        <option
+                        {{ item.id == (req.status_type) ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </div>
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">置业顾问</span>
+                    <label for="status_type" class="hidden"></label>
+                    <label for="search_consultant_name" class="hidden"></label>
+                    <input class="form-control" type="text" name="search_consultant_name" id="search_consultant_name"
+                           value="{{ req.search_consultant_name }}">
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="input-group">
+                    <span class="input-group-addon">日期</span>
+                    <label for="search_min_time" class="hidden"></label>
+                    <input class="form-control" type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
+                    <span class="input-group-addon">~</span>
+                    <label for="search_max_time" class="hidden"></label>
+                    <input class="form-control" type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
+                </div>
+            </div>
             <input type="submit" id="submit" class="btn btn-success" value="搜索">
         </div>
     </form>

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

@@ -5,75 +5,77 @@
 {% endif %}
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="baseCity" class="control-label color-red" style="margin-right: 5px;width: auto;">城市:</label>
-        <span>
-            <select id="baseCity" name="baseCity" class="form-control"  style="width: 75px;">
-                <option value="-1"> 城市</option>
-                {% for item in city %}
-                <option  {% if result.city_id %}{{ item.id == result.city_id ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-        </span>
-        <span>
-            <select id="baseAreaId" name="baseAreaId" class="form-control" style="width: 100px;">
-                <option value = "-1">区域</option>
-                {% if district %}
-                {% for item in district %}
-                <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-        </span>
-        <span>
-            <select id="basePlateId" name="basePlateId" class="form-control" style="width: 100px;">
-                <option value = "-1">板块</option>
-                {% if district %}
-                {% for item in plate %}
-                <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-        </span>
+        <div class="input-group">
+            <span class="input-group-addon color-red">城市</span>
+            <span>
+                <select id="baseCity" name="baseCity" class="form-control"  style="width: 75px;">
+                    <option value="-1"> 城市</option>
+                    {% for item in city %}
+                    <option  {% if result.city_id %}{{ item.id == result.city_id ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                </select>
+            </span>
+            <span>
+                <select id="baseAreaId" name="baseAreaId" class="form-control" style="width: 100px;">
+                    <option value = "-1">区域</option>
+                    {% if district %}
+                    {% for item in district %}
+                    <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                    {% endif %}
+                </select>
+            </span>
+            <span>
+                <select id="basePlateId" name="basePlateId" class="form-control" style="width: 100px;">
+                    <option value = "-1">板块</option>
+                    {% if district %}
+                    {% for item in plate %}
+                    <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                    {% endif %}
+                </select>
+            </span>
+        </div>
+
     </div>
     <div class="col-xs-4">
-        <label for="address" class="control-label color-red">小区名称:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">小区名称</span>
             <input name="community_name" type="text" value="{{result.community_name}}" class="form-control">
-        </p>
-
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="address" class="control-label">地址:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">地址</span>
             <input name="address" type="text" value="{{result.address}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="suite" class="control-label color-red">门牌号码:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">门牌号码</span>
             <input name="suite" type="text" value="{{result.suite}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="floor" class="control-label color-red">楼层:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">楼层</span>
             <input name="floor" type="text" value="{{result.floor}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="totalFloor" class="control-label color-red">总层:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">总层</span>
             <input type="text" name="totalFloor" value="{{result.totalFloor}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="faceto" class="control-label">朝向:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">朝向</span>
             <select name="faceto" class="form-control">
                 <option value="其他">其他</option>
                 <option value="东">东</option>
@@ -87,19 +89,19 @@
                 <option value="西南">西南</option>
                 <option value="西北">西北</option>
             </select>
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="age" class="control-label">建筑年代:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">建筑年代</span>
             <select name="age" id="pageAge" class="form-control">
                 <option value="未知">未知</option>
             </select>
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="decoration" class="control-label">装修程度:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">装修程度</span>
             <select name="decoration" class="form-control">
                 <option value="毛坯">毛坯</option>
                 <option value="简单装修">简单装修</option>
@@ -107,13 +109,13 @@
                 <option value="精装修">精装修</option>
                 <option value="豪华装修">豪华装修</option>
             </select>
-        </p>
+        </div>
     </div>
 </div>
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="from" class="control-label color-red">户型:</label>
-        <span style="display: inline-block;width: 50px;">
+        <div class="input-group">
+            <span class="input-group-addon color-red">户型</span>
             <select name="roomNum" class="form-control">
                 <option value="0">0</option>
                 <option value="1">1</option>
@@ -125,9 +127,7 @@
                 <option value="7">7</option>
                 <option value="8">8</option>
             </select>
-        </span>
-        <span>室</span>
-        <span style="display: inline-block;width: 50px;">
+            <span class="input-group-addon">室</span>
             <select name="livingRoom" class="form-control">
                 <option value="0">0</option>
                 <option value="1">1</option>
@@ -135,9 +135,7 @@
                 <option value="3">3</option>
                 <option value="4">4</option>
             </select>
-        </span>
-        <span>厅</span>
-        <span style="display: inline-block;width: 50px;">
+            <span class="input-group-addon">厅</span>
             <select name="bathRoom" class="form-control">
                 <option value="0">0</option>
                 <option value="1">1</option>
@@ -145,61 +143,53 @@
                 <option value="3">3</option>
                 <option value="4">4</option>
             </select>
-        </span>
-        <span>卫</span>
-        <span style="display: inline-block;width: 50px;">
+            <span class="input-group-addon">卫</span>
             <select name="kitchen" class="form-control">
                 <option value="0">0</option>
                 <option value="1">1</option>
                 <option value="2">2</option>
                 <option value="3">3</option>
             </select>
-        </span>
-        <span>厨</span>
-        <span style="display: inline-block;width: 50px;">
+            <span class="input-group-addon">厨</span>
             <select name="balcony" class="form-control">
                 <option value="0">0</option>
                 <option value="1">1</option>
                 <option value="2">2</option>
                 <option value="3">3</option>
             </select>
-        </span>
-        <span>阳台</span>
+            <span class="input-group-addon">阳台</span>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="baseRoom" class="control-label">建筑类型:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">建筑类型</span>
             <select id="baseRoom" name="baseRoom" class="form-control">
                 {% for item in room %}
                 <option {{ item.id == result.room_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
                 {% endfor %}
             </select>
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="covered_area" class="control-label color-red">建筑面积:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">建筑面积</span>
             <input name="covered_area" type="text" value="{{result.covered_area}}" class="form-control">
-        </p>
-        <p class="col-xs-1" style="margin-top: 10px">
-            &nbsp;m<sup>2</sup>
-        </p>
+            <span class="input-group-addon">㎡</span>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="useArea" class="control-label">使用面积:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon">使用面积</span>
             <input type="text" name="useArea" value="{{result.useArea}}" class="form-control">
-        </p>
-        <p class="col-xs-1" style="margin-top: 10px">
-            &nbsp;m<sup>2</sup>
-        </p>
+            <span class="input-group-addon">㎡</span>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="structure" class="control-label">结构:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">使用面积</span>
             <select name="structure" class="form-control">
                 <option value="其他">其他</option>
                 <option value="框架">框架</option>
@@ -209,14 +199,14 @@
                 <option value="木混">木混</option>
                 <option value="砖木">砖木</option>
             </select>
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="propertyRight" class="control-label">产权:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">产权</span>
             <select name="propertyRight" class="form-control">
                 <option value="个人产权">个人产权</option>
                 <option value="单位产权">单位产权</option>
@@ -231,164 +221,160 @@
                 <option value="三联单">三联单</option>
                 <option value="其他">其他</option>
             </select>
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="propertyProof" class="control-label">产证:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">产证</span>
             <input type="text" name="propertyProof" value="{{result.propertyProof}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label class="control-label">
-            <input type="checkbox" id="keyCheck" {{ result.key?"checked":"" }} class="form-control"> 钥匙:
-        </label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon widthAuto"><input type="checkbox" id="keyCheck" {{ result.key?"checked":"" }} class="form-control widthAuto"></span>
+            <span class="input-group-addon"> 钥匙
+            </span>
             <input type="text" {% if not result.key %} disabled="true" {% endif %} id="key" name="key" value="{{result.key}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label class="control-label">
-            <input type="checkbox" id="garageCheck" {{ result.garage?"checked":"" }} class="form-control"> 车库:
-        </label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon widthAuto">
+                <input type="checkbox" id="garageCheck" {{ result.garage?"checked":"" }} class="form-control widthAuto">
+            </span>
+            <span class="input-group-addon"> 车库
+            </span>
             <input type="text" {% if not result.garage %}disabled="true"{% endif %} id="garage" name="garage" value="{{result.garage}}" class="form-control">
-        </p>
+        </div>
     </div>
 
     {% if house_type == 1 %}
     <div class="col-xs-4">
-        <label for="total_price" class="control-label color-red">总价:</label>
-        <p class="col-xs-5">
+        <div class="input-group">
+            <span class="input-group-addon color-red">总价</span>
             <input name="total_price" id="total_price" type="text" value="{{result.total_price}}" class="form-control">
-        </p>
-        <p class="col-xs-2" style="margin-top: 10px">
-            &nbsp;万元
-        </p>
+            <span class="input-group-addon">万元</span>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="average_price" class="control-label color-red">单价:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">单价</span>
             <input name="average_price" id="average_price" type="text" value="{{result.average_price}}" class="form-control">
-        </p>
-        <p class="col-xs-1" style="margin-top: 10px">
-            &nbsp;元
-        </p>
+            <span class="input-group-addon">元</span>
+        </div>
     </div>
     {% elseif house_type== 2 %}
     <div class="col-xs-4">
-        <label for="rent" class="control-label">租金:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">租金</span>
             <input name="rent" id="rent" type="text" value="{{result.rent}}" class="form-control">
-        </p>
-        <p class="col-xs-2" style="margin-top: 10px">&nbsp;元/月</p>
+            <span class="input-group-addon">元/月</span>
+        </div>
     </div>
     {% endif %}
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="entrustDay" class="control-label">委托日:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">委托日</span>
             <input type="date" name="entrustDay" id="entrustDay" value="{{result.entrustDay}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="deadLine" class="control-label">到期日:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">到期日</span>
             <input name="deadLine" type="date" id="deadLine" value="{{result.deadLine}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="street" class="control-label">街道:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">街道</span>
             <input type="text" name="street" value="{{result.street}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="traffic" class="control-label">交通线路:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">交通线路</span>
             <input name="traffic" type="text" value="{{result.traffic}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="periphery" class="control-label">周边配套:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">周边配套</span>
             <input name="periphery" type="text" value="{{result.periphery}}" class="form-control">
-        </p>
+        </div>
     </div>
     {% if house_type == 1%}
     <div class="col-xs-4">
-        <label for="property_money" class="control-label">物业费:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon">物业费</span>
             <input name="property_money" type="text" value="{{result.property_money}}" class="form-control" >
-        </p>
-        <p style="margin-top: 10px">
-            &nbsp;元
-        </p>
+            <span class="input-group-addon">元</span>
+        </div>
     </div>
     {% endif %}
 </div>
 {% if house_type == 1 %}
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="parking_spaces" class="control-label">车位:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">车位</span>
             <input type="text" name="parking_spaces" value="{{result.parking_spaces}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="mortgage" class="control-label">抵押:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">抵押</span>
             <input type="text" name="mortgage" value="{{result.mortgage}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 {% endif %}
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="matching_facilities" class="control-label">设施:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon">设施</span>
             <input type="text" name="matching_facilities" value="{{result.matching_facilities}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="location" class="control-label">地域坐标:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">地域坐标</span>
             <input name="location" id="location" type="text" value="{{result.location}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="overview" class="control-label color-red">房源点评:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon color-red">房源点评</span>
             <textarea name="overview" rows="4" cols="60" class="form-control">{{result.overview}}</textarea>
-        </p>
+        </div>
     </div>
 </div>
 
 {% if not houseId %}
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="owner_name" class="control-label color-red">业主姓名:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">业主姓名</span>
             <input name="owner_name" id="owner_name" type="text" value="" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="owner_phone" class="control-label color-red">业主电话:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">业主电话</span>
             <input name="owner_phone" id="owner_phone" type="text" value="" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 {% endif %}

wp-content/plugins/tospur/Admin/views/js/public.js

@@ -44,7 +44,7 @@
     }
 
     function existsCancel(){
-        $("#preview,#houseImg,#feature,#mark").on("click",".existsCancel,.featureCancel",function(){
+        $("#preview,#houseImg").on("click",".existsCancel,.featureCancel",function(){
             $(this).parent().remove();
         });
     }
@@ -93,14 +93,14 @@
 
     //控制推荐房源与置业顾问的个数
     function controlCommand(id,number,type){
-        var num  = $("#"+id+" > p").length;
+        var num  = $("#"+id+" > div").length;
         if(num>number){
             if(type==0){
                 alert("最多只能推荐3个房源");
             }else if(type==1){
                 alert("您只能推荐一位置业顾问");
             }
-            $("#"+id).find("p:last-child").remove();
+            $("#"+id).find("div:last-child").remove();
         }
     }
 

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

 {% block listBlock %}
 <div class="wrap">
     <h2> {% if house_type == 0%}新房列表{% elseif house_type == 1 %}二手房列表{% else %}租房房列表{% endif %}</h2>
-    <form id="scores-filter" method="GET" class="form-inline">
+    <form id="scores-filter" method="GET" class="form-horizontal">
         <br />
         {% if role != "zygw" %}
             {% import "selectOrganization.html" as macro %}
             {{ macro.selectOrganization("list") }}
         {% endif %}
-        <!-- For plugins, we also need to ensure that the form posts back to our current page -->
-        <div style="margin-bottom: 10px;">
-            <input type="hidden" name="page" value="{{page}}"/>
-            <select id="listCity" name="listCity" class="form-control">
-                <option value="-1"> 城市</option>
-                {% for item in city %}
-                <option  {% if cityId %}{{ item.id == cityId ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <select id="listDistrict" name="listDistrict"  class="form-control">
-                <option value="-1">区域</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"  class="form-control">
-                <option value="-1">板块</option>
-                {% if plate %}
-                {% for item in plate %}
-                <option {{ item.id == plateId ?"selected":"" }} value="{{ item.id }}">{% if not item.value %}不限{% else %}{{ item.value }}{% endif %}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            {% if house_type == 2%}
-            <select id="rentalPrice" name="rentalPrice"  class="form-control">
-                <option value ="">租金</option>
-                {% if dicRentalPrice %}
-                {% for item in dicRentalPrice %}
-                <option {{ item.value == rentalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            {% elseif house_type == 0 %}
-            <select id="averagePrice" name="averagePrice"  class="form-control">
-                <option value ="">单价</option>
-                {% if dicUnitPriceRange %}
-                {% for item in dicUnitPriceRange %}
-                <option {{ item.value == average_price ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            {% else%}
-            <select id="totalPrice" name="totalPrice"  class="form-control">
-                <option value ="">价格</option>
-                {% if dicTotalPrice %}
-                {% for item in dicTotalPrice %}
-                <option {{ item.value == totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            {% endif %}
-            {% if house_type == 0%}
-            <select id="room" name="room"  class="form-control">
-                <option value="-1">类型</option>
-                {% for item in room %}
-                <option {{ item.id == roomId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            {% endif %}
-            <select id="buildProperty" name="buildProperty"  class="form-control">
-                <option value="-1"> 房型</option>
-                {% for item in buildProperty %}
-                <option {{ item.id == buildPropertyId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-            <select id="acreage" name="acreage"  class="form-control">
-                <option value ="">面积</option>
-                {% if dicArea %}
-                {% for item in dicArea %}
-                <option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-            <select name="status" name="status"  class="form-control">
-                <option value="-3">状态</option>
-                {% for item in status%}
-                <option {{ item.id == statusId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
+        <div class="row">
+            <div class="col-md-12">
+                <div class="input-group">
+                    <span class="input-group-addon">筛选</span>
+                    <input type="hidden" name="page" value="{{page}}"/>
+                    <select id="listCity" name="listCity" class="form-control widthAuto">
+                        <option value="-1"> 城市</option>
+                        {% for item in city %}
+                        <option  {% if cityId %}{{ item.id == cityId ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    <select id="listDistrict" name="listDistrict" class="form-control widthAuto">
+                        <option value="-1">区域</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" class="form-control widthAuto">
+                        <option value="-1">板块</option>
+                        {% if plate %}
+                        {% for item in plate %}
+                        <option {{ item.id == plateId ?"selected":"" }} value="{{ item.id }}">{% if not item.value %}不限{% else %}{{ item.value }}{% endif %}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    {% if house_type == 2%}
+                    <select id="rentalPrice" name="rentalPrice" class="form-control widthAuto">
+                        <option value ="">租金</option>
+                        {% if dicRentalPrice %}
+                        {% for item in dicRentalPrice %}
+                        <option {{ item.value == rentalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    {% elseif house_type == 0 %}
+                    <select id="averagePrice" name="averagePrice" class="form-control widthAuto">
+                        <option value ="">单价</option>
+                        {% if dicUnitPriceRange %}
+                        {% for item in dicUnitPriceRange %}
+                        <option {{ item.value == average_price ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    {% else%}
+                    <select id="totalPrice" name="totalPrice" class="form-control widthAuto">
+                        <option value ="">价格</option>
+                        {% if dicTotalPrice %}
+                        {% for item in dicTotalPrice %}
+                        <option {{ item.value == totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    {% endif %}
+                    {% if house_type == 0%}
+                    <select id="room" name="room" class="form-control widthAuto">
+                        <option value="-1">类型</option>
+                        {% for item in room %}
+                        <option {{ item.id == roomId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    {% endif %}
+                    <select id="buildProperty" name="buildProperty" class="form-control widthAuto">
+                        <option value="-1"> 房型</option>
+                        {% for item in buildProperty %}
+                        <option {{ item.id == buildPropertyId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                    <select id="acreage" name="acreage" class="form-control widthAuto">
+                        <option value ="">面积</option>
+                        {% if dicArea %}
+                        {% for item in dicArea %}
+                        <option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
+                        {% endfor %}
+                        {% endif %}
+                    </select>
+                    <select name="status" name="status" class="form-control widthAuto">
+                        <option value="-3">状态</option>
+                        {% for item in status%}
+                        <option {{ item.id == statusId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </div>
         </div>
-        <div id="organization" style="margin-bottom: 10px;">
-            <label for="endDate">楼盘名:</label>
-            <input type="text" name="searchText"  class="form-control">
-            <label for="beginDate" >开始日期:</label>
-            <input type="date" name="beginDate" class="form-control" {% if req %}value="{{req.beginDate}}"{% endif %}>
-            <label for="endDate">结束日期:</label>
-            <input type="date" name="endDate" class="form-control"  {% if req %}value="{{req.endDate}}"{% endif %}>
-            <label for="stuff">员工:</label>
-            <input type="text" name="stuff" class="form-control"   {% if req %}value="{{req.stuff}}"{% endif %}>
-            <input type="hidden" name="hasSearch" value="1"/>
-            <input type="hidden" id="house_type" value="{{house_type}}"/>
-            <input type="submit" id="submit" class="btn btn-success" value="搜索">
+        <br />
+        <div class="row" id="organization">
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">楼盘名</span>
+                    <input type="text" name="searchText"  class="form-control"    {% if req %}value="{{req.searchText}}"{% endif %}>
+                </div>
+            </div>
+            <div class="col-md-2">
+                <div class="input-group">
+                    <span class="input-group-addon">置业顾问</span>
+                    <input type="text" name="stuff" class="form-control"   {% if req %}value="{{req.stuff}}"{% endif %}>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="input-group">
+                    <span class="input-group-addon">日期</span>
+                    <input type="date" name="beginDate" class="form-control" {% if req %}value="{{req.beginDate}}"{% endif %}>
+                    <span class="input-group-addon">到</span>
+                    <input type="date" name="endDate" class="form-control"  {% if req %}value="{{req.endDate}}"{% endif %}>
+                </div>
+            </div>
+            <div class="col-md-2">
+                <input type="hidden" name="hasSearch" value="1"/>
+                <input type="hidden" id="house_type" value="{{house_type}}"/>
+                <input type="submit" id="submit" class="btn btn-success" value="搜索">
+            </div>
         </div>
     </form>
     <form method="post">

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

@@ -13,7 +13,7 @@
     {% for item in list %}
     <tr>
         <td class="col-md-2 text-center">{{ item.status_name }}</td>
-        <td class="col-md-3 text-center">{{ item.name }}</td>
+        <td class="col-md-3 text-center">{% if item.name  %}{{item.name}}{% else %}{{ item.display_name }}{% endif %}</td>
         <td class="col-md-3 text-center">{{ item.time }}</td>
         <td class="col-md-4 text-center">{{ item.description }}</td>
     </tr>

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

@@ -3,86 +3,87 @@
 <br/>
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="baseCity" class="control-label color-red" style="margin-right: 5px;width: auto;">城市:</label>
-        <span>
-            <select id="baseCity" name="baseCity" class="form-control"  style="width: 75px;">
-                <option value="-1"> 城市</option>
-                {% for item in city %}
-                <option  {% if result.city_id %}{{ item.id == result.city_id ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-            </select>
-        </span>
-        <span>
-            <select id="baseAreaId" name="baseAreaId" class="form-control" style="width: 100px;">
-                <option value = "-1">区域</option>
-                {% if district %}
-                {% for item in district %}
-                <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-        </span>
-        <span>
-            <select id="basePlateId" name="basePlateId" class="form-control" style="width: 100px;">
-                <option value = "-1">板块</option>
-                {% if district %}
-                {% for item in plate %}
-                <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
-                {% endfor %}
-                {% endif %}
-            </select>
-        </span>
-    </div>
-    <div class="col-xs-4">
-        <label for="address" class="control-label color-red">小区名称:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">城市</span>
+            <span>
+                <select id="baseCity" name="baseCity" class="form-control"  style="width: 75px;">
+                    <option value="-1"> 城市</option>
+                    {% for item in city %}
+                    <option  {% if result.city_id %}{{ item.id == result.city_id ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                </select>
+            </span>
+            <span>
+                <select id="baseAreaId" name="baseAreaId" class="form-control" style="width: 100px;">
+                    <option value = "-1">区域</option>
+                    {% if district %}
+                    {% for item in district %}
+                    <option {{ item.id == result.district_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                    {% endif %}
+                </select>
+            </span>
+            <span>
+                <select id="basePlateId" name="basePlateId" class="form-control" style="width: 100px;">
+                    <option value = "-1">板块</option>
+                    {% if district %}
+                    {% for item in plate %}
+                    <option {{ item.id == result.plate_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
+                    {% endfor %}
+                    {% endif %}
+                </select>
+            </span>
+        </div>
+    </div>
+    <div class="col-xs-4">
+        <div class="input-group">
+            <span class="input-group-addon color-red">小区名称</span>
             <input name="community_name" type="text" value="{{result.community_name}}" class="form-control">
-        </p>
-
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="address" class="control-label color-red">地址:</label>
-        <p class="col-xs-7">
-        <input name="address" type="text" value="{{result.address}}" class="form-control">
-        </p>
+        <div class="input-group">
+            <span class="input-group-addon color-red">地址</span>
+            <input name="address" type="text" value="{{result.address}}" class="form-control">
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="developers" class="control-label">开发商:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">开发商</span>
             <input name="developers" type="text" value="{{result.developer}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="check_in_time" class="control-label">入住时间:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">入住时间</span>
             <input name="check_in_time" id="checkin" type="text" value="{{result.check_in_time}}" class="form-control" >
-        </p>
+        </div>
     </div>
     <div class="col-xs-4 ">
-        <label for="property_age" class="control-label">产权年限:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">产权年限</span>
             <input name="property_age" type="text" value="{{result.property_age}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="developers" class="control-label">建筑类型:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">建筑类型</span>
             <select id="baseRoom" name="baseRoom"  class="form-control">
                 {% for item in room %}
                 <option {{ item.id == result.room_id?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
                 {% endfor %}
             </select>
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="decoration" class="control-label">装修程度:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">装修程度</span>
             <select name="decoration" class="form-control">
                 <option value="毛坯">毛坯</option>
                 <option value="简单装修">简单装修</option>
@@ -90,127 +91,123 @@
                 <option value="精装修">精装修</option>
                 <option value="豪华装修">豪华装修</option>
             </select>
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="households" class="control-label">规划户数:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">规划户数</span>
             <input name="households" type="text" value="{{result.households}}" class="form-control"  >
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="covered_area" class="control-label color-red">建筑面积:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">建筑面积</span>
             <input name="covered_area" type="text" value="{{result.covered_area}}" class="form-control">
-        </p>
-        <p class="col-xs-1" style="margin-top: 10px">
-            &nbsp;m<sup>2</sup>
-        </p>
+            <span class="input-group-addon">㎡</span>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="volume_rate" class="control-label">容积率:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">容积率</span>
             <input name="volume_rate" type="text" value="{{result.volume_rate}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="greening_rate" class="control-label">绿化率:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">绿化率</span>
             <input name="greening_rate" type="text" value="{{result.greening_rate}}" class="form-control" >
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="property_management" class="control-label">物业公司:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">物业公司</span>
             <input name="property_management" type="text" value="{{result.property_management}}" class="form-control"  >
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="property_money" class="control-label color-red">物业费:</label>
-        <p class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon color-red">物业费</span>
             <input name="property_money" type="text" value="{{result.property_money}}" class="form-control" >
-        </p>
-        <p style="margin-top: 10px">
-            &nbsp;元
-        </p>
+            <span class="input-group-addon">元</span>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="parking_spaces" class="control-label">车位数:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">车位数</span>
             <input name="parking_spaces" type="text" value="{{result.parking_spaces}}" class="form-control" >
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="periphery" class="control-label">周边配套:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">周边配套</span>
             <input name="periphery" type="text" value="{{result.periphery}}" class="form-control" >
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="traffic" class="control-label">交通线路:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">交通线路</span>
             <input name="traffic" type="text" value="{{result.traffic}}" class="form-control">
-        </p>
+        </div>
     </div>
     <div class="col-xs-4">
-        <label for="location" class="control-label">地域坐标:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon">地域坐标</span>
             <input name="location" id="location" type="text" value="{{result.location}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="latest_news" class="control-label color-red">最新动态:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon color-red">最新动态</span>
             <textarea name="latest_news" rows="4" cols="60" class="form-control">{{result.latest_news}}</textarea>
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="overview" class="control-label color-red">楼盘概述:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon color-red">楼盘概述</span>
             <textarea name="overview" rows="4" cols="60" class="form-control">{{result.overview}}</textarea>
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="publicize" class="control-label">项目宣传:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon">项目宣传</span>
             <input name="publicize" type="text" value="{{result.publicize}}" class="form-control" >
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="threeD" class="control-label">3D户型:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon">3D户型</span>
             <input name="threeD" type="text" value="{{result.threeD}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 
 <div class="row form-group">
     <div class="col-xs-8">
-        <label for="roundLook" class="control-label">360°看房:</label>
-        <p class="col-xs-10">
+        <div class="input-group">
+            <span class="input-group-addon">360°看房</span>
             <input name="roundLook" type="text" value="{{result.roundLook}}" class="form-control">
-        </p>
+        </div>
     </div>
 </div>
 

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

@@ -184,7 +184,7 @@
                         alert("请选择房源相册");
                         return false;
                     }
-                    if($("#consultantImg > p").length == 0){
+                    if($("#consultantImg > div").length == 0){
                         alert("请选择置业顾问");
                         return false;
                     }

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

@@ -65,8 +65,8 @@
                 <input type="hidden" name="week" id="week" style="display: none">
             </div>
         </div>
-        <input type="submit" id="submit" class="button action" value="搜索">
-        <a class="button action" href="{{ url }}&action=statistics">即时统计</a>
+        <input type="submit" id="submit" class="btn btn-success" value="搜索">
+        <a class="btn btn-success" href="{{ url }}&action=statistics">即时统计</a>
     </form>
     {{ function("addProgressTable") }}
 </div>

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

@@ -98,7 +98,7 @@
                 consultantArray.push(Number($(item).val()));
             });
             if($.inArray(Number($(this).data().id),consultantArray) == -1){
-                if (confirm('是否确定选择职业顾问')) {
+                if (confirm('设置'+$(this).data().name+'为置业顾问吗？')) {
                     callback($(this).data());
                 }
             }else{

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

@@ -9,7 +9,7 @@
                         <select id="myModal_cityId" class="form-control">
                             <option value="-1"> 城市</option>
                             {% for item in city %}
-                            <option value="{{ item.id }}">{{ item.value }}</option>
+                            <option  {% if cityId %}{{ item.id == cityId ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
                             {% endfor %}
                         </select>
                     </div>
@@ -103,19 +103,19 @@
         //增加！=null 时因为在添加合同模块中调用这个方法，合同模块没有这个baseCity的Id
         if( $("#baseCity").val() != null && $("#baseCity").val()!= -1){
             var cityId = $("#baseCity").val();
-                searchCity(cityId,area);
-                searchAcreage(cityId, acreage);
-                //城市联动房子价格
-                {% if house_type == 0 %}
-                    searchPrice(cityId,price)
-                {% elseif house_type == 1 %}
-                    searchTotalPrice(cityId, price);
-                {% else %}
-                    searchRentalPrice(cityId,price);
-                {% endif %}
         }else{
             var cityId = city.val();
         }
+        searchCity(cityId,area);
+        searchAcreage(cityId, acreage);
+        //城市联动房子价格
+        {% if house_type == 0 %}
+        searchPrice(cityId,price)
+        {% elseif house_type == 1 %}
+        searchTotalPrice(cityId, price);
+        {% else %}
+        searchRentalPrice(cityId,price);
+        {% endif %}
         city.val(cityId);
             city.change(function(){
                 var cityId = city.val();

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

@@ -202,7 +202,7 @@
                 errorContainer: "#messageBox1",
                 errorLabelContainer: "#messageBox1",
                 submitHandler: function (form) {
-                    if($("#consultantImg > p").length == 0){
+                    if($("#consultantImg > div").length == 0){
                         alert("请选择置业顾问");
                         return false;
                     }

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

-{% if function('current_user_can', 'zygw') %}
 <style>
     .customer_tracking h2 {
         margin-bottom: 30px;
@@ -19,7 +18,6 @@
     }
 </style>
 <div class="customer_tracking">
-    <h2>新增客户跟踪</h2>
     <h4 class="addBorder">跟进记录</h4>
     <p class="addBorder">
         <span class="color-red">跟进类型：</span>
@@ -40,5 +38,4 @@
             <label for="description"></label>
         </span>
     </p>
-</div>
-{% endif %}
+</div>
\ No newline at end of file
\ No newline at end of file

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

@@ -211,7 +211,7 @@
                 errorContainer: "#messageBox1",
                 errorLabelContainer: "#messageBox1",
                 submitHandler: function (form) {
-                    if($("#consultantImg > p").length == 0){
+                    if($("#consultantImg > div").length == 0){
                         alert("请选择置业顾问");
                         return false;
                     }

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

 {% macro selectOrganization(prefix) %}
 {% set organization = function('SearchDao::searchOrganization')|json_encode() %}
-<div id="{{ prefix }}_organization" style="margin-bottom: 10px;">
-    <label>部门:</label>
-    <label for="{{ prefix }}_depth_1" class="hidden"></label>
-    <select data-depth="1" id="{{ prefix }}_depth_1">
-        <option value="-1">请选择</option>
-    </select>
-    <label for="{{ prefix }}_depth_2" class="hidden"></label>
-    <select data-depth="2" id="{{ prefix }}_depth_2" class="hidden">
-        <option value="-1">请选择</option>
-    </select>
-    <label for="{{ prefix }}_depth_3" class="hidden"></label>
-    <select data-depth="3" id="{{ prefix }}_depth_3" class="hidden">
-        <option value="-1">请选择</option>
-    </select>
-    <label for="{{ prefix }}_depth_4" class="hidden"></label>
-    <select data-depth="4" id="{{ prefix }}_depth_4" class="hidden">
-        <option value="-1">请选择</option>
-    </select>
+{% set quyu = function('SearchDao::searchOrganization',1) %}
+<div class="row" id="{{ prefix }}_organization">
+    <div class="col-md-12">
+        <div class="input-group">
+            <span class="input-group-addon">部门</span>
+            <label for="{{ prefix }}_depth_1" class="hidden"></label>
+            <select data-depth="1" id="{{ prefix }}_depth_1" class="form-control widthAuto">
+                <option value="-1">请选择</option>
+            </select>
+            <label for="{{ prefix }}_depth_2" class="hidden"></label>
+            <select data-depth="2" id="{{ prefix }}_depth_2" class="form-control widthAuto">
+                <option value="-1">请选择</option>
+            </select>
+            <label for="{{ prefix }}_depth_3" class="hidden"></label>
+            <select data-depth="3" id="{{ prefix }}_depth_3" class="form-control widthAuto">
+                <option value="-1">请选择</option>
+            </select>
+            <label for="{{ prefix }}_depth_4" class="hidden"></label>
+            <select data-depth="4" id="{{ prefix }}_depth_4" class="form-control widthAuto hidden">
+                <option value="-1">请选择</option>
+            </select>
+        </div>
+    </div>
 </div>
+<br />
 <script>
     $(document).ready(function () {
         var organization = eval('{{ organization }}');
@@ -30,6 +36,9 @@
             }
             select.append('<option value="' + item.Id + '" data-parent="' + item.ParentId + '" ' + css + '>' + item.Name + '</option>');
         });
+        $("#{{ prefix }}_depth_1").find("option[value='1']").attr("selected","selected").show();
+        $("#{{ prefix }}_depth_2").find("option[value='6']").attr("selected","selected").show();
+        $("#{{ prefix }}_depth_3").find("option[value='28']").attr("selected","selected").show();
 
         $.each($('#{{ prefix }}_organization select[data-depth]:not(:last)'), function (index, item) {
             var next_depth = Number($(item).data('depth')) + 1;

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

 
 <div class="row form-group">
     <div class="col-xs-4">
-        <label for="housename" class="control-label color-red">微信标题:</label>
-        <p class="col-xs-7">
+        <div class="input-group">
+            <span class="input-group-addon color-red">微信标题</span>
             <input name="housename" id="housename" type="text" value="{{result.name}}" class="form-control" >
-        </p>
+        </div>
     </div>
     {% if house_type == 0 %}
         <div class="col-xs-4">
-            <label for="average_price" class="control-label color-red">均价:</label>
-            <p class="col-xs-6">
+            <div class="input-group">
+                <span class="input-group-addon color-red">均价</span>
                 <input name="average_price" id="average_price" type="text" value="{{result.average_price}}" class="form-control">
-            </p>
-            <p class="col-xs-1" style="margin-top: 10px">
-                &nbsp;元
-            </p>
+                <span class="input-group-addon">元</span>
+            </div>
         </div>
     {% endif %}
 </div>
-<table class="form-table" style="margin-bottom: 15px;">
-    <tbody>
-    <tr>
-        <td style="width: 75px;padding: 10px 0;">
-            <label class="control-label">标签:</label>
-        </td>
-        <td>
-            <div id="mark"></div>
-        </td>
-    </tr>
-    <tr>
-        <td style="display: inline;padding: 10px 0;margin-left: 75px;">
-            <button type="button" class="btn btn-success" id="addTagBtn">
-                标签
-            </button>
-        </td>
-    </tr>
-    </tbody>
-</table>
+<div class="row form-group">
+    <div class="col-xs-6">
+        <div class="input-group">
+            <span class="input-group-addon">标签</span>
+            <input type="button" class="btn btn-success" id="addTagBtn" value="添加" />
+        </div>
+        <div id="mark" class="input-group" style="margin-left: 68px;margin-top: 10px;">
+        </div>
+    </div>
+</div>
 
 <script>
     $(document).ready(function () {
@@ -61,12 +50,21 @@
                 }
             });
         });
+        $("#mark").on("click",".featureCancel",function(){
+            var removeItem = $(this).parent().parent().find("input").val();
+            $.grep(tagArray, function(value) {
+                return value != removeItem;
+            });
+            $(this).parent().parent().parent().remove();
+        });
     });
     function addTag(id, value) {
         var houseTag = $("<input>").attr({"type": "hidden", "name": "data[houseTag][]", "value": id});
-        var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel ");
-        var span = $("<span>").attr("style", "margin-right:5px").append(value);
-        var divCol = $("<div>").append(houseTag).append(span).append(cancel).addClass("col-md-3").attr("style", "margin-bottom:10px");
+        var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel ").css({"top":"3px","margin-left":"10px"});
+        var span = $("<span>").attr("style", "margin-right:5px").addClass("label label-info").append(value);
+        var h = $("<h4>");
+        h.append(span.append(cancel));
+        var divCol = $("<div>").append(houseTag).append(h).addClass("col-md-2").attr("style", "margin-bottom:10px");
         $("#mark").append(divCol);
     }
 </script>
\ No newline at end of file

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

@@ -41,9 +41,10 @@ class CustomerTrackingDao
 
     public static function search($house_id, $origin)
     {
-        $sql = 'SELECT tct.*,ts.status_name,tc.name FROM ' . Config::TOSPUR_CUSTOMER_TRACKING_TABLE . ' tct' .
+        $sql = 'SELECT tct.*,ts.status_name,tc.name,wu.display_name FROM ' . Config::TOSPUR_CUSTOMER_TRACKING_TABLE . ' tct' .
             ' left join (SELECT * FROM ' . Config::TOSPUR_STATUS_TABLE . ' where status_type = 3) as ts on tct.status_type = ts.status_id' .
             ' left join ' . Config::TOSPUR_CONSULTANT . ' tc on tct.consultant_id = tc.id' .
+            ' left join wp_users wu on wu.id = tct.consultant_id '.
             ' where tct.house_id = ' . $house_id . ' and tct.origin = ' . $origin;
         $result = DBManager::get_results($sql);
         return $result;

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

@@ -17,7 +17,7 @@ class InsertDao{
     public static function setHouseNumber($houseId,$houseType,$cityId){
         switch($houseType){
             case 0:
-                $prefix = "xf";
+                $prefix = "XF";
                 break;
             case 1:
                 $prefix = "CS";