Merge branch 'master' into dev

app/Http/Controllers/Admin/Base/PhotosController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Base;
 
 use App\Http\Controllers\Admin\Controller;
+use App\Models\AlbumManufacturerModel;
 use App\Services\Base\Attachment;
 use App\Models\BaseAttachmentModel;
 use App\Models\BaseSettingsModel;
@@ -53,6 +54,14 @@ class PhotosController extends Controller
                 } else {
                     $photos = BaseAttachmentModel::where([['class', $a_class->class],['store_id', $this->getStoreId()]])->paginate(24);
                 }
+            } else {
+                $ma = AlbumManufacturerModel::where('store_id',$this->getStoreId())->first();
+                $save = [
+                    'store_id' => $this->getStoreId(),
+                    'class'=> ($ma->name or '未分类')
+                ];
+                $a_class = ClassModel::create($save);
+                return redirect('admin/Base/Photos/index');
             }
         }
 dd($classes);

app/Models/ClassModel.php

@@ -16,7 +16,7 @@ class ClassModel extends BaseModel
     主键
      */
     protected $primaryKey = 'id';
-
+    protected $fillable = ['store_id', 'class'];
     //分页
     protected $perPage = PAGE_NUMS;
 }