From bcf848fbad435a3a7452cbac2e4ca0ca00c189ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sun, 12 Mar 2023 01:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json            | 6 +++---
 src/pages/order/order.vue | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index b082f34..fb4fd7a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -3,8 +3,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "熊熊安装队",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "熊熊安装队"
 			}
 		},
 		{
@@ -46,7 +45,8 @@
 		{
 			"path": "pages/order/order",
 			"style": {
-				"navigationBarTitleText": "我的订单"
+				"navigationBarTitleText": "我的订单",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index b797c46..908ec56 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -112,7 +112,10 @@ export default {
     onReachBottom() {
         this.loadData();
     },
-    onPullDownRefresh() {},
+    onPullDownRefresh() {
+        this.switchTab(this.tabIndex);
+        uni.stopPullDownRefresh();
+    },
     methods: {
         /**
          * 切换tab页
@@ -145,7 +148,7 @@ export default {
             let currentTab = this.tabList[this.tabIndex];
             return new Promise((resolve, reject) => {
                 if (!currentTab.more) {
-                    return reject("没有更多了");
+                    return;
                 }
                 this.$models.order
                     .orderList({