相册更新

app/Distributor/Controllers/SiteAlbumController.php

@@ -61,9 +61,9 @@ class SiteAlbumController extends AdminController
     protected function grid()
     {
         //相册分类
-        $rpcAlbumFolder = RpcAlbumFolder::selectOptions();
-        return Grid::make(new RpcAlbum(), function (Grid $grid) use ($rpcAlbumFolder) {
-            $lang = config('app.locale');//当前语言
+        $lang = config('app.locale');//当前语言
+        $rpcAlbumFolder = RpcAlbumFolder::selectOptions($lang);
+        return Grid::make(new RpcAlbum(), function (Grid $grid) use ($rpcAlbumFolder, $lang) {
             $grid->view('admin.grid.table');
             $grid->column('id')->display(function () {
                 return $this->_index+1;
@@ -82,11 +82,11 @@ class SiteAlbumController extends AdminController
             $grid->column('model');
             $grid->column('updated_at')->sortable();
             // 筛选
-            $grid->filter(function (Grid\Filter $filter) use ($rpcAlbumFolder) {
+            $grid->filter(function (Grid\Filter $filter) use ($rpcAlbumFolder, $lang) {
                 $filter->panel();
                 $filter->expand();
                 $filter->equal('model')->width(2);
-                $filter->equal('folder_id',admin_trans_label('product_category'))->select($rpcAlbumFolder)->width(2);
+                $filter->equal('folder_id',admin_trans_label('product_category'))->select($rpcAlbumFolder)->width(3);
             });
             // 删除新增按钮
             $grid->disableCreateButton();

app/Distributor/Repositories/RpcAlbumFolder.php

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