fix:修复分页

lfb · Dec 26, 2021 · c70f388 · c70f388
1 parent e8eb4d0
commit c70f388
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/app/dao/article.js b/app/dao/article.js
@@ -146,7 +146,7 @@ class ArticleDao {
     }
     try {
       const article = await Article.scope('iv').findAndCountAll({
-        // limit: page_size, //每页10条
+        limit: page_size, //每页10条
         offset: (page - 1) * page_size,
         where: filter,
         order: [
@@ -170,8 +170,6 @@ class ArticleDao {
         rows = dataAndAdmin
       }
 
-      console.log(rows)
-      console.log(Array.isArray(rows) && rows.length > 0)
       if (Array.isArray(rows) && rows.length > 0) {
         rows.sort((a, b) => b.sort_order - a.sort_order)
       }

diff --git a/app/dao/category.js b/app/dao/category.js
@@ -124,7 +124,7 @@ class CategoryDao {
     try {
       const category = await Category.scope('bh').findAndCountAll({
         where: params,
-        // limit: page_size, //每页10条
+        limit: page_size, //每页10条
         offset: (page - 1) * page_size,
         order: [
           ['created_at', 'DESC']

diff --git a/frontend-boblog/pages/index.vue b/frontend-boblog/pages/index.vue
@@ -30,7 +30,7 @@
       <a v-if="isClear" href="/">清空搜索条件</a>
     </div>
 
-    <div v-if="isLoad" class="more" @click="loadMore">
+    <div v-if="isLoad" class="response-wrap more" @click="loadMore">
       <div class="more-text">点击加载更多</div>
       <div class="more-arrow">
         <img src="https://cdn.boblog.com/arrow.png" alt="" />
@@ -126,7 +126,7 @@ export default {
       })
       if (!err) {
         this.categoryId = id
-        this.article.push(...res.data.data)
+        this.article.data.push(...res.data.data.data)
         this.isLoad = res.data.data.meta.total_pages > this.page
       }
     },
@@ -204,8 +204,7 @@ export default {
 
 .more {
   cursor: pointer;
-  width: 1280px;
-  margin: 0 auto;
+  padding: 32px 0;
   display: flex;
   align-items: center;
   justify-content: center;