Merge branch 'test'

application/api/controller/Broker.php

@@ -172,7 +172,7 @@ class Broker extends Basic
         $where['b.houses_id'] = $this->params['house_id'];
         $where['b.is_del']    = $where['a.status'] = 0;
 
-        $where['b.type']      = 3;
+        $where['b.type']      = 2;
         $house_agent          = $agents->getAgentHouseType($fields, $where);
         if (!empty($house_agent)){
             $house_agent['show_content'] = '本铺由我登记，熟悉房源信息';

application/api_broker/service/DailyPaperService.php

@@ -456,7 +456,7 @@ class DailyPaperService
     private function getCheckList($daily_id,$agent_id = 0)
     {
         $field = "id,daily_id,operation_id,operation_name,remark,alipay,tenpay,realty_pay,family_pay,private_bank,
-        cash,pos,other_bank,create_time,update_time,tenpay_2,alipay_2,bank_card";
+        cash,pos,other_bank,create_time,update_time,tenpay_2,alipay_2,bank_card,bank_card_yun,bank_card_lin,bank_card_new";
         $params["daily_id"] = $daily_id;
         $params["is_del"] = 0;
         if($agent_id > 0){

application/index/extend/Basic.php

@@ -80,7 +80,9 @@ class Basic extends Controller
         'index/mainIndex',
         'index/uploadImg',
         'index/uploadEditor',
-        'index/downloadFile'
+        'index/downloadFile',
+        'index/getStoreRandKingListByAgentId',
+        'index/getRandKingListByAgentId'
     );
 
     /**

public/resource/js/financial_manager_daily_list.js

@@ -768,6 +768,11 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 	        	params.bank_card_yun=$('#total_yun_bank').html();
 	        	params.pos=$('#total_yun_pos').html();
 	        	params.family_pay=$('#total_yun_family').html();
+	        	//深圳店长提交 没有的数据传空  财务审核
+	        	params.realty_pay='';
+	        	params.other_bank='';
+	        	params.cash='';
+	        	params.private_bank='';
         		
         	}else if(bargain.caiwu_site_id == 10002){//杭州
 	        	params.alipay=$('#total_a_hangzhou').html();