From 26e0e90c9bbeeeff50ef5adfda51e5a977001ab7 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 8 Sep 2022 18:21:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=20=E5=A4=9A=E8=A7=84=E6=A0=BC=E5=9B=BE?= =?UTF-8?q?=E7=89=87=EF=BC=8C=E5=90=8E=E5=8F=B0=E6=96=87=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=99=A8=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Shop/Http/Resources/ProductDetail.php | 2 +- .../views/pages/file_manager/index.blade.php | 19 +++++++++++-------- .../beike/shop/default/css/page-product.scss | 9 +++++++++ resources/lang/en/admin/file_manager.php | 7 +++++++ resources/lang/zh_cn/admin/file_manager.php | 7 +++++++ themes/default/product.blade.php | 1 + 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/beike/Shop/Http/Resources/ProductDetail.php b/beike/Shop/Http/Resources/ProductDetail.php index f70cc0b3..4983dcfc 100644 --- a/beike/Shop/Http/Resources/ProductDetail.php +++ b/beike/Shop/Http/Resources/ProductDetail.php @@ -60,7 +60,7 @@ class ProductDetail extends JsonResource 'values' => array_map(function ($item) use ($lang) { return [ 'name' => $item['name'][$lang] ?? '', - 'image' => image_resize('catalog/' . $item['image']), + 'image' => $item['image'] ? image_resize($item['image']) : '', ]; }, $item['values']), ]; 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 11deffb0..a5fca8cd 100644 --- a/resources/beike/admin/views/pages/file_manager/index.blade.php +++ b/resources/beike/admin/views/pages/file_manager/index.blade.php @@ -121,7 +121,10 @@
@{{ index + 1 }}. @{{ image.name }}
-
@{{ image.status == 'complete' ? '完成' : '上传中' }}
+
+ {{ __('admin/file_manager.finish') }} + {{ __('admin/file_manager.uploading') }} +
@@ -397,7 +400,7 @@ }, deleteFile() { - this.$confirm('是否要删除选中文件', '提示', { + this.$confirm('{{ __('common.confirm_delete_file') }}', '{{ __('common.text_hint') }}', { type: 'warning' }).then(() => { const selectImageIndex = this.selectImageIndex; @@ -422,7 +425,7 @@ deleteFolder(node, data) { if (data.path) { - this.$confirm('正在进行删除文件夹操作，文件夹内所有文件都将被删除，是否确认？', '提示', { + this.$confirm('{{ __('admin/file_manager.confirm_delete_folder') }}', '{{ __('common.text_hint') }}', { type: 'warning' }).then(() => { $http.delete(`file_manager/directories`, { @@ -459,14 +462,14 @@ }, openInputBox(type, node, data) { - this.$prompt('', type == 'addFolder' ? '新建文件夹' : '重命名', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$prompt('', type == 'addFolder' ? '{{ __('admin/file_manager.new_folder') }}' : '{{ __('admin/file_manager.rename') }}', { + confirmButtonText: '{{ __('common.confirm') }}', + cancelButtonText: '{{ __('common.cancel') }}', inputPattern: /^.+$/, closeOnClickModal: false, inputValue: type == 'image' ? this.images[this.selectImageIndex].name : (type == 'renameFolder' ? data - .name : '新建文件夹'), - inputErrorMessage: '不能为空' + .name : '{{ __('admin/file_manager.new_folder') }}'), + inputErrorMessage: '{{ __('admin/file_manager.can_empty') }}' }).then(({ value }) => { diff --git a/resources/beike/shop/default/css/page-product.scss b/resources/beike/shop/default/css/page-product.scss index c66c654b..f003b1d9 100644 --- a/resources/beike/shop/default/css/page-product.scss +++ b/resources/beike/shop/default/css/page-product.scss @@ -117,12 +117,21 @@ body.page-product { cursor: pointer; text-align: center; font-weight: bold; + flex-direction: column; // border-radius: 2rem; transition: all .1s ease-in-out; &:hover, &.selected { border-color: #222; } + > span.image { + width: 50px; + margin-top: -0.5rem; + margin-left: -0.5rem; + margin-right: -0.5rem; + margin-bottom: 6px; + } + &:not(.selected) { &.disabled { border: 1px dashed #bfbfbf; diff --git a/resources/lang/en/admin/file_manager.php b/resources/lang/en/admin/file_manager.php index ebe5080b..4fb139b0 100644 --- a/resources/lang/en/admin/file_manager.php +++ b/resources/lang/en/admin/file_manager.php @@ -25,4 +25,11 @@ return [ 'image_uploading' => 'Image Uploading', 'no_file' => 'No File', 'picture_space' => 'Picture Space', + + 'confirm_delete_file' => 'Do you want to delete the selected file', + 'confirm_delete_folder' => 'The folder deletion operation is in progress, all files in the folder will be deleted, do you want to confirm?', + 'new_folder' => 'New folder', + 'can_empty' => 'Can not be empty', + 'finish' => 'Finish', + 'uploading' => 'loading...', ]; diff --git a/resources/lang/zh_cn/admin/file_manager.php b/resources/lang/zh_cn/admin/file_manager.php index 3069d4de..e602f9dd 100644 --- a/resources/lang/zh_cn/admin/file_manager.php +++ b/resources/lang/zh_cn/admin/file_manager.php @@ -25,4 +25,11 @@ return [ 'image_uploading' => '图片上传中', 'no_file' => '没有文件', 'picture_space' => '图片空间', + + 'confirm_delete_file' => '是否要删除选中文件', + 'confirm_delete_folder' => '正在进行删除文件夹操作，文件夹内所有文件都将被删除，是否确认？', + 'new_folder' => '新建文件夹', + 'can_empty' => '不能为空', + 'finish' => '完成', + 'uploading' => '上传中', ]; diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index e86f9227..51c6e271 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -79,6 +79,7 @@ @click="checkedVariableValue(variable_index, value_index, value)" :key="value_index" :class="[value.selected ? 'selected' : '', value.disabled ? 'disabled' : '']"> + @{{ value.name }}