Browse Source

相册更新

moshaorui 1 month ago
parent
commit
9efc56294a

+ 2 - 1
app/Admin/Controllers/ImportProductController.php

@@ -97,7 +97,8 @@ class ImportProductController extends AdminController
                 $filter->panel();
                 $filter->expand();
                 $filter->equal('model')->width(2);
-                $filter->equal('folder_id',admin_trans_label('product_category'))->select(RpcAlbumFolder::selectOptions())->width(2);
+                $lang = config('app.locale');//当前语言
+                $filter->equal('folder_id',admin_trans_label('product_category'))->select(RpcAlbumFolder::selectOptions($lang))->width(3);
             });
             // 删除新增按钮
             $grid->disableCreateButton();

+ 2 - 2
app/Admin/Repositories/RpcAlbumFolder.php

@@ -30,9 +30,9 @@ class RpcAlbumFolder extends EloquentRepository
      * 获取相册文件夹列表
      * $inIds 传入的相册ID数组,为空时获取全部相册
      */
-    public static function selectOptions() {
+    public static function selectOptions($lang = 'en') {
         $self = new self();
-        $result = $self->execute('siteAlbumFolderSelectOptionsAll', []);
+        $result = $self->execute('siteAlbumFolderSelectOptionsAll', ['lang'=>$lang]);
         $data = $result['data'] ?? [];
         return $data;
     }

+ 2 - 2
app/Distributor/Repositories/RpcAlbumFolder.php

@@ -43,7 +43,7 @@ class RpcAlbumFolder extends EloquentRepository
      * 获取相册文件夹列表
      * $inIds 传入的相册ID数组,为空时获取全部相册
      */
-    public static function selectOptions($lang = 'zh') {
+    public static function selectOptions($lang = 'en') {
         $self = new self();
         $inIds = $self->albumFolder;
         if ($lang == 'en') {
@@ -51,7 +51,7 @@ class RpcAlbumFolder extends EloquentRepository
         } else {
             $result = $self->execute('siteAlbumFolderSelectOptions', ['inIds' => $inIds]);
         }
-        
+
         $data = $result['data'] ?? [];
         return $data;
     }