diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php index d7af251..007800f 100644 --- a/app/Admin/Controllers/ActivityController.php +++ b/app/Admin/Controllers/ActivityController.php @@ -139,7 +139,7 @@ class ActivityController extends AdminController ->static(true)->actions([]) ->body([ amis()->FieldSetControl()->title('竞猜场次')->body([ - amisMake()->CRUDTable()->affixHeader(false)->perPage(10)->loadDataOnce(true) + amisMake()->CRUDTable()->affixHeader(false)->perPage(10) ->headerToolbar([ DialogAction::make()->className('absolute top-3 right-4')->label(__('admin.create'))->icon('fa fa-add')->level('primary')->dialog( Dialog::make()->title('新增竞猜场次')->body([ @@ -176,7 +176,7 @@ class ActivityController extends AdminController ) ]) ->title('') - ->api(admin_url('activity_games?_action=getData&activity=${id}')) + ->api(admin_url('activity_games?_action=getData&activity=${id}&perPage=10&page=${page}')) ->columns([ amis()->TableColumn('name', __('admin.activity_games.name')), amis()->TableColumn('state', __('admin.activity_games.state'))->type('mapping')->map([ @@ -246,7 +246,7 @@ class ActivityController extends AdminController ]) ]), amis()->FieldSetControl()->title('活动奖品')->className('mt-10')->body([ - amisMake()->CRUDTable()->affixHeader(false)->perPage(10)->loadDataOnce(true) + amisMake()->CRUDTable()->affixHeader(false)->perPage(10) ->headerToolbar([ DialogAction::make()->className('absolute top-3 right-4')->label(__('admin.create'))->icon('fa fa-add')->level('primary')->dialog( Dialog::make()->title('新增活动奖品')->body([ @@ -273,7 +273,7 @@ class ActivityController extends AdminController ) ]) ->title('') - ->api(admin_url('activity_gifts?_action=getData&activity=${id}')) + ->api(admin_url('activity_gifts?_action=getData&activity=${id}&perPage=10&page=${page}')) ->columns([ amis()->TableColumn('name', __('admin.activity_gifts.name')), amis()->TableColumn('logo', __('admin.activity_gifts.logo'))->type('image')->height('30px')->width('30px'), diff --git a/app/Http/Controllers/Api/ActivityGameController.php b/app/Http/Controllers/Api/ActivityGameController.php index 02fc8a8..5a2c29a 100644 --- a/app/Http/Controllers/Api/ActivityGameController.php +++ b/app/Http/Controllers/Api/ActivityGameController.php @@ -26,7 +26,7 @@ class ActivityGameController extends ApiController $q->where('user_id', auth('api')->user()?->id ?? 0); }]) ->where('activity_id', $activityId)->show()->sort() - ->simplePaginate($request->query('per_page', 20)); + ->simplePaginate(50); return $this->success(['games'=>ActivityGameResource::collection($games)->resolve()]); }