下拉刷新

src/pages/index/index.vue

@@ -211,10 +211,6 @@
 				self.search.token = self.vuex_token;
 				self.$u.api.listByRecommendOrder(self.search).then((res) => {
 					self.loadedOrder = true
-					if (self._freshing) {
-						self.triggered = false;
-						self._freshing = false;
-					}
 					
 					if (res.code == 200 && res.data) {
 						if (self.search.pageNumber == 1) {
@@ -235,7 +231,13 @@
 
 					} else {
 						console.log(res.message, "初始化订单列表异常");
-					}
+					}
+					self.$nextTick(()=>{
+						if (self._freshing) {
+							self.triggered = false;
+							self._freshing = false;
+						}
+					})
 				});
 			},
 			reachBottom() {

src/pages/index/order.vue

@@ -181,11 +181,6 @@
 					if (res.code == 200) {
 						if (res.data.type != self.orderType) return
 							
-						if (self._freshing) {
-							self.triggered = false;
-							self._freshing = false;
-						}
-						
 						if (self.pageNumber == 1) {
 							self.orderList = []
 						}
@@ -199,6 +194,12 @@
 					} else {
 						console.log(res.message, "获取订单数量失败！");
 					}
+					self.$nextTick(()=>{
+						if (self._freshing) {
+							self.triggered = false;
+							self._freshing = false;
+						}
+					})
 					this.loaded = true
 				});
 

src/pages/mine/warehouse/index.vue

@@ -126,9 +126,9 @@
 			getApp().trackPage('备件订单页')
 			if (e && e.index) {
 				this.currentIndex = e.index
-			}
-			this.reloadPartsList()
+			}
 			this._freshing = false;
+			this.reloadPartsList()
 		},
 		onShow() {
 			let pages = getCurrentPages()
@@ -162,20 +162,21 @@
 				}
 				this.$u.api.applyList(param).then((res) => {
 					if (res.code == 200) {
-						if (this._freshing) {
-							this.triggered = false;
-							this._freshing = false;
-						}
-						
 						if (this.pageNumber == 1) {
 							this.partsList = []
 						}
 						let list = res.data || []
 						this.partsList.push(...list)
-						this.loadStatus = list.length < this.pageSize ? 'nomore' : 'loadmore'
+						this.loadStatus = list.length < this.pageSize ? 'nomore' : 'loadmore'
 					} else {
 						console.log(res.message)
-					}
+					}
+					this.$nextTick(()=>{
+						if (this._freshing) {
+							this.triggered = false;
+							this._freshing = false;
+						}
+					})
 					this.loaded = true
 				});
 			},
@@ -233,9 +234,9 @@
 			radioChange(e) {
 				this.selectedAll = !this.selectedAll
 			},
-			onRefresh() {
+			onRefresh() {
 				if (this._freshing) return;
-				this._freshing = true;
+				this._freshing = true;
 				this.reloadPartsList()
 			},
 			onRestore() {
@@ -247,10 +248,8 @@
 				this.getUnstockedList(this.currentTab.status)
 			},
 			reachBottom(e) {
-				console.log('------reachBottom------')
 				if (this.loadStatus != 'loadmore') return
 				this.loadStatus == 'loading'
-				console.log('------getUnstockedList------')
 				this.getUnstockedList(this.currentTab.status)
 			},
 			scroll() {