fix: create poll and pagination issue

hitokoto-osc · Aug 27, 2023 · b3f1c2a · b3f1c2a
1 parent 97ee8bd
commit b3f1c2a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/composables/api/reviewer/poll.ts b/composables/api/reviewer/poll.ts
@@ -72,7 +72,7 @@ export type PollListRes = {
 }
 
 export function usePollList(
-  req: PollListReq,
+  req: PollListReq | Ref<PollListReq>,
   options: HTTPOption<PollListRes> = {}
 ) {
   return useHTTP.get<PollListRes>('/poll', req, options)

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,6 +1,6 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  ssr: process.env.NODE_ENV !== 'development',
+  // ssr: process.env.NODE_ENV !== 'development',
   app: {
     head: {
       meta: [

diff --git a/pages/dashboard/do_review.vue b/pages/dashboard/do_review.vue
@@ -47,23 +47,23 @@ const segmentOptions = reactive<string[]>(['全部', '待审核', '已审核'])
 const segmentedValue = ref(segmentOptions[0])
 
 // 获取投票列表
-const {
-  pending,
-  data: pollListData,
-  error,
-  refresh
-} = usePollList(
-  {
+const pollListParams = computed(() => {
+  return {
     status_start: PollStatus.Open,
     status_end: PollStatus.Open,
     with_records: true,
     page: page.value,
     page_size: pageSize.value
-  },
-  { lazy: true }
-)
+  }
+})
+const {
+  pending,
+  data: pollListData,
+  error,
+  refresh
+} = usePollList(pollListParams, { lazy: true })
 watch(
-  () => route.query,
+  () => [page.value, pageSize.value],
   () => refresh()
 )
 
@@ -114,7 +114,7 @@ const getNewPoll = async () => {
     // 如果当前页面是最后一页且不足 pageSize 条，刷新页面
     if (
       !pollListData.value?.data?.total ||
-      (page.value * pageSize.value < pollListData.value?.data?.total &&
+      (page.value * pageSize.value > pollListData.value?.data?.total &&
         cardData.value.length < pageSize.value)
     ) {
       refresh()
@@ -201,7 +201,12 @@ onMounted(() => {
           </a-button>
         </div>
         <div class="mobile">
-          <a-button type="primary">
+          <a-button
+            type="primary"
+            :loading="getNewPollLoading"
+            :disabled="getNewPollLoading"
+            @click="getNewPoll"
+          >
             <template #icon>
               <PlusCircleOutlined />
             </template>