Merge branch 'test'

application/api_broker/service/DailyPaperService.php

@@ -241,7 +241,7 @@ class DailyPaperService
         }
         $payLogModel = new OPayLogModel();
         //中介费入账
-        $field = "a.id,c.id as bargain_id,b.house_id,c.price,a.money,a.pay_type,a.transfer_name,
+        $field = "a.id,c.id as bargain_id,b.house_id,c.price,a.money,a.pay_type,a.transfer_name,a.type,a.type_ext,
         d.report_agent_id as agent_id,c.is_open,a.is_dividend,a.receipt_number,a.create_time,a.remark,a.received_money";
         $params["a.agent_id"] = array("in", ($ids));
         $params["a.create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
@@ -260,7 +260,7 @@ class DailyPaperService
 
 
 
-        $field_money = "a.id,a.money,b.house_id,b.id as order_id,a.pay_type,a.transfer_name, d.report_agent_id  as agent_id,
+        $field_money = "a.id,a.money,a.type,a.type_ext,b.house_id,b.id as order_id,a.pay_type,a.transfer_name, d.report_agent_id  as agent_id,
         a.is_dividend,a.receipt_number,a.create_time";
         //意向金
         $params["a.type"] = 10;

application/index/view/finance/account_statement.html

@@ -200,7 +200,7 @@
 												    <ul class="user-ul"></ul>
 												</div>
 												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value="">
-												<!--<div class="clear"></div>-->
+												<div class="clear"></div>
 												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_ID" placeholder="客户ID" type="text" value="">
 												<!--<select class="form-control btn2" id="isPayment">
 													<option value="">是否收款</option>

application/index/view/member/user_genjing_modal.html

@@ -510,7 +510,7 @@
 		<h4 class="modal-title text-info detail-modal-header-tab">
            <span  class="btn-info-liu" style="margin-right: 30px;">客户详情/跟进</span>
            <span  class="btn-default-liu caozuo-yue">约带看</span>
-           <button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="position: absolute;top: 0;right: 10px;width: 30px;height: 30px;">
+           <button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="position: absolute;top: 0;right: 10px;width: 30px;height: 30px;font-size: 24px;">
 	            ×
 	        </button>
         </h4>

public/resource/js/houseFollowUp.js

@@ -64,7 +64,7 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
 			var d = myDate.getDate();
 			var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
 			var day_start = getPreMonth(day_end);
-			$('#create_time_start').val(day_start);
+			$('#create_time_start').val(day_end);
 			$('#create_time_end').val(day_end);//商铺跟进 添加 默认时间 一个月
 			 //初始化城市 区域筛选
 			house.initializationCityFunction();