Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

pages/me/Delivery-details/index.vue

@@ -152,6 +152,7 @@
 				this.content = e
 				if (this.itemList.length >= this.length) {
 					this.status = 'nomore';
+					this.getPage()
 				} else {
 					this.getPage()
 				}

pages/me/Warehousing-details/index.vue

@@ -145,6 +145,7 @@
 			inputbox(e) {
 				this.page = 1
 				console.log(e)
+				console.log(this.length)
 				this.itemList = []
 				this.brandCode = null
 				this.beginDate = null
@@ -152,7 +153,9 @@
 				this.content = e
 				if (this.itemList.length >= this.length) {
 					this.status = 'nomore';
+					this.getPage()
 				} else {
+					console.log("什么情况")
 					this.getPage()
 				}
 			},
@@ -289,6 +292,7 @@
 				uni.showLoading({
 					title: '加载中...'
 				});
+				console.log("加载中")
 				setTimeout(function() {
 					uni.hideLoading();
 				}, 1000);