修改banner

app/Http/Controllers/admin/ActivityReward.php

@@ -20,6 +20,7 @@ class ActivityReward extends Controller
                 'page' => ['required', 'integer', 'min:1'],
                 'limit' => ['required', 'integer', 'min:1'],
                 'title' => ['nullable', 'string'],
+                'type' => ['nullable', 'string'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 10);
@@ -50,6 +51,7 @@ class ActivityReward extends Controller
                 'end_time' => ['required', 'date', 'date_format:Y-m-d', 'after_or_equal:start_time'],
                 'detail_image' => ['required', 'url', 'regex:/\.(jpeg|jpg|png|webp)$/i'],
                 'status' => ['required', 'integer', 'min:0', 'max:1'],
+                'type' => ['required', 'string'],
             ]);
             ActivityRewardService::submit($params);
             DB::commit();

app/Http/Controllers/admin/Banner.php

@@ -28,7 +28,13 @@ class Banner extends Controller
         try {
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
+            $type = request()->input('type', '');
+            
             $query = new BannerModel();
+
+            if (!empty($type)) {
+                $query->where('type', $type);
+            }
             $count = $query->count();
             $list = $query
                  ->forPage($page, $limit)
@@ -60,7 +66,7 @@ class Banner extends Controller
                 'title' => ['required'],
                 'image' => ['required'],
                 'link' => ['nullable'],
-                'type' => ['nullable'],
+                'type' => ['required'],
                 'sort' => ['nullable'],
             ]);
             $id = $params['id'] ?? null;

app/Services/ActivityRewardService.php

@@ -36,6 +36,10 @@ class ActivityRewardService extends BaseService
             $where[] = ['status', '=', $search['status']];
         }
 
+        if (isset($search['type']) && $search['type'] != '') {
+            $where[] = ['type', '=', $search['type']];
+        }
+
         if (isset($search['title']) && !empty($search['title'])) {
             $where[] = ['title', 'like', "%{$search['title']}%"];
         }