修复下拉刷新触发上拉加载两次请求bug

src/pages/home/index.vue

@@ -23,7 +23,7 @@
       <van-swipe-item>3</van-swipe-item>
       <van-swipe-item>4</van-swipe-item>
     </van-swipe> -->
-    <van-pull-refresh v-model="refreshing" @refresh="initFetchList">
+    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
       <van-list
         v-model="loading"
         class="goods-list"
@@ -95,16 +95,6 @@ export default {
     handleClick(val) {
       this.$router.push({ path: 'buy', query: { spu_id: val.spu_id, shop_id: val.shop_id } })
     },
-    handleSearchChange() {
-      this.goodsList = []
-      this.loading = false
-      this.finished = false
-      this.refreshing = false
-      this.page_size = '10'
-      this.page = '0'
-      this.total = 0
-      this.fetchGoodsList()
-    },
     imgJsonParse(val) {
       if (typeof val === 'string' && typeof JSON.parse(val) === 'object') {
         const [first = {}] = JSON.parse(val)
@@ -113,14 +103,22 @@ export default {
         return ''
       }
     },
-    initFetchList() {
+    initParams() {
       this.goodsList = []
       this.loading = false
       this.finished = false
-      this.refreshing = false
+      // this.refreshing = false
       this.page_size = '10'
       this.page = '0'
       this.total = 0
+    },
+    initFetchList() {
+      this.initParams()
+      this.fetchGoodsList()
+    },
+    onRefresh() {
+      this.initParams()
+      this.finished = true // 防止下拉刷新时触发上拉加载
       this.fetchGoodsList()
     },
     fetchGoodsList() {
@@ -133,6 +131,11 @@ export default {
         page_size: this.page_size
       }
       getGoodsList(params).then(res => {
+        if (this.refreshing) {
+          this.list = [];
+          this.finished = false
+          this.refreshing = false;
+        }
         if (res.code === 0 && res.msg === '成功') {
           this.goodsList = this.goodsList.concat(res.data)
         } else {

src/pages/order/index.vue

@@ -19,7 +19,7 @@
         <van-tab title="已完成" name="4"></van-tab>
       </van-tabs>
     </van-sticky>
-    <van-pull-refresh v-model="refreshing" @refresh="initFetchList">
+    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
       <van-list
         v-model="loading"
         class="order-list"
@@ -188,13 +188,22 @@ export default {
         return ''
       }
     },
-    initFetchList() {
+    initParams() {
       this.list = []
       this.loading = false
       this.finished = false
-      this.refreshing = false
+      // this.refreshing = false
+      this.page_size = '10'
       this.page = '0'
       this.total = 0
+    },
+    initFetchList() {
+      this.initParams()
+      this.fetchOrderList()
+    },
+    onRefresh() {
+      this.initParams()
+      this.finished = true // 防止下拉刷新时触发上拉加载
       this.fetchOrderList()
     },
     fetchOrderList() {
@@ -218,6 +227,11 @@ export default {
       //   page_size: '20'
       // }
       getOrderList(params).then(res => {
+        if (this.refreshing) {
+          this.list = [];
+          this.finished = false
+          this.refreshing = false;
+        }
         if (res.code === 0 && res.msg === '成功') {
           this.list = this.list.concat(res.data)
         } else {