diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php index 21dd8b6e..de2c787d 100644 --- a/app/Http/Controllers/ClosetController.php +++ b/app/Http/Controllers/ClosetController.php @@ -48,9 +48,10 @@ class ClosetController extends Controller $closet = $closet->where('item_name', 'like', "%$q%"); } + $total = $closet->count(); $closet->offset(($page - 1) * $perPage)->limit($perPage); - $totalPages = ceil($closet->count() / $perPage); + $totalPages = ceil($total / $perPage); $items = $closet->get()->map(function ($t) { $t->name = $t->pivot->item_name; diff --git a/resources/assets/src/views/user/Closet.vue b/resources/assets/src/views/user/Closet.vue index 43254fc9..cb32330e 100644 --- a/resources/assets/src/views/user/Closet.vue +++ b/resources/assets/src/views/user/Closet.vue @@ -213,6 +213,7 @@ export default { ) this[`${category}TotalPages`] = totalPages this[`${category}Items`] = items + this[`${category}CurrentPages`] = page }, removeSkinItem(index) { this.$delete(this.skinItems, index) @@ -222,7 +223,7 @@ export default { }, switchCategory() { this.category = this.category === 'skin' ? 'cape' : 'skin' - this.loadCloset() + this.loadCloset(this[`${this.category}CurrentPages`]) }, pageChanged(page) { this.loadCloset(page)