diff --git a/frontend/src/vues/CharacterList.vue b/frontend/src/vues/CharacterList.vue index b19329b..621b1ea 100644 --- a/frontend/src/vues/CharacterList.vue +++ b/frontend/src/vues/CharacterList.vue @@ -63,7 +63,13 @@ function setPage(targetPage: number) { router.replace({ query: { page: targetPage } }) } -watch(route, (newValue, oldValue) => { +watch(route, (newValue, oldValue) => { + if (!route.query.page) { + router.replace({ query: { page: 1 } }) + page.value = 1 + } else { + page.value = Number(route.query.page) + } page.value = Number(route.query.page) loadData() }) @@ -71,8 +77,10 @@ watch(route, (newValue, oldValue) => { onMounted(async () => { if (!route.query.page) { router.replace({ query: { page: 1 } }) + page.value = 1 + } else { + page.value = Number(route.query.page) } - page.value = Number(route.query.page) loadData() }) diff --git a/frontend/src/vues/GameList.vue b/frontend/src/vues/GameList.vue index afcb2f8..064a5ad 100644 --- a/frontend/src/vues/GameList.vue +++ b/frontend/src/vues/GameList.vue @@ -42,7 +42,7 @@ const filtervalue = ref('') async function loadData() { const response = await axios.post('/api/game', { page: `${page.value - 1}`, - count: `10`, + count: `${count}`, filter: filtervalue.value ? `title:${filtervalue.value}` : '', orderBy: 'id' }) @@ -74,13 +74,6 @@ watch(filtervalue, (oldFilter, newFilter) => { }) onMounted(async () => { - if (!route.query.page) { - router.replace({ query: { page: 1 } }) - page.value = 1 - } else { - page.value = Number(route.query.page) - } - console.log(page.value) loadData() })