From 22a4d0c8a55bcace3c533b7a1cf273752c763e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 9 Mar 2021 18:46:29 +0800
Subject: [PATCH] Update ShopOrder.php

---
 app/data/controller/ShopOrder.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php
index fb94ffd82..71d6f97d4 100644
--- a/app/data/controller/ShopOrder.php
+++ b/app/data/controller/ShopOrder.php
@@ -73,12 +73,7 @@ class ShopOrder extends Controller
             $query->where(['status' => $this->type]);
         }
         // 分页排序处理
-        $query->where(['deleted' => 0])->order('id desc');
-        if (input('output') === 'json') {
-            $this->success('获取数据成功', $query->page(true, false));
-        } else {
-            $query->page();
-        }
+        $query->where(['deleted' => 0])->order('id desc')->page();
     }
 
     /**