From 2a0144d1bd56007461a7a37826bdc67da2e753c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Tue, 28 Nov 2023 12:14:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=90=9C=E7=B4=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/InputAndSwiper/InputAndSwiper.vue |  19 +-
 pages.json                                   |   2 +-
 pages/Partnerships/Partnerships.vue          | 278 +++++++++----------
 pages/index/NavBarPages/czxx/czxx.vue        |   7 +-
 pages/index/NavBarPages/xmzs/xmzs.vue        |   7 +-
 pages/index/NavBarPages/zdxx/zdxx.vue        |   6 +
 pages/index/NavBarPages/zrxx/zrxx.vue        |   7 +-
 pages/published/published.vue                |  98 ++++++-
 pages/shopAddress/shopAddress.vue            |  14 +-
 pages/shopTransfer/shopTransfer.vue          |  28 +-
 10 files changed, 296 insertions(+), 170 deletions(-)

diff --git a/components/InputAndSwiper/InputAndSwiper.vue b/components/InputAndSwiper/InputAndSwiper.vue
index 4f125a1..fb4ce65 100644
--- a/components/InputAndSwiper/InputAndSwiper.vue
+++ b/components/InputAndSwiper/InputAndSwiper.vue
@@ -53,14 +53,14 @@
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
 		},
-		watch: {
-			refresh(newVal, oldVal) {
-				console.log('newVal', newVal);
-				if (newVal) {
-					this.keyword = ''
-				}
-			}
-		},
+		// watch: {
+		// 	refresh(newVal, oldVal) {
+		// 		console.log('newVal', newVal);
+		// 		// if (newVal) {
+		// 		this.keyword = ''
+		// 		// }
+		// 	}
+		// },
 		onShow() {
 			if (this.type !== '0') {
 				this.open()
@@ -70,6 +70,9 @@
 
 		},
 		methods: {
+			resetInfo() {
+				this.keyword = ''
+			},
 			changeInput(e) {
 				this.$emit('getQueryInfo', e)
 			},
diff --git a/pages.json b/pages.json
index 8c30514..dac8b08 100644
--- a/pages.json
+++ b/pages.json
@@ -71,7 +71,7 @@
 				"navigationBarTitleText": "",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#339967",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/publish/publishTransfer/publishTransfer",
diff --git a/pages/Partnerships/Partnerships.vue b/pages/Partnerships/Partnerships.vue
index b2a9373..bd1e17b 100644
--- a/pages/Partnerships/Partnerships.vue
+++ b/pages/Partnerships/Partnerships.vue
@@ -27,163 +27,163 @@
 			<rich-text :nodes="content"></rich-text>
 		</u-modal>
 	</view>
-</template>
+	</template>
 
-<script>
-	export default {
-		data() {
-			return {
-				color: '#CC3333',
-				btnText: '提交审核',
-				member: '',
-				show: false,
-				disabled: false,
-				btnDisabled: false,
-				content: `申请已提交, 请等待后台审核`,
-				submitForm: {
-					real_name: '',
-					idcard: ''
+	<script>
+		export default {
+			data() {
+				return {
+					color: '#CC3333',
+					btnText: '提交审核',
+					member: '',
+					show: false,
+					disabled: false,
+					btnDisabled: false,
+					content: `申请已提交, 请等待后台审核`,
+					submitForm: {
+						real_name: '',
+						idcard: ''
+					}
 				}
-			}
-		},
-		onShow() {
-			this.getInfo()
-		},
-		methods: {
-			getInfo() {
-				this.$api.getUser().then(res => {
-					var data = res.data.data
-					if (data) {
-						this.member = data.member
-						if (data.member == 1) {
-							this.disabled = true
-							this.btnDisabled = true
-							this.color = "#C6C6C6"
-							this.btnText = "审核中…"
-						}
-						// else if (data.member == 2) {
-						// 	this.disabled = false
-						// 	this.btnDisabled = false
-						// 	this.color = "#CC3333"
-						// 	this.btnText = "联系客服"
-						// }
-					}
-				})
 			},
-			confirm() {
-				uni.reLaunch({
-					url: '/pages/my/my'
-				})
-				// if (this.needAsk == 1) {
-				// 	uni.reLaunch({
-				// 		url: '/pages/index/index'
-				// 	})
-				// }
+			onShow() {
+				this.getInfo()
 			},
-			submit() {
-				if (this.member == 0) {
-					let reg =
-						/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; //正则表达式定义身份证号正确格式
-					if (!reg.test(this.submitForm.idcard)) { //判断身份证号格式时候正确
-						this.$toast.warn('请输入正确的身份证号格式')
-						return false
-					}
-					if (this.submitForm.real_name == "") {
-						this.$toast.warn('请完善数据')
-						return false
-					}
-					if (this.submitForm.real_name && this.submitForm.idcard) {
-						let data = {
-							...this.submitForm,
-							uid: uni.getStorageSync('uid')
-						}
-						console.log('成', data);
-						this.$api.toBePartner(data).then(res => {
-							if (res.data.msg == "提交成功") {
-								this.show = true
+			methods: {
+				getInfo() {
+					this.$api.getUser().then(res => {
+						var data = res.data.data
+						if (data) {
+							this.member = data.member
+							if (data.member == 1) {
+								this.disabled = true
+								this.btnDisabled = true
+								this.color = "#C6C6C6"
+								this.btnText = "审核中…"
 							}
-						})
+							// else if (data.member == 2) {
+							// 	this.disabled = false
+							// 	this.btnDisabled = false
+							// 	this.color = "#CC3333"
+							// 	this.btnText = "联系客服"
+							// }
+						}
+					})
+				},
+				confirm() {
+					uni.reLaunch({
+						url: '/pages/my/my'
+					})
+					// if (this.needAsk == 1) {
+					// 	uni.reLaunch({
+					// 		url: '/pages/index/index'
+					// 	})
+					// }
+				},
+				submit() {
+					if (this.member == 0) {
+						let reg =
+							/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; //正则表达式定义身份证号正确格式
+						if (!reg.test(this.submitForm.idcard)) { //判断身份证号格式时候正确
+							this.$toast.warn('请输入正确的身份证号格式')
+							return false
+						}
+						if (this.submitForm.real_name == "") {
+							this.$toast.warn('请完善数据')
+							return false
+						}
+						if (this.submitForm.real_name && this.submitForm.idcard) {
+							let data = {
+								...this.submitForm,
+								uid: uni.getStorageSync('uid')
+							}
+							console.log('成', data);
+							this.$api.toBePartner(data).then(res => {
+								if (res.data.msg == "提交成功") {
+									this.show = true
+								}
+							})
+						}
+					} else if (this.member == 2) {
+						console.log('联系客服');
 					}
-				} else if (this.member == 2) {
-					console.log('联系客服');
 				}
 			}
 		}
-	}
-</script>
+	</script>
 
-<style lang="scss">
-	.service-btn {
-		height: 40px;
-		background-color: #CC3333;
-		color: #fff;
-		border-radius: 25px;
+	<style lang="scss">
+		.service-btn {
+			height: 40px;
+			background-color: #CC3333;
+			color: #fff;
+			border-radius: 25px;
 
-		font-size: 32rpx;
-	}
-
-	.hhr {
-		margin-top: 50rpx;
-		margin-bottom: 50rpx;
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-
-		.hhr-text {
-			margin-top: 28rpx;
-			width: 186rpx;
-			height: 50rpx;
-			font-size: 36rpx;
-			font-family: PingFang-SC, PingFang-SC;
-			font-weight: 800;
-			color: #F20C0C;
-			line-height: 50rpx;
-			letter-spacing: 1px;
+			font-size: 32rpx;
 		}
-	}
 
-	.u-modal__button-group__wrapper--hover {
-		background: #0EBB5B !important;
-	}
+		.hhr {
+			margin-top: 50rpx;
+			margin-bottom: 50rpx;
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
 
-	.input-class {
-		font-weight: 1rpx;
-		color: #A0A0A0;
-	}
+			.hhr-text {
+				margin-top: 28rpx;
+				// width: 186rpx;
+				height: 50rpx;
+				font-size: 36rpx;
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: 800;
+				color: #F20C0C;
+				line-height: 50rpx;
+				letter-spacing: 1px;
+			}
+		}
 
-	.submit-btn {
-		width: 80%;
-		margin-top: 50rpx;
-		translate: 10%;
-	}
+		.u-modal__button-group__wrapper--hover {
+			background: #0EBB5B !important;
+		}
 
-	.name,
-	.id {
-		padding: 10rpx;
-	}
+		.input-class {
+			font-weight: 1rpx;
+			color: #A0A0A0;
+		}
 
-	.text {
-		margin-left: 20rpx;
-	}
+		.submit-btn {
+			width: 80%;
+			margin-top: 50rpx;
+			translate: 10%;
+		}
 
-	.payment {
-		margin-top: 20rpx;
-		display: flex;
-		justify-content: space-between;
+		.name,
+		.id {
+			padding: 10rpx;
+		}
 
-	}
+		.text {
+			margin-left: 20rpx;
+		}
 
-	.left-payment {
-		display: flex;
-		flex-direction: column;
-	}
+		.payment {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
 
-	.label {
-		margin-top: 10rpx;
-		margin-left: 17rpx;
-		color: #c1c1c1;
-		/* font-size: 27rpx; */
-	}
-</style>
\ No newline at end of file
+		}
+
+		.left-payment {
+			display: flex;
+			flex-direction: column;
+		}
+
+		.label {
+			margin-top: 10rpx;
+			margin-left: 17rpx;
+			color: #c1c1c1;
+			/* font-size: 27rpx; */
+		}
+	</style>
\ No newline at end of file
diff --git a/pages/index/NavBarPages/czxx/czxx.vue b/pages/index/NavBarPages/czxx/czxx.vue
index 0499617..fb71c36 100644
--- a/pages/index/NavBarPages/czxx/czxx.vue
+++ b/pages/index/NavBarPages/czxx/czxx.vue
@@ -59,7 +59,7 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
@@ -90,6 +90,11 @@
 				this.$api.getShopList(q).then(res => {
 					this.shopListLength = res.data.data.length
 					this.shopInfoList = res.data.data
+					if (res.data.data.length == 0) {
+						this.showNull = true
+					} else {
+						this.showNull = false
+					}
 				})
 			},
 			getShopList(q, type) {
diff --git a/pages/index/NavBarPages/xmzs/xmzs.vue b/pages/index/NavBarPages/xmzs/xmzs.vue
index 8524488..640a025 100644
--- a/pages/index/NavBarPages/xmzs/xmzs.vue
+++ b/pages/index/NavBarPages/xmzs/xmzs.vue
@@ -59,7 +59,7 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
@@ -90,6 +90,11 @@
 				this.$api.getShopList(q).then(res => {
 					this.shopListLength = res.data.data.length
 					this.shopInfoList = res.data.data
+					if (res.data.data.length == 0) {
+						this.showNull = true
+					} else {
+						this.showNull = false
+					}
 				})
 			},
 			getShopList(q, type) {
diff --git a/pages/index/NavBarPages/zdxx/zdxx.vue b/pages/index/NavBarPages/zdxx/zdxx.vue
index 0a18742..177643f 100644
--- a/pages/index/NavBarPages/zdxx/zdxx.vue
+++ b/pages/index/NavBarPages/zdxx/zdxx.vue
@@ -58,6 +58,7 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
@@ -88,6 +89,11 @@
 				this.$api.getShopList(q).then(res => {
 					this.searchListLength = res.data.data.length
 					this.searchInfoList = res.data.data
+					if (res.data.data.length == 0) {
+						this.showNull = true
+					} else {
+						this.showNull = false
+					}
 				})
 			},
 			getShopList(q, type) {
diff --git a/pages/index/NavBarPages/zrxx/zrxx.vue b/pages/index/NavBarPages/zrxx/zrxx.vue
index ce114ee..56fd96e 100644
--- a/pages/index/NavBarPages/zrxx/zrxx.vue
+++ b/pages/index/NavBarPages/zrxx/zrxx.vue
@@ -58,7 +58,7 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
@@ -89,6 +89,11 @@
 				this.$api.getShopList(q).then(res => {
 					this.shopListLength = res.data.data.length
 					this.shopInfoList = res.data.data
+					if (res.data.data.length == 0) {
+						this.showNull = true
+					} else {
+						this.showNull = false
+					}
 				})
 			},
 			getShopList(q, type) {
diff --git a/pages/published/published.vue b/pages/published/published.vue
index f7d7801..256e835 100644
--- a/pages/published/published.vue
+++ b/pages/published/published.vue
@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<view class="sticky">
+		<view class="search-bg sticky">
 			<view class="search-box">
 				<view class="search-box-input">
-					<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
-						prefixIconStyle="font-size: 24px;color: #909399;" border="true">
+					<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
 					</u-input>
 				</view>
 			</view>
@@ -22,6 +22,10 @@
 				@delItem="handleDel" @updateItem="handleUpdate4"></ShowShopList>
 			<ShowShopList v-if="listId == 4" :showStyle="0" :shopInfoList="matchList"></ShowShopList>
 		</view>
+		<view v-if="showNull" class="showNull">
+			<text>没有符合条件的数据, 请下拉刷新重置数据~
+			</text>
+		</view>
 	</view>
 </template>
 
@@ -40,18 +44,79 @@
 				pageNum: 1,
 				matchPageSize: 5,
 				matchPageNum: 1,
+				keyword: '',
+				refresh: false,
+				showNull: false,
 			}
 		},
+		onPullDownRefresh() {
+			console.log('this.listId', this.listId);
+			this.refresh = true
+			if (this.listId !== 4) {
+				this.getMyPublished(this.listId + 1, this.pageSize, this.pageNum)
+			} else {
+				this.getMatch()
+			}
+			this.keyword = ''
+		},
 		onReachBottom() {
-			if (this.listId !== 4 && this.searchListLength !== 0) {
+			if (this.listId !== 4 && !this.refresh && this.searchListLength !== 0) {
 				this.pageNum++
 				this.getMyPublished(this.listId + 1, this.pageSize, this.pageNum)
 			} else if (this.listId == 4 && this.matchListLength !== 0) {
 				this.matchPageNum++
 				this.getMatch()
+			} else if (this.searchListLength == 0) {
+				this.pageNum = 1
 			}
+			this.keyword = ''
 		},
 		methods: {
+			getInput(val) {
+				console.log('搜索值', val);
+				if (this.pageNum !== 1) {
+					this.pageNum = 1
+				}
+				if (this.listId !== 4) {
+					this.$api.getMyPublished({
+						type: this.listId + 1,
+						pageSize: this.pageSize,
+						pageNum: this.pageNum,
+						title: val
+					}).then(res => {
+						console.log('发布信息', res);
+						if (res.data.code == 1) {
+							this.searchListLength = res.data.data.length
+							this.searchInfoList = res.data.data
+							if (res.data.data.length == 0) {
+								this.showNull = true
+							} else {
+								this.showNull = false
+							}
+						} else {
+							uni.$u.toast(res.data.msg)
+						}
+					})
+				} else {
+					this.$api.getMyMatch({
+						pageSize: this.matchPageSize,
+						pageNum: this.matchPageNum,
+						title: val
+					}).then(res => {
+						if (res.data.code == 1) {
+							this.matchListLength = res.data.data.length
+							this.matchList = res.data.data[0]
+							if (res.data.data.length == 0) {
+								this.showNull = true
+							} else {
+								this.showNull = false
+							}
+						} else {
+							uni.$u.toast(res.data.msg)
+						}
+					})
+				}
+			},
 			handleUpdate1(searchid) {
 				console.log('页面更新');
 				uni.navigateTo({
@@ -114,6 +179,7 @@
 					if (res.data.code == 1) {
 						this.matchListLength = res.data.data.length
 						this.matchList = [...this.matchList, ...res.data.data[0]]
+						uni.stopPullDownRefresh()
 					} else {
 						uni.$u.toast(res.data.msg)
 					}
@@ -125,14 +191,21 @@
 					pageSize: pageSize,
 					pageNum: pageNum
 				}).then(res => {
-					console.log('发布信息', res);
+					console.log('发布信息l', res, res.data.data.length);
 					if (res.data.code == 1) {
 						this.searchListLength = res.data.data.length
 						if (isDelete == 1) {
 							this.searchInfoList = res.data.data
+							this.refresh = false
+							if (res.data.data.length == 0) {
+								this.showNull = true
+							} else {
+								this.showNull = false
+							}
 						} else {
 							this.searchInfoList = [...this.searchInfoList, ...res.data.data]
 						}
+						uni.stopPullDownRefresh()
 					} else {
 						uni.$u.toast(res.data.msg)
 					}
@@ -176,6 +249,20 @@
 </script>
 
 <style lang="scss">
+	.showNull {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100rpx;
+		color: darkgray;
+	}
+
+	.search-bg {
+		height: 28px;
+		padding-top: 20rpx;
+		padding-bottom: 20rpx;
+	}
+
 	.search-box {
 		position: relative;
 		z-index: 1;
@@ -185,7 +272,6 @@
 
 		.search-box-input {
 			border-radius: 12rpx;
-			margin-top: 20rpx;
 			background-color: #fff;
 			opacity: 0.85;
 
diff --git a/pages/shopAddress/shopAddress.vue b/pages/shopAddress/shopAddress.vue
index 639e438..7a1173a 100644
--- a/pages/shopAddress/shopAddress.vue
+++ b/pages/shopAddress/shopAddress.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="root">
 		<view class="sticky">
-			<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh"></InputAndSwiper>
+			<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" ref="input"></InputAndSwiper>
 			<view class="marginLR10">
 				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
 			</view>
@@ -9,7 +9,6 @@
 		<view class="marginLR10">
 			<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
 		</view>
-
 		<view v-if="showNull" class="showNull">
 			<text>没有符合条件的数据, 请下拉刷新重置数据~
 			</text>
@@ -33,12 +32,12 @@
 				customQuery: {},
 				searchListLength: '',
 				showNull: false,
-				refresh: false,
-				isRefresh: false
+				refresh: false
 			}
 		},
 		onPullDownRefresh() {
 			this.refresh = true
+			this.$refs.input.resetInfo()
 			// if (this.showNull = true) {
 			const q = this.$u.queryParams({
 				type: 2,
@@ -55,7 +54,7 @@
 		},
 		onReachBottom() {
 			if (!this.refresh && this.searchListLength !== 0) {
-				this.isRefresh = true
+				this.$refs.input.resetInfo()
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -91,6 +90,11 @@
 				this.$api.getShopList(q).then(res => {
 					this.searchListLength = res.data.data.length
 					this.searchInfoList = res.data.data
+					if (res.data.data.length == 0) {
+						this.showNull = true
+					} else {
+						this.showNull = false
+					}
 				})
 			},
 			getShopList(q, type) {
diff --git a/pages/shopTransfer/shopTransfer.vue b/pages/shopTransfer/shopTransfer.vue
index 071a73c..b16d45e 100644
--- a/pages/shopTransfer/shopTransfer.vue
+++ b/pages/shopTransfer/shopTransfer.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="root">
 		<view class="sticky">
-			<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh">
+			<InputAndSwiper @getQueryInfo="getInput" ref="input" :bannerURL="swiperList">
 			</InputAndSwiper>
 			<view class="marginLR10 ">
 				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
@@ -9,10 +9,10 @@
 		</view>
 		<view class="marginLR10">
 			<ShowShopList :showStyle="1" :shopInfoList="shopInfoList"></ShowShopList>
-		</view>
-		<view v-if="showNull" class="showNull">
-			<text>没有符合条件的数据, 请下拉刷新重置数据~
-			</text>
+			<view v-if="showNull" class="showNull">
+				<text>没有符合条件的数据, 请下拉刷新重置数据~
+				</text>
+			</view>
 		</view>
 		<TabBar :current-page="1"></TabBar>
 	</view>
@@ -20,6 +20,9 @@
 
 <script>
 	import DropDownItem from "@/components/DropDown/DropDownItem.vue"
+	import {
+		nextTick
+	} from "vue"
 	export default {
 		components: {
 			DropDownItem
@@ -33,8 +36,7 @@
 				swiperList: [],
 				shopListLength: '',
 				showNull: false,
-				refresh: false,
-				isRefresh: false
+				refresh: false
 			}
 		},
 		onPullDownRefresh() {
@@ -50,11 +52,12 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
+			this.$refs.input.resetInfo()
 			// }
 		},
 		onReachBottom() {
 			if (!this.refresh && this.shopListLength !== 0) {
-				this.isRefresh = true
+				this.$refs.input.resetInfo()
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -90,6 +93,11 @@
 				this.$api.getShopList(q).then(res => {
 					this.shopListLength = res.data.data.length
 					this.shopInfoList = res.data.data
+					if (res.data.data.length == 0) {
+						this.showNull = true
+					} else {
+						this.showNull = false
+					}
 				})
 			},
 			getShopList(q, type) {
@@ -117,6 +125,7 @@
 						console.log('查询');
 						this.shopInfoList = [...this.shopInfoList, ...res.data.data]
 					}
+
 					uni.stopPullDownRefresh()
 					console.log(this.shopInfoList);
 				})
@@ -149,6 +158,9 @@
 		justify-content: center;
 		height: 100rpx;
 		color: darkgray;
+		// position: absolute;
+		// top: 0;
+		// background-color: red;
 	}
 
 	.root {

From f21f82ba6ea1a7238569906a92330cb995724e1c Mon Sep 17 00:00:00 2001
From: dengj <209192278@qq.com>
Date: Tue, 28 Nov 2023 13:53:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/published/published.vue | 44 +++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/pages/published/published.vue b/pages/published/published.vue
index 256e835..6c0b3d0 100644
--- a/pages/published/published.vue
+++ b/pages/published/published.vue
@@ -50,12 +50,11 @@
 			}
 		},
 		onPullDownRefresh() {
-			console.log('this.listId', this.listId);
 			this.refresh = true
 			if (this.listId !== 4) {
-				this.getMyPublished(this.listId + 1, this.pageSize, this.pageNum)
+				this.getMyPublished(this.listId + 1, this.pageSize, 1)
 			} else {
-				this.getMatch()
+				this.getMatch(this.matchPageSize, 1)
 			}
 			this.keyword = ''
 		},
@@ -63,21 +62,24 @@
 			if (this.listId !== 4 && !this.refresh && this.searchListLength !== 0) {
 				this.pageNum++
 				this.getMyPublished(this.listId + 1, this.pageSize, this.pageNum)
-			} else if (this.listId == 4 && this.matchListLength !== 0) {
+			} else if (this.listId == 4 && !this.refresh &&this.matchListLength !== 0) {
 				this.matchPageNum++
-				this.getMatch()
+				this.getMatch(this.matchPageSize, this.matchPageNum)
 			} else if (this.searchListLength == 0) {
 				this.pageNum = 1
+			} else if (this.matchListLength == 0) {
+				this.matchPageNum = 1
 			}
 			this.keyword = ''
 		},
 		methods: {
 			getInput(val) {
 				console.log('搜索值', val);
-				if (this.pageNum !== 1) {
-					this.pageNum = 1
-				}
+				
 				if (this.listId !== 4) {
+					if (this.pageNum !== 1) {
+						this.pageNum = 1
+					}
 					this.$api.getMyPublished({
 						type: this.listId + 1,
 						pageSize: this.pageSize,
@@ -98,6 +100,9 @@
 						}
 					})
 				} else {
+					if (this.matchPageNum !== 1) {
+						this.matchPageNum = 1
+					}
 					this.$api.getMyMatch({
 						pageSize: this.matchPageSize,
 						pageNum: this.matchPageNum,
@@ -171,14 +176,24 @@
 				})
 
 			},
-			getMatch() {
+			getMatch(pageSize,pageNum) {
 				this.$api.getMyMatch({
-					pageSize: this.matchPageSize,
-					pageNum: this.matchPageNum
+					pageSize: pageSize,
+					pageNum: pageNum
 				}).then(res => {
 					if (res.data.code == 1) {
 						this.matchListLength = res.data.data.length
-						this.matchList = [...this.matchList, ...res.data.data[0]]
+						if(this.refresh){
+							this.refresh = false
+							if (res.data.data.length == 0) {
+								this.showNull = true
+							} else {
+								this.showNull = false
+							}
+							this.matchList = res.data.data[0]
+						}else{
+							this.matchList = [...this.matchList, ...res.data.data[0]]
+						}
 						uni.stopPullDownRefresh()
 					} else {
 						uni.$u.toast(res.data.msg)
@@ -194,7 +209,7 @@
 					console.log('发布信息l', res, res.data.data.length);
 					if (res.data.code == 1) {
 						this.searchListLength = res.data.data.length
-						if (isDelete == 1) {
+						if (isDelete == 1|| this.refresh) {
 							this.searchInfoList = res.data.data
 							this.refresh = false
 							if (res.data.data.length == 0) {
@@ -238,9 +253,8 @@
 
 			if (this.titletext == '我的匹配') {
 				this.listId = 4
-				this.getMatch()
+				this.getMatch(this.matchPageSize, this.matchPageNum)
 			}
-
 		},
 		computed: {