diff --git a/beike/Admin/Http/Controllers/FilemanagerController.php b/beike/Admin/Http/Controllers/FilemanagerController.php index a7631ea5..eb8803d9 100644 --- a/beike/Admin/Http/Controllers/FilemanagerController.php +++ b/beike/Admin/Http/Controllers/FilemanagerController.php @@ -2,11 +2,18 @@ namespace Beike\Admin\Http\Controllers; +use Illuminate\Http\Request; + class FileManagerController extends Controller { - public function index() + public function index(Request $request) { + $baseFolder = $request->get('base_folder'); + $fileBasePath = public_path('catalog'); + if ($baseFolder) { + $fileBasePath .= '/' . $baseFolder; + } $files = glob($fileBasePath . '/*'); $folders = $images = []; @@ -28,6 +35,9 @@ class FileManagerController extends Controller 'folders' => $folders, 'images' => $images ]; + if ($request->ajax()) { + return $data; + } return view('admin::pages.filemanager.index', $data); } }