pc时间轴修改

application/app_broker/view/index/timeline_pc.html

@@ -57,7 +57,7 @@
 								<p v-if="item.step_name==='bargain'">成交价：<span class="span-active">{{item.price}}元</span></p>
 								<p v-if="item.step_name==='bargain'">应收佣金：<span class="span-active">{{item.commission}}元</span></p>
 								<div v-if="item.step_name==='bargain'">
-									<div class="sp-pay-log-div" v-for="(item2, idnex2) in item.list">
+									<div class="sp-pay-log-div" v-for="(item2, idnex2) in item.list_array">
 										<p>分佣方：<span>{{switchRoleType(item2.role)}}</span></p>
 										<p>业务员：<span>{{item2.name+item2.phone}}</span></p>
 										<p>分佣比例：<span>{{item2.scale}}%</span></p>

application/index/view/houses/houseList.html

@@ -61,12 +61,12 @@
 	                                <tr>
 	                                    <td colspan="9">
 	                                        <form id="form_search">
-	                                            <select class="form-control btn2" id="is_carefully_chosen">
+	                                            <select class="form-control btn11" id="is_carefully_chosen">
 	                                                <option value="-1"">是否显示在首页</option>
 	                                                <option value="0">是</option>
 	                                                <option value="1">否</option>
 	                                            </select>
-	                                            <select class="form-control btn2" id="is_show">
+	                                            <select class="form-control btn11" id="is_show">
 	                                                <option value="-1">是否给商户看</option>
 	                                                <option value="0">是</option>
 	                                                <option value="1">否</option>
@@ -100,6 +100,7 @@
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="业态" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_name" placeholder="盘方姓名" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_phone" placeholder="盘方手机号" type="tel" value="">
+	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="landlord_phone" placeholder="房东手机号" type="tel" value="">
 	                                            <div class="row">
 	                                            </div>
 	

public/appnew/src/components/achieveMain/achieveForkLi.vue

@@ -8,7 +8,8 @@
 		</div>
 		<div>
 			<p class="ellipsis">{{data.name}}</p>
-			<p class="ellipsis">{{data.district_name+data.store_name}}</p>
+			<p class="ellipsis">{{data.district_name}}</p>
+			<!--<p class="ellipsis">{{data.district_name+data.store_name}}</p>-->
 		</div>
 		<div class="fr">
 			<p>{{dealJine}}</p>

public/resource/css/home.css

@@ -32,6 +32,11 @@
 .btn3{
     margin-left: 10px;
 }
+.btn11{
+    width:15%!important;
+    float: left;
+    margin-left: 10px;
+}
 .page-cla{
     float: right;
 }

public/resource/js/houseList.js

@@ -663,6 +663,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 			params.industry_type = $('#industry_type').val(); //业态
 			params.dish_name = $('#dish_name').val(); //盘方姓名
 			params.dish_phone = $('#dish_phone').val(); //盘方手机号
+			params.landlord_phone = $('#landlord_phone').val(); //房东手机号
 			params.start_date = $('#start_date').val(); //时间1
 			params.end_date = $('#end_date').val(); //时间2