Merge branch 'develop'

config/route.php

@@ -71,6 +71,14 @@ Route::group('/admin', function () {
         Route::any('/update', [app\admin\controller\RoleController::class, 'update']);
         Route::any('/destroy', [app\admin\controller\RoleController::class, 'destroy']);
     });
+
+    // 用户
+    Route::group('/user', function () {
+        Route::any('/list', [app\admin\controller\UserController::class, 'index']);
+        Route::any('/show', [app\admin\controller\UserController::class, 'show']);
+        Route::any('/update', [app\admin\controller\UserController::class, 'update']);
+    });
+
     // 公司
     Route::group('/corp', function () {
         Route::any('/list', [app\admin\controller\CorpController::class, 'index']);
@@ -89,6 +97,7 @@ Route::group('/admin', function () {
         Route::any('/destroy', [app\inquiry\controller\InquiryLogController::class, 'destroy']);
         Route::any('/release', [app\inquiry\controller\InquiryLogController::class, 'release']);
         Route::any('/allocation', [app\inquiry\controller\InquiryLogController::class, 'allocation']);
+        Route::any('/reallocation', [app\inquiry\controller\InquiryLogController::class, 'reAllocation']);
         // 统计
         Route::group('/statistics', function () {
             Route::any('/whole', [app\inquiry\controller\StatisticsController::class, 'whole']);
@@ -99,6 +108,17 @@ Route::group('/admin', function () {
             Route::any('/inquiry/count', [app\inquiry\controller\StatisticsController::class, 'inquiryCount']);
         });
     });
+
+    // crm
+    Route::group('/crm', function () {
+        Route::group('/customer', function () {
+            Route::any('/list', [app\crmAdmin\controller\CustomerController::class, 'list']);
+            Route::any('/export', [app\crmAdmin\controller\CustomerController::class, 'export']);
+            Route::any('/audit', [app\crmAdmin\controller\CustomerController::class, 'audit']);
+            Route::any('/transfer', [app\crmAdmin\controller\CustomerController::class, 'transfer']);
+            Route::any('/detail', [app\crmAdmin\controller\CustomerController::class, 'detail']);
+        });
+    });
 });
 
 
@@ -148,6 +168,7 @@ Route::group('/crm', function () {
     Route::any('/customer/getChannel', [app\crm\controller\CustomerController::class, 'getChannel']);
     Route::any('/customer/getCountry', [app\crm\controller\CustomerController::class, 'getCountry']);
     Route::any('/customer/followNext', [app\crm\controller\CustomerController::class, 'followNext']);
+    Route::any('/customer/report', [app\crm\controller\CustomerController::class, 'report']);
 
     Route::any('/tagGroup/list', [app\crm\controller\TagGroupController::class, 'list']);
     Route::any('/tagGroup/updatePivot', [app\crm\controller\TagGroupController::class, 'updatePivot']);