xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/user0812' into develop_bm

Browse Source 
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-13 09:51:26 +08:00
parent 855a701675 67861532ec
commit 106add4ecc
14 changed files with 379 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/route.php
+13
View File
@@ -52,6 +52,8 @@ Route::group('/common', function () {
Route::group('/user', function () {
Route::any('/info', [app\common\controller\UserController::class, 'info']);
Route::any('/get', [app\common\controller\UserController::class, 'getUser']);
Route::any('/team', [app\common\controller\UserController::class, 'team']);
Route::any('/resign', [app\common\controller\UserController::class, 'resignMember']);
});
Route::group('/preset', function () {
@@ -73,6 +75,14 @@ Route::group('/admin', function () {
Route::any('/menu/resource', [app\admin\controller\RoleController::class, 'menuResource']);
});
// 用户
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::any('/update/password', [app\admin\controller\UserController::class, 'savePassword']);
});
// 公司
Route::group('/corp', function () {
Route::any('/list', [app\admin\controller\CorpController::class, 'index']);
@@ -149,6 +159,8 @@ Route::group('/admin', function () {
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']);
Route::any('/delete', [app\crmAdmin\controller\CustomerController::class, 'delete']);
Route::any('/follow', [app\crmAdmin\controller\CustomerController::class, 'follow']);
});
});
});
@@ -202,6 +214,7 @@ Route::group('/crm', function () {
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('/customer/seas', [app\crm\controller\CustomerController::class, 'putSeas']);
Route::any('/tagGroup/list', [app\crm\controller\TagGroupController::class, 'list']);
Route::any('/tagGroup/updatePivot', [app\crm\controller\TagGroupController::class, 'updatePivot']);