From 7ce35e0f7994c56ae4dce6eb41b19b27c4c484e3 Mon Sep 17 00:00:00 2001
From: huangzhen <huangzhen@rd3.ngsoft.com>
Date: Tue, 29 Oct 2024 17:39:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20@=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/orderList/index.vue | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/pages/orderList/index.vue b/src/views/pages/orderList/index.vue
index e7a4531..ba53121 100644
--- a/src/views/pages/orderList/index.vue
+++ b/src/views/pages/orderList/index.vue
@@ -1,12 +1,13 @@
 <template>
   <van-loading v-if="loadingStatus" class="pageNoneLoading_Vant" size="24px" color="#0094ff" vertical>加载中...</van-loading>
   <div v-else class="orderListBody">
-    <div v-if="!listData.length" class="noneBox">
-      <img class="noneImg" :src="require('./img/order-empty.png')" alt="">
-      <p class="noneText">暂无订单</p>
-    </div>
-    <van-pull-refresh v-else class="refreshBody" v-model="refreshLoading" @refresh="onRefresh">
+    <van-pull-refresh class="refreshBody" v-model="refreshLoading" @refresh="onRefresh">
+      <div v-if="!listData.length" class="noneBox">
+        <img class="noneImg" :src="require('./img/order-empty.png')" alt="">
+        <p class="noneText">暂无订单</p>
+      </div>
       <van-list
+        v-else
         class="listBox"
         v-model:loading="loading"
         :finished="finished"
@@ -132,11 +133,12 @@ export default {
           if (res.data.orders.length < this.pageSize) {
             this.finished = true;
           }
-          this.listData = [ ...this.listData, ...res.data.orders ];
+          return this.listData = [ ...this.listData, ...res.data.orders ];
         } else {
           this.finished = true;
         }
       } else {
+        this.refreshLoading = false;
         showToast(res?.message || '请求失败');
       }
     },
@@ -144,8 +146,10 @@ export default {
       this.page = 1;
       this.finished = false;
       this.loading = true;
-      await this.getData();
-      showToast('刷新成功');
+      const list = await this.getData();
+      if (list && list.length) {
+        showToast('刷新成功');
+      }
     },
     async onLoad() {
       this.page++;
@@ -189,6 +193,7 @@ export default {
     }
   }
   .refreshBody {
+    min-height: 80vh;
     .listBox {
       width: 100%;
       min-height: 100vh;