前台商品详情页 多规格图片，后台文件管理器多语言优化

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']),
             ];

resources/beike/admin/views/pages/file_manager/index.blade.php

@@ -121,7 +121,10 @@
         <div v-for="image, index in uploadFileDialog.images" :key="index" class="list">
           <div class="info">
             <div class="name">@{{ index + 1 }}. @{{ image.name }}</div>
-            <div class="status">@{{ image.status == 'complete' ? '完成' : '上传中' }}</div>
+            <div class="status">
+              <span v-if="image.status == 'complete'">{{ __('admin/file_manager.finish') }}</span>
+              <span v-else>{{ __('admin/file_manager.uploading') }}</span>
+            </div>
           </div>
           <el-progress :percentage="image.progre" :show-text="false" :stroke-width="4"></el-progress>
         </div>
@@ -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
           }) => {

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;

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...',
 ];

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' => '上传中',
 ];

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' : '']">
+                  <span class="image" v-if="value.image"><img :src="value.image" class="img-fluid"></span>
                   @{{ value.name }}
                 </div>
               </div>