H5：购物车列表、订座列表、订单列表上拉加载优化

htmldev/dashboard/src/views/order/list/index.vue

@@ -138,7 +138,7 @@ export default {
 
           if (Array.isArray(list) && list.length) {
             // 总页数小于等于1页时
-            if (this.pagenum === 1 && list.length < this.pagesize) {
+            if (list.length < this.pagesize) {
               this.finished = true
             }
             this.list = this.list.concat(list)

htmldev/dashboard/src/views/place/reserve/index.vue

@@ -75,10 +75,10 @@ export default {
       isLoading: false,
       loading: false,
       finished: false,
+      isRefresh: false,
+      isFetchLock: false, // 接口调用加锁
       pagenum: 0,
       pagesize: 20,
-      pagecount: 1,
-      isRefresh: false,
       booLock: false
     }
   },
@@ -86,7 +86,6 @@ export default {
     onRefresh () {
       this.pagenum = 0
       this.pagesize = 20
-      this.pagecount = 1
       this.finished = false
       this.isRefresh = true
       this.getList()
@@ -98,16 +97,18 @@ export default {
      *  请求数据方法
      */
     async getList () {
-      if (this.pagenum >= this.pagecount || this.pagecount === 0) {
-        this.finished = true
+      if (this.finished) {
+        return
+      }
+      if (this.isFetchLock) {
         return
       }
+      this.isFetchLock = true
       this.pagenum++
       try {
         const { status, data, msg } = await apiReserveList(this.pagenum, this.pagesize)
         if (status) {
-          const { total, list } = data
-          this.pagecount = Math.ceil(total * 1 / this.pagesize)
+          const { list } = data
 
           // 下拉刷新数据清空
           if (this.isRefresh) {
@@ -121,6 +122,10 @@ export default {
           }
 
           if (Array.isArray(list) && list.length) {
+            // 总页数小于等于1页时
+            if (list.length < this.pagesize) {
+              this.finished = true
+            }
             this.reserveList = this.reserveList.concat(list)
           }
         } else {
@@ -129,7 +134,9 @@ export default {
         // 加载状态结束
         this.loading = false
         this.isLoading = false
+        this.isFetchLock = false
       } catch (err) {
+        this.isFetchLock = false
         console.log(err)
       }
     },
@@ -146,6 +153,7 @@ export default {
         messageAlign: 'left'
       }).then(async () => {
         try {
+          this.booLock = true
           const { status, msg } = await apiRefund(item.id)
           if (status) {
             Toast('退款成功')
@@ -156,7 +164,9 @@ export default {
           } else {
             Toast(msg)
           }
+          this.booLock = false
         } catch (err) {
+          this.booLock = false
           console.log(err)
         }
       }).catch(() => {

htmldev/dashboard/src/views/sell/shopcart/shopcart.vue

@@ -142,7 +142,8 @@ export default {
       pagesize: 100,
       numFetchStatus: 0, // 购物车列表加载状态
       arrFetchStatus: ['正在努力加载～', '到底了'],
-      booFetchData: false // 页面第一次获取数据是否成功
+      booFetchData: false, // 页面第一次获取数据是否成功
+      isFetchLock: false // 接口调用加锁
     }
   },
   computed: {
@@ -201,6 +202,7 @@ export default {
       this.pagesize = 100
       this.numFetchStatus = 0
       this.booFetchData = false
+      this.isFetchLock = false
 
       this.$nextTick(() => {
         this.fetchCartList()
@@ -211,6 +213,10 @@ export default {
       if (this.numFetchStatus === 1) {
         return
       }
+      if (this.isFetchLock) {
+        return
+      }
+      this.isFetchLock = true
       try {
         const { status, msg, data } = await apiCartList(id, this.pagenum, this.pagesize)
         if (status) {
@@ -219,7 +225,7 @@ export default {
           this.booFetchData = true
           if (Array.isArray(list)) {
             this.selectFoods = this.selectFoods.concat(list)
-            if (list.length <= 0) {
+            if (list.length < this.pagesize) {
               this.numFetchStatus = 1
             }
             this.$nextTick(() => {
@@ -244,7 +250,10 @@ export default {
         } else {
           Toast(msg)
         }
-      } catch (err) {}
+        this.isFetchLock = false
+      } catch (err) {
+        this.isFetchLock = false
+      }
     },
     drop (el) {
       for (let i = 0; i < this.balls.length; i++) {