From 8e9cda6a610cba51374650769ee4f681f181be74 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Fri, 24 May 2024 12:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/home/index.vue        |  3 +--
 src/pages/index/index.vue             |  4 +---
 src/pages/index/user/index.vue        | 14 +++++++++++---
 src/subPackages/order/list/index.vue  |  9 +++++++++
 src/subPackages/site/search/index.vue |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/home/index.vue b/src/pages/index/home/index.vue
index b72f833..73e8f66 100644
--- a/src/pages/index/home/index.vue
+++ b/src/pages/index/home/index.vue
@@ -121,7 +121,6 @@ export default {
     this.$bus.$on("pullDownRefresh", () => {
       this.paramter.currentPage = 1;
       this.isReachBottom = false;
-
       this.obtainLocation();
     });
   },
@@ -168,8 +167,8 @@ export default {
             this.isReachBottom = true;
           }
           this.tableList = this.tableList.concat(res.data.list);
-          uni.stopPullDownRefresh();
         }
+        uni.stopPullDownRefresh();
       });
     },
     sift(params) {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e782a5b..88843e6 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -47,9 +47,7 @@ export default {
       this.$bus.$emit("pullDownRefresh");
     }
     if (this.currentTab === "user") {
-      setTimeout(() => {
-        uni.stopPullDownRefresh();
-      }, 500);
+      this.$bus.$emit("userPullDownRefresh");
     }
   },
   onReachBottom() {
diff --git a/src/pages/index/user/index.vue b/src/pages/index/user/index.vue
index 6f03303..d615318 100644
--- a/src/pages/index/user/index.vue
+++ b/src/pages/index/user/index.vue
@@ -106,6 +106,15 @@ export default {
   },
   created() {
     if (this.userInfo.id) {
+      this.statisticOrderTotalData();
+
+      this.$bus.$on("userPullDownRefresh", () => {
+        this.statisticOrderTotalData();
+      });
+    }
+  },
+  methods: {
+    statisticOrderTotalData() {
       serve
         .statisticOrderTotalData({
           customerId: this.userInfo.id,
@@ -114,10 +123,9 @@ export default {
           if (res.code === 20000) {
             this.statisticInfo = res.data;
           }
+          uni.stopPullDownRefresh();
         });
-    }
-  },
-  methods: {
+    },
     jumpOrder(status = "") {
       uni.navigateTo({
         url: `/subPackages/order/list/index?status=${status}`,
diff --git a/src/subPackages/order/list/index.vue b/src/subPackages/order/list/index.vue
index 05586f5..78307f2 100644
--- a/src/subPackages/order/list/index.vue
+++ b/src/subPackages/order/list/index.vue
@@ -16,7 +16,9 @@
       <scroll-view
         style="flex: 1; overflow: hidden"
         scroll-y="true"
+        :refresher-triggered="refresherTriggered"
         @scrolltolower="scrolltolower"
+        @refresherrefresh="refresherrefresh"
       >
         <view class="frame">
           <template v-if="tableList.length">
@@ -88,6 +90,7 @@ export default {
   data() {
     return {
       isReachBottom: false,
+      refresherTriggered: false,
       style: {},
       paramter: {
         currentPage: 1,
@@ -111,6 +114,11 @@ export default {
     this.getCInfoByPage();
   },
   methods: {
+    refresherrefresh() {
+      this.paramter.currentPage = 1;
+      this.isReachBottom = false;
+      this.getCInfoByPage();
+    },
     jumpDetails(item) {
       uni.navigateTo({
         url: `/subPackages/order/details/index?orderInfo=${JSON.stringify(
@@ -145,6 +153,7 @@ export default {
           });
           this.tableList = this.tableList.concat(list);
         }
+        this.refresherTriggered = false;
       });
     },
     timeHandle(item) {
diff --git a/src/subPackages/site/search/index.vue b/src/subPackages/site/search/index.vue
index 9819246..9581459 100644
--- a/src/subPackages/site/search/index.vue
+++ b/src/subPackages/site/search/index.vue
@@ -154,7 +154,6 @@ export default {
     findBSiteInfoByPage() {
       if (this.isReachBottom) return;
       homeServe.findBSiteInfoByPage(this.paramter).then((res) => {
-        this.refresherTriggered = false;
         if (res.code === 20000) {
           if (this.paramter.currentPage == 1) {
             this.tableList = [];
@@ -168,6 +167,7 @@ export default {
           }
           this.tableList = this.tableList.concat(res.data.list);
         }
+        this.refresherTriggered = false;
       });
     },
   },