diff --git a/beike/Admin/Http/Controllers/FileManagerController.php b/beike/Admin/Http/Controllers/FileManagerController.php index 924e71b6..c117ba84 100644 --- a/beike/Admin/Http/Controllers/FileManagerController.php +++ b/beike/Admin/Http/Controllers/FileManagerController.php @@ -31,10 +31,12 @@ class FileManagerController extends Controller public function getFiles(Request $request): array { $baseFolder = $request->get('base_folder'); + $sort = $request->get('sort', 'created'); + $order = $request->get('order', 'desc'); $page = (int) $request->get('page'); $perPage = (int) $request->get('per_page'); - $data = (new FileManagerService)->getFiles($baseFolder, $page, $perPage); + $data = (new FileManagerService)->getFiles($baseFolder, $sort, $order, $page, $perPage); return hook_filter('admin.file_manager.files.data', $data); } diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index 60549a7c..65bfa5d1 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -49,18 +49,34 @@ class FileManagerService * 获取某个目录下的文件和文件夹 * * @param $baseFolder + * @param $sort + * @param $order * @param int $page * @param int $perPage * @return array * @throws \Exception */ - public function getFiles($baseFolder, int $page = 1, int $perPage = 20): array + public function getFiles($baseFolder, $sort, $order, int $page = 1, int $perPage = 20): array { $currentBasePath = rtrim($this->fileBasePath . $baseFolder, '/'); $files = glob($currentBasePath . '/*'); - usort($files, function ($a, $b) { - return filemtime($a) - filemtime($b) < 0; - }); + + if ($sort == 'created') { + if ($order == 'desc') { + usort($files, function ($a, $b) { + return filemtime($a) - filemtime($b) < 0; + }); + } else { + usort($files, function ($a, $b) { + return filemtime($a) - filemtime($b) >= 0; + }); + } + } else { + natcasesort($files); + if ($order == 'desc') { + $files = array_reverse($files); + } + } $images = []; foreach ($files as $file) { diff --git a/beike/Installer/Controllers/BaseController.php b/beike/Installer/Controllers/BaseController.php index 9b5fa05c..eced5e02 100644 --- a/beike/Installer/Controllers/BaseController.php +++ b/beike/Installer/Controllers/BaseController.php @@ -12,6 +12,4 @@ class BaseController extends Controller exit('Already installed'); } } - - } diff --git a/beike/Models/Order.php b/beike/Models/Order.php index c499762e..ca13ed75 100644 --- a/beike/Models/Order.php +++ b/beike/Models/Order.php @@ -68,8 +68,9 @@ class Order extends Base public function getStatusFormatAttribute() { - $status_format = trans('order.' . $this->status); + $status_format = trans('order.' . $this->status); $status_format = hook_filter('order.status_format', $status_format); + return $status_format; } diff --git a/beike/Shop/Http/Controllers/Account/EditController.php b/beike/Shop/Http/Controllers/Account/EditController.php index bc4f7ca4..c83acc2e 100644 --- a/beike/Shop/Http/Controllers/Account/EditController.php +++ b/beike/Shop/Http/Controllers/Account/EditController.php @@ -22,7 +22,8 @@ class EditController extends Controller { $customer = current_customer(); $data['customer'] = $customer; - $data = hook_filter('account.edit.index', $data); + $data = hook_filter('account.edit.index', $data); + return view('account/edit', $data); } diff --git a/beike/Shop/Http/Controllers/PageCategoryController.php b/beike/Shop/Http/Controllers/PageCategoryController.php index faeb40e8..77e9ffc5 100644 --- a/beike/Shop/Http/Controllers/PageCategoryController.php +++ b/beike/Shop/Http/Controllers/PageCategoryController.php @@ -31,6 +31,7 @@ class PageCategoryController extends Controller 'active_pages' => PageRepo::getCategoryPages(), ]; $data = hook_filter('page_categories.home.data', $data); + return view('page_categories/home', $data); } @@ -46,6 +47,7 @@ class PageCategoryController extends Controller 'category_pages' => $pageCategory->pages()->paginate(12), ]; $data = hook_filter('page_categories.show.data', $data); + return view('page_categories/show', $data); } } diff --git a/resources/beike/admin/views/pages/file_manager/index.blade.php b/resources/beike/admin/views/pages/file_manager/index.blade.php index af61cd66..450f8c64 100644 --- a/resources/beike/admin/views/pages/file_manager/index.blade.php +++ b/resources/beike/admin/views/pages/file_manager/index.blade.php @@ -85,6 +85,29 @@ @hook('admin.file_manager.content.head.btns.after')
+ +
{{ __('admin/file_manager.file_sorting') }}
+
+
{{ __('admin/file_manager.text_type') }}
+ + {{ __('admin/file_manager.text_created') }} + {{ __('admin/file_manager.file_name') }} + +
+ +
+
{{ __('admin/file_manager.to_sort') }}
+ + {{ __('admin/file_manager.text_desc') }} + {{ __('admin/file_manager.text_asc') }} + +
+ + {{ __('admin/file_manager.upload_files') }}
@@ -103,10 +126,6 @@
- {{-- - --}} - { diff --git a/resources/lang/en/admin/file_manager.php b/resources/lang/en/admin/file_manager.php index 294955f6..796774f1 100644 --- a/resources/lang/en/admin/file_manager.php +++ b/resources/lang/en/admin/file_manager.php @@ -10,6 +10,13 @@ */ return [ + 'file_sorting' => 'File Sorting', + 'text_type' => 'Type', + 'text_created' => 'Created Time', + 'file_name' => 'File Name', + 'to_sort' => 'Sort', + 'text_desc' => 'Descent', + 'text_asc' => 'Ascent', 'file_manager_create' => 'Create', 'file_manager_show' => 'View', 'file_manager_update' => 'Rename', @@ -20,7 +27,7 @@ return [ 'create_folder' => 'Create folder', 'rename' => 'Rename', 'download' => 'Download', - 'upload_files' => 'Upload Files', + 'upload_files' => 'Upload', 'click_upload' => 'Click upload, or drag image here', 'image_uploading' => 'Image Uploading', 'no_file' => 'No File', diff --git a/resources/lang/en/admin/setting.php b/resources/lang/en/admin/setting.php index bfdcdbda..b0c83a12 100644 --- a/resources/lang/en/admin/setting.php +++ b/resources/lang/en/admin/setting.php @@ -74,5 +74,5 @@ return [ 'multi_filter' => 'Multi Filter', 'please_select' => 'Please select', 'multi_filter_helper' => 'Please select the attributes to be displayed in the Multi Filter module.', - 'filter_attribute' => 'Attribute Filter', + 'filter_attribute' => 'Attribute Filter', ]; diff --git a/resources/lang/zh_cn/admin/file_manager.php b/resources/lang/zh_cn/admin/file_manager.php index 43b71768..04383af9 100644 --- a/resources/lang/zh_cn/admin/file_manager.php +++ b/resources/lang/zh_cn/admin/file_manager.php @@ -10,6 +10,13 @@ */ return [ + 'file_sorting' => '文件排序', + 'text_type' => '类型', + 'text_created' => '创建时间', + 'file_name' => '文件名称', + 'to_sort' => '排序', + 'text_desc' => '倒序', + 'text_asc' => '顺序', 'file_manager_create' => '创建目录/文件', 'file_manager_show' => '查看目录/文件', 'file_manager_update' => '重命名', diff --git a/resources/lang/zh_cn/admin/setting.php b/resources/lang/zh_cn/admin/setting.php index 37dfc918..dd90f9a6 100644 --- a/resources/lang/zh_cn/admin/setting.php +++ b/resources/lang/zh_cn/admin/setting.php @@ -72,5 +72,5 @@ return [ 'multi_filter' => '高级筛选', 'please_select' => '请添加', 'multi_filter_helper' => '请选择需要在筛选模块显示的属性', - 'filter_attribute' => '属性筛选', + 'filter_attribute' => '属性筛选', ]; diff --git a/resources/lang/zh_hk/admin/file_manager.php b/resources/lang/zh_hk/admin/file_manager.php index 8d7cd9d0..bb521569 100644 --- a/resources/lang/zh_hk/admin/file_manager.php +++ b/resources/lang/zh_hk/admin/file_manager.php @@ -10,6 +10,13 @@ */ return [ + 'file_sorting' => '文件排序', + 'text_type' => '類型', + 'text_created' => '創建時間', + 'file_name' => '文件名稱', + 'to_sort' => '排序', + 'text_desc' => '倒序', + 'text_asc' => '順序', 'file_manager_create' => '創建目錄/文件', 'file_manager_show' => '查看目錄/文件', 'file_manager_update' => '重命名', diff --git a/resources/lang/zh_hk/admin/setting.php b/resources/lang/zh_hk/admin/setting.php index 42d7241e..bf815062 100644 --- a/resources/lang/zh_hk/admin/setting.php +++ b/resources/lang/zh_hk/admin/setting.php @@ -73,5 +73,5 @@ return [ 'multi_filter' => '高級篩選', 'please_select' => '請添加', 'multi_filter_helper' => '請選擇需要在篩選模塊顯示的屬性', - 'filter_attribute' => '屬性篩選', + 'filter_attribute' => '屬性篩選', ];