邓洁 : 找店地址下拉刷新重置数据

pages/shopAddress/shopAddress.vue

@@ -13,7 +13,10 @@
 				<SearchShopList :showStyle="1" :searchInfoList="searchInfoList"/>
 			</view>
 		</view>
-		
+		<view v-if="showNull" class="showNull">
+			<text>没有符合条件的数据, 请下拉刷新重置数据~
+			</text>
+		</view>
 		<TabBar :current-page="3"></TabBar>
 	</view>
 </template>
@@ -26,27 +29,65 @@
 		},
 		data() {
 			return {
-				pageSize: 5,
+				pageSize: 3,
 				pageNum: 1,
 				searchInfoList: [],
 				customQuery: {},
 				searchListLength: '',
+				showNull: false,
+				refresh: false
 			}
 		},
+		onPullDownRefresh() {
+			this.refresh=true
+			// if (this.showNull = true) {
+				const q = this.$u.queryParams({
+					type: 2,
+					pageSize: this.pageSize,
+					pageNum: 1,
+				})
+				// if(this.showNull=true){
+				// 	this.pageNum=1
+				// }
+				this.getShopList(q, "refresh")
+				
+			// }
+		},
 		onReachBottom() {
-			if (this.searchListLength !== 0) {
+			if (!this.refresh&&this.searchListLength !== 0) {
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
+			}else if(this.searchListLength == 0){
+				this.pageNum=1
 			}
 		},
 		methods: {
-			getShopList(q){
+			getShopList(q, type){
-				let query = this.getQueryInfo(q)
+				let query = {}
+				if (type == "refresh") {
+					query = q
+				} else {
+					query = this.getQueryInfo(q)
+				}
 				console.log("listquery",query);
 				this.$api.getShopList(query).then(res => {
 					this.searchListLength = res.data.data.length
-					this.searchInfoList = [...this.searchInfoList, ...res.data.data]
+					if (query.includes('business') || query.includes('areatype') || query.includes('sortType') || query
+						.includes('region')||this.refresh) {
+						console.log('筛选');
+						// this.resetQuery(q)
+						this.searchInfoList = res.data.data
+						this.refresh=false
+						if (res.data.data.length == 0) {
+							this.showNull = true
+						} else {
+							this.showNull = false
+						}
+					} else {
+						console.log('查询');
+						this.searchInfoList = [...this.searchInfoList, ...res.data.data]
+					}
 					console.log(this.searchInfoList);
 				})
 			},
@@ -58,9 +99,8 @@
 					pageNum: this.pageNum,
 					...query
 				})
-				this.customQuery = q
 				return q
-			},
+			}
 		},
 		created() {
 			this.getShopList()
@@ -69,6 +109,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.showNull {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100rpx;
+		color: darkgray;
+	}
 	page {
 		background-color: $uni-bg-color-grey;
 	}

pages/shopTransfer/shopTransfer.vue

@@ -93,7 +93,6 @@
 				})
 			},
 			getQueryInfo(query) {
-				console.log('this.',this.refresh);
 				const q = this.$u.queryParams({
 					type: 1,
 					pageSize: this.pageSize,
@@ -101,16 +100,7 @@
 					...query
 				})
 				return q
-			},
+			}
-			// resetQuery(query){
-			// 	console.log('ddd',query);
-			// 	const q = this.$u.queryParams({
-			// 		type: 1,
-			// 		pageSize: 5,
-			// 		pageNum: 1,
-			// 		...query
-			// 	})
-			// }
 		},
 		created() {
 			this.getShopList()