1

application/route.php

@@ -367,21 +367,14 @@ Route::group('index', [
     'officeBuildingList'          => ['index/OfficeBuilding/officeBuildingList', ['method' => 'POST|GET']],//办公楼liu
     'officeEdit'                  => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu
     'buildingDictionary'          => ['index/OfficeBuilding/buildingDictionary', ['method' => 'POST|GET']],//楼盘字典liu
-<<<<<<< HEAD
 
 
-=======
     'myCollectionOfficeList'      => ['index/OfficeBuilding/myCollectionOfficeList', ['method' => 'POST|GET']],//办公楼收藏liu
     'remarkFollowOffice'          => ['index/OfficeBuilding/remarkFollowOffice', ['method' => 'POST|GET']],//办公-客跟进liu
     'getCollectionTotal'          => ['index/OfficeBuilding/getCollectionTotal', ['method' => 'POST|GET']],//收款记录总liu
     'getCollectionOffice'          => ['index/OfficeBuilding/getCollectionOffice', ['method' => 'POST|GET']],//收款记录总liu
-    
-    
-    
-    
-    
-    
->>>>>>> 收款
+
+
     //‘页面的地址’                =》  index/控制器名称/使用的方法
     'inviteStatistics'            => ['index/InviteStatistics/inviteStatisticsList', ['method' => 'POST|GET']],//邀请注册liu
     'operationalData'             => ['index/OperationalData/operationalDataList', ['method' => 'POST|GET']],//运营数据统计liu
@@ -936,10 +929,35 @@ Route::group('search', [
 
 
 Route::group('office', [
-    'isBargainEnd' => ['api_broker/OrderLog/isBargainEnd', ['method' => 'GET']],
-    'houseAdd'          => ['api_broker/OfficeManage/add', ['method' => 'GET|POST']],//楼盘字典新增
-    'houseEdit'         => ['api_broker/OfficeManage/edit', ['method' => 'GET|POST']],//楼盘字典编辑
-    'delHouseFile'      => ['api_broker/OfficeManage/delHouseFile', ['method' => 'POST']],//删除楼盘图片
+    'houseAdd'     => ['api_broker/OfficeManage/add', ['method' => 'GET|POST']],//楼盘字典新增
+    'houseEdit'    => ['api_broker/OfficeManage/edit', ['method' => 'GET|POST']],//楼盘字典编辑
+    'delHouseFile' => ['api_broker/OfficeManage/delHouseFile', ['method' => 'POST']],//删除楼盘图片
+
+    'marchIn'                    => ['api_broker/OfficeOrderLog/marchIn', ['method' => 'get|post']],
+    'marchInV2'                  => ['api_broker/OfficeOrderLog/marchInV2', ['method' => 'get|post']],
+    'getBeforeBillInfo'          => ['api_broker/OfficeOrderLog/getBeforeBillInfo', ['method' => 'get|post']],
+    'savePosBillMessage'         => ['api_broker/OfficeOrderLog/savePosBillMessage', ['method' => 'get|post']],
+    'collectingBill'             => ['api_broker/OfficeOrderLog/collectingBill', ['method' => 'get|post']],
+    'collectingBillV2'           => ['api_broker/OfficeOrderLog/collectingBillV2', ['method' => 'get|post']],
+    'bargain'                    => ['api_broker/OfficeOrderLog/bargain', ['method' => 'get|post']],
+    'statusBargain'              => ['api_broker/OfficeOrderLog/statusBargain', ['method' => 'get|post']],
+    'getIsAccountStatement'      => ['api_broker/OfficeOrderLog/getIsAccountStatement', ['method' => 'get|post']],
+    'getLook'                    => ['api_broker/OfficeOrderLog/getLook', ['method' => 'get|post']],
+    'selectReportAll'            => ['api_broker/OfficeOrderLog/selectReportAll', ['method' => 'get|post']],
+    'selectReportAllV2'          => ['api_broker/OfficeOrderLog/selectReportAllV2', ['method' => 'get|post']],
+    'selectReportAllV3'          => ['api_broker/OfficeOrderLog/selectReportAllV3', ['method' => 'get|post']],
+    'searchOrder'                => ['api_broker/OfficeOrderLog/searchOrder', ['method' => 'get|post']],
+    'bargainList'                => ['api_broker/OfficeOrderLog/bargainList', ['method' => 'get|post']],
+    'bargainDetail'              => ['api_broker/OfficeOrderLog/bargainDetail', ['method' => 'get|post']],
+    'searchAgents'               => ['api_broker/OfficeOrderLog/searchAgents', ['method' => 'get']],
+    'searchBargainList'          => ['api_broker/OfficeOrderLog/searchBargainList', ['method' => 'get|post']],
+    'searchBargainListByOrderId' => ['api_broker/OfficeOrderLog/searchBargainListByOrderId', ['method' => 'get']],
+    'getListByHouseId'           => ['api_broker/OfficeOrderLog/getListByHouseId', ['method' => 'get']],
+    'searchBargainAgents'        => ['api_broker/OfficeOrderLog/searchBargainAgents', ['method' => 'get']],
+    'isBargainEnd'               => ['api_broker/OfficeOrderLog/isBargainEnd', ['method' => 'get']],
+    'getCommission'              => ['api_broker/OfficeOrderLog/getCommission', ['method' => 'GET|POST']],
+    'isShowAdjustment'           => ['api_broker/OfficeOrderLog/isShowAdjustment', ['method' => 'GET|POST']],
+    'addBargain'                 => ['api_broker/OfficeOrderLog/addBargain', ['method' => 'post']], //新增成交报告佣金(分佣提成)
 ]);
 
 Route::group('office_index', [