From 6c274bb7c6d8c87735eb6759899b0e5e2f6e8fac Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 23 Apr 2021 17:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3page=E5=80=BC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BD=BF=E7=94=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/controllers/article.controller.ts | 2 +-
 src/admin/controllers/coupon.controller.ts  | 2 +-
 src/admin/controllers/game.controller.ts    | 2 +-
 src/admin/controllers/puzzle.controller.ts  | 2 +-
 src/admin/controllers/shop.controller.ts    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/admin/controllers/article.controller.ts b/src/admin/controllers/article.controller.ts
index e2578fb..951e5ea 100644
--- a/src/admin/controllers/article.controller.ts
+++ b/src/admin/controllers/article.controller.ts
@@ -9,8 +9,8 @@ export class ArticleController extends BaseController {
   @router('post /articles')
   async query(req: any) {
     let { start, limit, page} = req.params
-    start = +start || +page || 0
     limit = +limit || 10
+    start = +start || (+page - 1) * start|| 0
     let { opt, sort } = Article.parseQueryParam(req.params)
     let articles = await Article.find(opt)
       .sort(sort)
diff --git a/src/admin/controllers/coupon.controller.ts b/src/admin/controllers/coupon.controller.ts
index d4c0daf..c0d46de 100644
--- a/src/admin/controllers/coupon.controller.ts
+++ b/src/admin/controllers/coupon.controller.ts
@@ -8,8 +8,8 @@ class CouponController extends BaseController{
   @router('post /coupons')
   async list(req, res) {
     let { start, limit, page } = req.params
-    start = +start || +page || 0
     limit = +limit || 10
+    start = +start || (+page - 1) * start|| 0
     let { opt, sort } = Coupon.parseQueryParam(req.params)
     let articles = await Coupon.find(opt)
       .sort(sort)
diff --git a/src/admin/controllers/game.controller.ts b/src/admin/controllers/game.controller.ts
index 3334144..6ad6e57 100644
--- a/src/admin/controllers/game.controller.ts
+++ b/src/admin/controllers/game.controller.ts
@@ -8,8 +8,8 @@ class GameController extends BaseController{
   @router('post /games')
   async list(req, res) {
     let { start, limit, page } = req.params
-    start = +start || +page || 0
     limit = +limit || 10
+    start = +start || (+page - 1) * start|| 0
     let { opt, sort } = Game.parseQueryParam(req.params)
     let articles = await Game.find(opt)
       .sort(sort)
diff --git a/src/admin/controllers/puzzle.controller.ts b/src/admin/controllers/puzzle.controller.ts
index eaa0dac..9dd5226 100644
--- a/src/admin/controllers/puzzle.controller.ts
+++ b/src/admin/controllers/puzzle.controller.ts
@@ -10,8 +10,8 @@ class PuzzleController extends BaseController{
   @router('post /puzzles')
   async list(req, res) {
     let { start, limit, page } = req.params
-    start = +start || +page || 0
     limit = +limit || 10
+    start = +start || (+page - 1) * start|| 0
     let { opt, sort } = Puzzle.parseQueryParam(req.params)
     let articles = await Puzzle.find(opt)
       .sort(sort)
diff --git a/src/admin/controllers/shop.controller.ts b/src/admin/controllers/shop.controller.ts
index 13217e4..707eeb4 100644
--- a/src/admin/controllers/shop.controller.ts
+++ b/src/admin/controllers/shop.controller.ts
@@ -10,8 +10,8 @@ class ShopController extends BaseController {
   @router('post /shops')
   async shopList(req, res) {
     let { start, limit, page } = req.params
-    start = +start || +page || 0
     limit = +limit || 10
+    start = +start || (+page - 1) * start|| 0
     let { opt, sort } = Shop.parseQueryParam(req.params)
     let articles = await Shop.find(opt)
       .sort(sort)