db类pagination方法兼容jj.js v0.8.0

yafoo · Aug 16, 2022 · dd4f126 · dd4f126
1 parent 8743cef
commit dd4f126
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/model/article.js b/app/model/article.js
@@ -11,20 +11,20 @@ class Article extends Model
     async getIndexList(page_size=10, with_page=false) {
         const modle = this.db.table('article a').field('a.id,a.cate_id,a.user_id,a.title,a.writer,a.keywords,a.click,a.description,a.add_time,a.thumb,c.cate_name,c.cate_dir').join('cate c', 'a.cate_id=c.id').order('a.id', 'desc').limit(page_size).cache(this.cacheTime);
         if(with_page) {
-            return await modle.pagination(this.$pagination.index, page_size);
+            return await modle.pagination({page_size, pagination: this.$pagination.index});
         } else {
             return [await modle.select()];
         }
     }
 
     // 栏目文章列表及分页
     async getPageList(condition, page_size=10) {
-        return await this.db.field('id,cate_id,user_id,title,writer,source,click,keywords,description,add_time,thumb').where(condition).order('id', 'desc').cache(this.cacheTime).pagination(this.$pagination.cate, page_size);
+        return await this.db.field('id,cate_id,user_id,title,writer,source,click,keywords,description,add_time,thumb').where(condition).order('id', 'desc').cache(this.cacheTime).pagination({page_size, pagination: this.$pagination.cate});
     }
 
     // 搜索文章列表及分页
     async getSearchList(condition, page_size=10) {
-        return await this.db.table('article a').field('a.id,a.cate_id,a.user_id,a.title,a.writer,a.keywords,a.click,a.description,a.add_time,a.thumb,c.cate_name,c.cate_dir').join('cate c', 'a.cate_id=c.id').where(condition).order('a.id', 'desc').cache(this.cacheTime).pagination(undefined, page_size);
+        return await this.db.table('article a').field('a.id,a.cate_id,a.user_id,a.title,a.writer,a.keywords,a.click,a.description,a.add_time,a.thumb,c.cate_name,c.cate_dir').join('cate c', 'a.cate_id=c.id').where(condition).order('a.id', 'desc').cache(this.cacheTime).pagination({page_size});
     }
 
     // 获取一篇文章