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

pages/me/Delivery-details/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 入库明细页面 -->
+	<!-- 出库明细页面 -->
 	<view class="header">
 		<view class="header-one">
 			库存总量：<text>{{total}}</text>
@@ -145,6 +145,7 @@
 			inputbox(e) {
 				this.page = 1
 				console.log(e)
+				console.log(this.length)
 				this.itemList = []
 				this.brandCode = null
 				this.beginDate = null
@@ -154,6 +155,7 @@
 					this.status = 'nomore';
 					this.getPage()
 				} else {
+					console.log("什么情况")
 					this.getPage()
 				}
 			},
@@ -181,6 +183,7 @@
 				this.getPage()
 			},
 			whole() {
+				this.itemList = []
 				this.bottoma = true
 				this.bottomb = false
 				this.bottomc = false
@@ -188,7 +191,7 @@
 				this.beginDate = null
 				this.endDate = null
 				this.content = null
-				this.page = 0
+				this.page = 1
 				console.log(this.brandCode)
 				this.getPage()
 			},
@@ -290,6 +293,7 @@
 				uni.showLoading({
 					title: '加载中...'
 				});
+				console.log("加载中")
 				setTimeout(function() {
 					uni.hideLoading();
 				}, 1000);

pages/me/Warehousing-details/index.vue

@@ -183,6 +183,7 @@
 				this.getPage()
 			},
 			whole() {
+				this.itemList = []
 				this.bottoma = true
 				this.bottomb = false
 				this.bottomc = false
@@ -190,7 +191,7 @@
 				this.beginDate = null
 				this.endDate = null
 				this.content = null
-				this.page = 0
+				this.page = 1
 				console.log(this.brandCode)
 				this.getPage()
 			},