1

application/api_broker/controller/OfficeRoom.php

@@ -12,9 +12,12 @@ namespace app\api_broker\controller;
 use app\api_broker\extend\Basic;
 use app\index\service\OfficeRoomService;
 use app\index\service\OfficeService;
+use app\model\MetroStations;
 use app\model\OfficeGBuilding;
 use app\model\OfficeGHousesFollowUp;
+use app\model\OfficeGLabels;
 use app\model\OfficeGRoom;
+use app\model\Regions;
 
 class OfficeRoom extends Basic
 {
@@ -27,7 +30,7 @@ class OfficeRoom extends Basic
     public function __construct()
     {
         parent::__construct();
-        $this->service = new OfficeRoomService();
+        $this->service       = new OfficeRoomService();
         $this->m_office_room = new OfficeGRoom();
 
     }
@@ -45,7 +48,7 @@ class OfficeRoom extends Basic
         $result = $this->service->delHouseFile($this->params['id'], $this->params['house_id'], $this->params['save_path']);
         if ($result['status'] == 'fail') {
             $this->code = 101;
-            $this->msg = '删除失败';
+            $this->msg  = '删除失败';
         }
         return $this->response($this->code, $this->msg);
     }
@@ -63,22 +66,22 @@ class OfficeRoom extends Basic
             if ($data['status'] == 'successful') {
                 $this->data['house_id'] = $data['data']['house_id'];
                 $this->data['is_alert'] = $data['data']['is_alert'];
-                $this->msg = '新增或编辑成功';
+                $this->msg              = '新增或编辑成功';
             } else {
                 $this->code = 101;
-                $this->msg = $data['msg'];
+                $this->msg  = $data['msg'];
             }
         } else {
             if (empty($this->params['id'])) {
                 $this->code = 101;
-                $this->msg = 'Id is null';
+                $this->msg  = 'Id is null';
             } else {
                 //获取商铺详情
                 $data = $this->service->getOfficeRoomDetail($this->params['id'], 1);
                 if ($data['status'] == 'successful') {
                     $this->data = $data['data'];
                 } else {
-                    $this->msg = $data['msg'];
+                    $this->msg  = $data['msg'];
                     $this->code = 101;
                 }
             }
@@ -101,10 +104,10 @@ class OfficeRoom extends Basic
             return $this->response("101", $checkResult);
         }
 
-        $id = $params['id'];
-        $result = $this->service->getOfficeRoomInfo($id,$this->agentId);
+        $id     = $params['id'];
+        $result = $this->service->getOfficeRoomInfo($id, $this->agentId);
 
-        return $this->response($result['status'],$result['msg'], $result['data']);
+        return $this->response($result['status'], $result['msg'], $result['data']);
     }
 
     /**
@@ -117,14 +120,14 @@ class OfficeRoom extends Basic
      */
     public function getBuildingSearch()
     {
-        $pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
 
         $building_service = new OfficeService();
-        $result = $building_service->BuildingSearch($pageNo, $pageSize, $this->params);
+        $result           = $building_service->BuildingSearch($pageNo, $pageSize, $this->params);
         if ($result['status'] == 'fail') {
             $this->code = 101;
-            $this->msg = $result['msg'];
+            $this->msg  = $result['msg'];
         } else {
             $this->data = $result['data'];
         }
@@ -140,10 +143,10 @@ class OfficeRoom extends Basic
     public function getBuildingDetail()
     {
         $building_service = new OfficeService();
-        $result = $building_service->getOfficeDetail($this->params['id']);
+        $result           = $building_service->getOfficeDetail($this->params['id']);
         if ($result['status'] == 'fail') {
             $this->code = 101;
-            $this->msg = $result['msg'];
+            $this->msg  = $result['msg'];
         } else {
             $this->data = $result['data'];
         }
@@ -184,24 +187,24 @@ class OfficeRoom extends Basic
 //              "pageSize"            => 15
 //           );
         $conditions = [];
-        $field = "a.id,b.title,b.address";
-        if(empty($params["city"])){
+        $field      = "a.id,b.title,b.address";
+        if (empty($params["city"])) {
             $conditions["b.city"] = trim($this->city);
         }
 
 
-        $pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
 
-        if (isset($params['keyword']) && !empty($params['keyword']) ) {
-            $conditions['a.id|b.title'] = array("like","%" . trim($params['keyword']) . "%");
+        if (isset($params['keyword']) && !empty($params['keyword'])) {
+            $conditions['a.id|b.title'] = array("like", "%" . trim($params['keyword']) . "%");
         }
         $order_ = "b.status asc,b.id desc";
 
         $conditions['b.status'] = array('eq', 1); //只显示上架
 
         $m_office_build = new OfficeGRoom();
-        $result = $m_office_build->getRoomList($pageNo, $pageSize, $order_, $field, $conditions, []);
+        $result         = $m_office_build->getRoomList($pageNo, $pageSize, $order_, $field, $conditions, []);
 
         if (empty($result)) {
             return $this->response("200", "此条件没有找到数据");
@@ -237,16 +240,16 @@ class OfficeRoom extends Basic
 
         $m_office_building = new OfficeGBuilding();
         $m_office_room     = new OfficeGRoom();
-        $building_id = $m_office_room->getFieldOneValue('building_id', ['id'=>$params['house_id']]);
-        $result = $m_office_building->getFindData('province,city,disc', ['id' => $building_id]);
+        $building_id       = $m_office_room->getFieldOneValue('building_id', ['id' => $params['house_id']]);
+        $result            = $m_office_building->getFindData('province,city,disc', ['id' => $building_id]);
         if ($result) {
             $params['province'] = $result['province'] ? $result['province'] : '上海市';
-            $params['city'] = $result['city'] ? $result['city'] : '上海市';
-            $params['disc'] = $result['disc'] ? $result['disc'] : '黄浦区';
+            $params['city']     = $result['city'] ? $result['city'] : '上海市';
+            $params['disc']     = $result['disc'] ? $result['disc'] : '黄浦区';
         }
 
         $follow_up_model = new OFficeGHousesFollowUp();
-        $id = $follow_up_model->addHousesFollowUp($params);
+        $id              = $follow_up_model->addHousesFollowUp($params);
         if ($id > 0) {
             return $this->response("200", "request success", ["id" => $id]);
         } else {
@@ -263,12 +266,12 @@ class OfficeRoom extends Basic
      */
     public function getMyBuildingRoom()
     {
-        $params = $this->params;
-        $pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $params   = $this->params;
+        $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
-        $status = isset($params['status'])?$params['status']:1;
-        $result = $this->service->getMyBuildingRoom($status,$pageNo, $pageSize, $this->agentId);
-        return $this->response($result['status'],$result['msg'], $result['data']);
+        $status   = isset($params['status']) ? $params['status'] : 1;
+        $result   = $this->service->getMyBuildingRoom($status, $pageNo, $pageSize, $this->agentId);
+        return $this->response($result['status'], $result['msg'], $result['data']);
     }
 
     /**
@@ -306,11 +309,11 @@ class OfficeRoom extends Basic
            );*/
         $conditions = [];
 
-        $page_no = empty($params['page_no']) ? 1 : $params['page_no'];
+        $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
         $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
 
-        if (isset($params['keyword']) && !empty($params['keyword']) ) {
-            $conditions['a.id|b.title'] = array("like","%" . trim($params['keyword']) . "%");
+        if (isset($params['keyword']) && !empty($params['keyword'])) {
+            $conditions['a.id|b.title'] = array("like", "%" . trim($params['keyword']) . "%");
         }
 
         $conditions['a.status'] = array('eq', 1); //只显示上架
@@ -343,4 +346,103 @@ class OfficeRoom extends Basic
 
         return $this->response($this->code, $this->msg, $this->data);
     }
+
+
+    /**
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function filtrateConditionRoom()
+    {
+        $params         = $this->params;
+        if (empty($params["city"])) {
+            return $this->response("101", "参数错误");
+        }
+        $city = $params["city"];
+
+        $regions  = new Regions();
+        $cityList = $regions->getRegionsByCity($city);
+
+        $i = $j = 0;
+
+        $result["area"][$i]["city"]   = "全部";
+        $result["area"][$i]["disc"][] = "全部";
+        foreach ($cityList as $k => $v) {
+            $i++;
+            if (!empty($v["name"])) {
+                $result["area"][$i]["city"]   = $v["name"];
+                $result["area"][$i]["disc"][] = "全" . $v["name"];
+            }
+            foreach ($v["city"] as $item) {
+                if (!empty($item)) {
+                    $result["area"][$i]["disc"][] = $item;
+                }
+            }
+
+            if ($j == 0) {
+                $result["area"][$i]["business_district"][$j]['district']   = "全" . $v["name"];
+                $result["area"][$i]["business_district"][$j]['business'][] = [
+                    'id' => 0, 'name' => '全部'
+                ];
+            }
+
+            foreach ($v['business_district'] as $item2) {
+                if (!empty($item2)) {
+                    $j++;
+                    $result["area"][$i]["business_district"][$j] = $item2;
+                }
+            }
+
+            break;
+        }
+
+        $metroStations              = new MetroStations();
+        $stationsParams["is_del"]   = 0;
+        $stationsParams["province"] = array("like", trim($city) . "%");
+        $stationsField              = "id,line_name,line_name_simple,name,province,city,latitude,longitude";
+
+        $stationsArr = $metroStations->getMetroStations($stationsField, $stationsParams);
+        $x           = $y = 0;
+
+        $result["stations"][$x]["line"]   = "全部";
+        $refer                            = array();
+        foreach ($stationsArr as $key => $value) {
+            $refer[$value["line_name_simple"]][] = $value;
+        }
+        foreach ($refer as $key => $data) {
+            $result["stations"][$x]["line"] = $key;
+            $result["stations"][$x]["name"] = $data;
+            $x++;
+
+        }
+        $result['yetai'] = array('全部', '商场美食', '沿街餐饮', '百货超市', '服饰鞋包', '亲子教育', '休闲娱乐', '办公', '其他');
+
+        //租金租金(0:租金-大于三万; 1:租金一万到三万之间; 2:租金-小于一万)
+        $result['money'] = array(
+            array('id' => '-1', 'value' => '全部'), array('id' => '0', 'value' => '3万以上'),
+            array('id' => '1', 'value' => '1万-3万'), array('id' => '2', 'value' => '1万以下')
+        );
+
+        //面积
+        $result['acreage'] = array(
+            array('id' => '-1', 'value' => '全部'), array('id' => '0', 'value' => '30m²以内'),
+            array('id' => '1', 'value' => '30-60m²'), array('id' => '2', 'value' => '60-100m²'), array('id' => '3', 'value' => '100-300m²')
+            , array('id' => '4', 'value' => '300-500m²'), array('id' => '5', 'value' => '500m²以上')
+        );
+
+        $result['more'][] = "全部";
+        $room_labels      = new OfficeGLabels();
+        $labelsResult     = $room_labels->getLabels();
+        if (count($labelsResult) > 0) {
+            foreach ($labelsResult as $labelsKey => $labelsVal) {
+                if ($labelsVal['name']) {
+                    $result['more'][] = $labelsVal['name'];
+
+                }
+            }
+        }
+        return $this->response("200", "request success", $result);
+    }
 }
\ No newline at end of file

application/api_broker/service/OfficeOrderLogService.php

@@ -361,9 +361,9 @@ class OfficeOrderLogService
         }
         if ($father_id > 0) { //修改办公楼已租状态
             $orderModel = new OfficeOrderModel();
-            $houseArr = $orderModel->selectOrderByOrderId("b.id,c.type", ["order_id" => $order_id]);
-            if(count($houseArr) > 0 && $houseArr[0]["type"] != 5){ //没找到楼盘和共享楼盘不改状态
-                $room_id = $houseArr[0]["id"];
+            $houseArr   = $orderModel->selectOrderByOrderId("b.id,c.type", ["order_id" => $order_id]);
+            if (count($houseArr) > 0 && $houseArr[0]["type"] != 5) { //没找到楼盘和共享楼盘不改状态
+                $room_id   = $houseArr[0]["id"];
                 $roomModel = new OfficeGRoom();
                 $roomModel->updateHouseNumByRevocationBargain($room_id);
             }
@@ -540,19 +540,19 @@ class OfficeOrderLogService
             }
         }
         //退款审核
-              $field_turn_down       = "id,refund_id,status,remark,operation_id,operation_name,create_time";
-              $turn_down["order_id"] = $order_id;
-              $turn_down["status"]   = array("in", ("2,4"));
-              $turn_down["is_del"]   = 0;
-              $turnDownData          = $oRefundLogModel->getListAll($field_turn_down, $turn_down);
-              if (count($turnDownData) > 0) {
-                  foreach ($turnDownData as $k2 => $v2) {
-                      $v2["step_name"] = "refund_check";
-                      $v2["img_path"]  = CHAT_IMG_URL;
-                      $v2["img"]       = $this->getOImg($v2["id"], 4);
-                      $result[$sort++] = $v2;
-                  }
-              }
+        $field_turn_down       = "id,refund_id,status,remark,operation_id,operation_name,create_time";
+        $turn_down["order_id"] = $order_id;
+        $turn_down["status"]   = array("in", ("2,4"));
+        $turn_down["is_del"]   = 0;
+        $turnDownData          = $oRefundLogModel->getListAll($field_turn_down, $turn_down);
+        if (count($turnDownData) > 0) {
+            foreach ($turnDownData as $k2 => $v2) {
+                $v2["step_name"] = "refund_check";
+                $v2["img_path"]  = CHAT_IMG_URL;
+                $v2["img"]       = $this->getOImg($v2["id"], 4);
+                $result[$sort++] = $v2;
+            }
+        }
         return $this->sortByTime($result);
     }
 
@@ -1442,15 +1442,15 @@ class OfficeOrderLogService
             return null;
         }
         $houseAgents = new OfficeGRoomToAgent();
-        $fields       = "b.id,b.phone,b.name";
+        $fields      = "b.id,b.phone,b.name";
 
         switch ($type) {//1盘方，2客方，3反签，4独家，5合作方
             case 1:
                 $params["a.house_id"] = $result[0]["house_id"];
-                $params["a.type"]      = 2;
-                $params["a.is_del"]    = 0;
-                $params["b.status"]    = 0;
-                $list                  = $houseAgents->getAgentsByHouseId($fields, $params);
+                $params["a.type"]     = 2;
+                $params["a.is_del"]   = 0;
+                $params["b.status"]   = 0;
+                $list                 = $houseAgents->getAgentsByHouseId($fields, $params);
                 break;
             case 2:
                 $userModel          = new Users();
@@ -1466,10 +1466,10 @@ class OfficeOrderLogService
                 break;
             case 4:
                 $params["a.house_id"] = $result[0]["house_id"];
-                $params["a.type"]      = 3;
-                $params["a.is_del"]    = 0;
-                $params["b.status"]    = 0;
-                $list                  = $houseAgents->getAgentsByHouseId($fields, $params);
+                $params["a.type"]     = 3;
+                $params["a.is_del"]   = 0;
+                $params["b.status"]   = 0;
+                $list                 = $houseAgents->getAgentsByHouseId($fields, $params);
                 break;
             case 5:
                 return null;
@@ -1513,13 +1513,13 @@ class OfficeOrderLogService
             return null;
         }
 
-        $houseAgents                = new OfficeGRoomToAgent();
-        $fields                      = "b.id,b.phone,b.name,a.type";
+        $houseAgents               = new OfficeGRoomToAgent();
+        $fields                    = "b.id,b.phone,b.name,a.type";
         $where_house["a.house_id"] = $result[0]["house_id"];
-        $where_house["a.type"]      = ['in', '2,3'];
-        $where_house["a.is_del"]    = 0;
-        $where_house["b.status"]    = 0;
-        $agent_house                = $houseAgents->getAgentsByHouseId($fields , $where_house);
+        $where_house["a.type"]     = ['in', '2,3'];
+        $where_house["a.is_del"]   = 0;
+        $where_house["b.status"]   = 0;
+        $agent_house               = $houseAgents->getAgentsByHouseId($fields, $where_house);
 
         $list = [];
         $key  = 0;

application/model/MetroStations.php

@@ -50,9 +50,10 @@ class MetroStations extends BaseModel
 
     public function getMetroStations($field,$params)
     {
-        $result = $this
+        $result = $this->db_
             ->field($field)
             ->where($params)
+            ->order("sort_value asc")
             ->select();
         return $result;
     }

application/model/Regions.php

@@ -129,7 +129,7 @@ class Regions extends Model
     public function getRegionsByCity($city) {
         $data = [];
         $param["type"]     = 2;
-        $param["fullName"] = array( "like", "%" . trim($city) . "%" );
+        $param["fullName"] = array( "like",  trim($city) . "%" );
         $city_data = $this
             ->field('code,fullName')
             ->where($param)

application/route.php

@@ -366,7 +366,7 @@ Route::group('index', [
     'dayAchievementsReport'       => ['index/PerformanceReport/dayAchievementsReportList', ['method' => 'POST|GET']],//日报liu
     'weekAchievementsReport'      => ['index/PerformanceReport/weekAchievementsReportList', ['method' => 'POST|GET']],//周报liu
     'officeBuildingList'          => ['index/OfficeBuilding/officeBuildingList', ['method' => 'POST|GET']],//办公楼liu
-//    'officeEdit'                  => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu
+    //    'officeEdit'                  => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu
     'buildingDictionary'          => ['index/OfficeBuilding/buildingDictionary', ['method' => 'POST|GET']],//楼盘字典liu
 
 
@@ -375,7 +375,7 @@ Route::group('index', [
     'officeFollowUp'         => ['index/OfficeBuilding/officeFollowUp', ['method' => 'POST|GET']],//办公楼列表跟进liu
     'getCollectionOffice'    => ['index/OfficeBuilding/getCollectionOffice', ['method' => 'POST|GET']],//收款记录办公楼liu
     'getCollectionShop'      => ['index/OfficeBuilding/getCollectionShop', ['method' => 'POST|GET']],//收款记录商铺liu
-//    'marchinListOffice'      => ['index/OfficeBuilding/marchinListOffice', ['method' => 'POST|GET']],//进场记录办公楼liu
+    //    'marchinListOffice'      => ['index/OfficeBuilding/marchinListOffice', ['method' => 'POST|GET']],//进场记录办公楼liu
     'reportListOffice'       => ['index/OfficeBuilding/reportListOffice', ['method' => 'POST|GET']],//约带看记录办公楼liu
     'adjustmentOffice'       => ['index/OfficeBuilding/adjustmentOffice', ['method' => 'POST|GET']],//调整出账办公楼liu
     'adjustmentShop'         => ['index/OfficeBuilding/adjustmentShop', ['method' => 'POST|GET']],//调整出账商铺liu
@@ -498,7 +498,7 @@ Route::group('index', [
     'getFindShopList'     => ['index/FindShop/getFindShopList', ['method' => 'POST|GET']],
     'getFindShopListIsMy' => ['index/FindShop/getFindShopList', ['method' => 'POST|GET']],
 
-    'ShareOfficeRoom'         => ['index/ShareOfficeRoom/ShareOfficeRoom', ['method' => 'POST|GET']],
+    'ShareOfficeRoom' => ['index/ShareOfficeRoom/ShareOfficeRoom', ['method' => 'POST|GET']],
 ]);
 
 
@@ -836,19 +836,19 @@ Route::group('broker', [
     'officialReceiptsList'      => ['api_broker/Performance/officialReceiptsList', ['method' => 'POST|GET']], //实收list
     'collectionListByBargainId' => ['api_broker/Performance/collectionListByBargainId', ['method' => 'POST|GET']], //实收list
 
-    'paylogListPcInfo'                 => ['api_broker/Performance/paylogListPcInfo', ['method' => 'POST|GET']], //
-    'marchInListPcInfo'                => ['api_broker/Performance/marchInListPcInfo', ['method' => 'POST|GET']], //
-    'followListPcInfo'                 => ['api_broker/Performance/followListPcInfo', ['method' => 'POST|GET']], //报备
-    'housingResourcePcInfo'            => ['api_broker/Performance/housingResourcePcInfo', ['method' => 'POST|GET']], //新增商铺
-    'userResourcePcInfo'               => ['api_broker/Performance/userResourcePcInfo', ['method' => 'POST|GET']], //新增客户
-    'teamNumPcInfo'                    => ['api_broker/Performance/teamNumPcInfo', ['method' => 'POST|GET']], //团队人数
-    'bargainSumPcInfo'                 => ['api_broker/Performance/bargainSumPcInfo', ['method' => 'POST|GET']], //成交单数
+    'paylogListPcInfo'      => ['api_broker/Performance/paylogListPcInfo', ['method' => 'POST|GET']], //
+    'marchInListPcInfo'     => ['api_broker/Performance/marchInListPcInfo', ['method' => 'POST|GET']], //
+    'followListPcInfo'      => ['api_broker/Performance/followListPcInfo', ['method' => 'POST|GET']], //报备
+    'housingResourcePcInfo' => ['api_broker/Performance/housingResourcePcInfo', ['method' => 'POST|GET']], //新增商铺
+    'userResourcePcInfo'    => ['api_broker/Performance/userResourcePcInfo', ['method' => 'POST|GET']], //新增客户
+    'teamNumPcInfo'         => ['api_broker/Performance/teamNumPcInfo', ['method' => 'POST|GET']], //团队人数
+    'bargainSumPcInfo'      => ['api_broker/Performance/bargainSumPcInfo', ['method' => 'POST|GET']], //成交单数
 
 
     //user
-    'returnSearchCondition'            => ['api_broker/User/returnSearchCondition', ['method' => 'get']], //客户搜索条件
-    'searchUser'                       => ['api_broker/User/searchUser', ['method' => 'get|post']], //客户搜索
-    'getLastOrNextUserID'              => ['api_broker/User/getLastOrNextUserID', ['method' => 'get|post']], //
+    'returnSearchCondition' => ['api_broker/User/returnSearchCondition', ['method' => 'get']], //客户搜索条件
+    'searchUser'            => ['api_broker/User/searchUser', ['method' => 'get|post']], //客户搜索
+    'getLastOrNextUserID'   => ['api_broker/User/getLastOrNextUserID', ['method' => 'get|post']], //
 
     'superviseListNew'   => ['api_broker/Supervise/superviseList', ['method' => 'POST|GET']], //监督执行列表
     'addSupervise'       => ['api_broker/Supervise/addSupervise', ['method' => 'POST|GET']], //新增-监督执行
@@ -936,13 +936,13 @@ Route::group('broker', [
 
     'getOpenList' => ['api_broker/PayLogOpen/getOpenList', ['method' => 'GET|POST']],
     'openCheck'   => ['api_broker/PayLogOpen/openCheck', ['method' => 'GET|POST']],
-    
+
 ]);
 
 Route::group('search', [
     'search'   => ['search/Search/search', ['method' => 'get|post']],
     'getHaoZu' => ['search/Reptile/getHaoZu', ['method' => 'get|post']],
-    'index' => ['search/Reptile/index', ['method' => 'get|post']],
+    'index'    => ['search/Reptile/index', ['method' => 'get|post']],
 ]);
 
 
@@ -1009,12 +1009,13 @@ Route::group('office', [
     'bargainMain'                => ['api_broker/OfficeBargain/bargainList', ['method' => 'POST|GET']],
     'bargainMainV2'              => ['api_broker/OfficeBargain/bargainListV2', ['method' => 'POST|GET']],
 
-    'userFollowUpList'          => [ 'api_broker/OfficeHomePageLog/userFollowUpList', [ 'method' => 'POST|GET' ] ],
-    'houseFollowUpList'         => [ 'api_broker/OfficeHomePageLog/houseFollowUpList', [ 'method' => 'POST|GET' ] ],
-    'collectionListByBargainId' => [ 'api_broker/OfficePerformance/collectionListByBargainId', [ 'method' => 'POST|GET' ] ],
-    'getOfficeRoomByReport'     => [ 'api_broker/OfficeRoom/getOfficeRoomByReport', [ 'method' => 'get|post' ] ],
-    'followUpLog'               => [ 'api_broker/OfficeUser/followUpLog', [ 'method' => 'get|post' ] ],
+    'userFollowUpList'          => ['api_broker/OfficeHomePageLog/userFollowUpList', ['method' => 'POST|GET']],
+    'houseFollowUpList'         => ['api_broker/OfficeHomePageLog/houseFollowUpList', ['method' => 'POST|GET']],
+    'collectionListByBargainId' => ['api_broker/OfficePerformance/collectionListByBargainId', ['method' => 'POST|GET']],
+    'getOfficeRoomByReport'     => ['api_broker/OfficeRoom/getOfficeRoomByReport', ['method' => 'get|post']],
+    'followUpLog'               => ['api_broker/OfficeUser/followUpLog', ['method' => 'get|post']],
     'getHouseAddress'           => ['api_broker/OfficeRoom/checkRepetition', ['method' => 'get']], //搜索楼号/栋/座+楼层+房号
+    'filtrateConditionRoom'     => ['api_broker/OfficeRoom/filtrateConditionRoom', ['method' => 'get']],
 
 ]);
 
@@ -1068,26 +1069,26 @@ Route::group('office_index', [
     'inspectionRecordStore/:check_status'    => ['index/OfficeReport/inspectionRecordAll', ['method' => 'GET'], ['check_status' => 1]], //门店约带看
     'inspectionRecordDistrict/:check_status' => ['index/OfficeReport/inspectionRecordAll', ['method' => 'GET'], ['check_status' => 2]], //部门约带看
     'inspectionRecordAll/:check_status'      => ['index/OfficeReport/inspectionRecordAll', ['method' => 'GET'], ['check_status' => 3]], //全部约带看
-    'getDistance'        => ['index/OfficeManage/getDistance', ['method' => 'GET']], //获取两个经纬度距离
-    'getHouseAddress'           => ['index/OfficeRoom/checkRepetition', ['method' => 'get']], //搜索楼号/栋/座+楼层+房号
-    'marchInList'     => ['index/officeMarchIn/marchInList', ['method' => 'POST|GET']], //进场记录列表 朱伟 2018-06-13
-    'reportListOne/:check_status'        => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 1]], //财务 成交报告-未结单-第一级审核
-    'reportListTwo/:check_status'        => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 2]], //财务 成交报告-未结单-第二级审核
-    'reportListThree/:check_status'      => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 3]], //财务 成交报告-未结单-第三级审核
-    'reportListStatement/:check_status'  => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 4]], //财务 成交报告-已结单
-    'reportListAll/:check_status'        => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 10]], //财务 成交报告-全部
-    'editBargainInfo'                    => ['index/OfficeBargain/editBargainInfo', ['method' => 'post']], //修改成交报告佣金
-    'checkReferrer'                      => ['index/OfficeBargain/checkReferrer', ['method' => 'get']], //检查是否有邀请人（客户邀请客户）
-    'searchOrderAgents'                  => ['index/OfficeBargain/searchOrderAgents', ['method' => 'GET']], //order_id获取盘方，客方，反签，独家，合作方
-    'addBargain'                         => ['index/OfficeBargain/addBargain', ['method' => 'post']], //新增成交报告佣金(分佣提成)
-    'getBargainCommission'               => ['index/OfficeBargain/getBargainCommission', ['method' => 'GET|POST']], //获取成交报告分佣方佣金和修改
-    'delPartialCommission'               => ['index/OfficeBargain/delPartialCommission', ['method' => 'POST']], //删除分佣方
-    'getRealIncome'                      => ['index/OfficeBargain/getRealIncome', ['method' => 'GET']], //获取实收日期
-    'addRealIncome'                      => ['index/OfficeBargain/addRealIncome', ['method' => 'POST']], //增加和编辑实收佣金
-    'addTallAge'                         => ['index/OfficeBargain/addTallAge', ['method' => 'POST']], //新增和编辑开票税费
-    'getTaxesById'                       => ['index/OfficeBargain/getTaxesById', ['method' => 'POST|GET']], //财务结单
-    'delTaxes'                           => ['index/OfficeBargain/delTaxes', ['method' => 'POST']], //删除开票税费
-    'backOutToOne'                       => ['index/OfficeBargain/backOutToOne', ['method' => 'POST']], //财务 成交报告-撤销成交报告
+    'getDistance'                            => ['index/OfficeManage/getDistance', ['method' => 'GET']], //获取两个经纬度距离
+    'getHouseAddress'                        => ['index/OfficeRoom/checkRepetition', ['method' => 'get']], //搜索楼号/栋/座+楼层+房号
+    'marchInList'                            => ['index/officeMarchIn/marchInList', ['method' => 'POST|GET']], //进场记录列表 朱伟 2018-06-13
+    'reportListOne/:check_status'            => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 1]], //财务 成交报告-未结单-第一级审核
+    'reportListTwo/:check_status'            => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 2]], //财务 成交报告-未结单-第二级审核
+    'reportListThree/:check_status'          => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 3]], //财务 成交报告-未结单-第三级审核
+    'reportListStatement/:check_status'      => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 4]], //财务 成交报告-已结单
+    'reportListAll/:check_status'            => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 10]], //财务 成交报告-全部
+    'editBargainInfo'                        => ['index/OfficeBargain/editBargainInfo', ['method' => 'post']], //修改成交报告佣金
+    'checkReferrer'                          => ['index/OfficeBargain/checkReferrer', ['method' => 'get']], //检查是否有邀请人（客户邀请客户）
+    'searchOrderAgents'                      => ['index/OfficeBargain/searchOrderAgents', ['method' => 'GET']], //order_id获取盘方，客方，反签，独家，合作方
+    'addBargain'                             => ['index/OfficeBargain/addBargain', ['method' => 'post']], //新增成交报告佣金(分佣提成)
+    'getBargainCommission'                   => ['index/OfficeBargain/getBargainCommission', ['method' => 'GET|POST']], //获取成交报告分佣方佣金和修改
+    'delPartialCommission'                   => ['index/OfficeBargain/delPartialCommission', ['method' => 'POST']], //删除分佣方
+    'getRealIncome'                          => ['index/OfficeBargain/getRealIncome', ['method' => 'GET']], //获取实收日期
+    'addRealIncome'                          => ['index/OfficeBargain/addRealIncome', ['method' => 'POST']], //增加和编辑实收佣金
+    'addTallAge'                             => ['index/OfficeBargain/addTallAge', ['method' => 'POST']], //新增和编辑开票税费
+    'getTaxesById'                           => ['index/OfficeBargain/getTaxesById', ['method' => 'POST|GET']], //财务结单
+    'delTaxes'                               => ['index/OfficeBargain/delTaxes', ['method' => 'POST']], //删除开票税费
+    'backOutToOne'                           => ['index/OfficeBargain/backOutToOne', ['method' => 'POST']], //财务 成交报告-撤销成交报告
 
 ]);
 
@@ -1095,8 +1096,8 @@ Route::group('office_api', [
     'getBroker'   => ['api/OfficeBroker/index', ['method' => 'get']],        //获取当前商铺或街铺的经纪人评论信息列表
     'getBrokerV2' => ['api/OfficeBroker/indexV2', ['method' => 'get']],        //获取当前商铺或街铺的经纪人评论信息列表
 
-    'getOfficeRoomInfo'        => ['api/OfficeRoom/getOfficeRoomInfo', ['method' => 'GET|POST']],//获取房源详情
-    'getOfficeBuildingInfo'        => ['api/OfficeBuilding/getOfficeBuildingInfo', ['method' => 'GET|POST']],//办公楼详情
+    'getOfficeRoomInfo'     => ['api/OfficeRoom/getOfficeRoomInfo', ['method' => 'GET|POST']],//获取房源详情
+    'getOfficeBuildingInfo' => ['api/OfficeBuilding/getOfficeBuildingInfo', ['method' => 'GET|POST']],//办公楼详情
 
 ]);
 //Route::miss('api/index/miss');//处理错误的url
\ No newline at end of file