罗世杰：支持分享到朋友、朋友圈

Merge pull request 'dj' (#119 ) from dj into master
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/119
2023-11-30 20:10:13 +08:00 · 2023-11-28 05:54:00 +00:00 · 2023-11-28 13:53:30 +08:00 · 2023-11-28 12:14:56 +08:00 · 2023-11-27 16:15:20 +00:00 · 2023-11-28 00:14:41 +08:00
26 changed files with 495 additions and 332 deletions
--- a/components/InputAndSwiper/InputAndSwiper.vue
+++ b/components/InputAndSwiper/InputAndSwiper.vue
@@ -2,8 +2,9 @@
 	<view class="input-and-swiper-root">
 		<view class="search-box" v-if="type!=='0'">
 			<view class="search-box-input">
-				<u-input v-model="keyword" placeholder="请输入店铺名称进行搜索" placeholder-style="color: #969696" prefixIcon="search"
-					prefixIconStyle="font-size: 24px;color: #909399;" border="true" @clear="handleClear" clearable @change="changeInput">
+				<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+					prefixIconStyle="font-size: 24px;color: #909399;" border="true" @clear="handleClear" clearable
+					@change="changeInput">
 					<template slot="suffix">
 						<view style="display: flex;align-items: center;">
 							<u-icon name="map-fill" color="#329866" size="22"></u-icon>
@@ -46,35 +47,38 @@
 			return {
 				position: uni.getStorageSync('city') + uni.getStorageSync('district').slice(0, 2),
 				currentNum: '',
-				keyword:''
+				keyword: ''
 			};
 		},
 		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()
 			}
 		},
 		created() {
-		
+
 		},
 		methods: {
-			changeInput(e){
-				this.$emit('getQueryInfo',e)
+			resetInfo() {
+				this.keyword = ''
 			},
-			handleClear(e){
-				
-				console.log('handleClear',e);
+			changeInput(e) {
+				this.$emit('getQueryInfo', e)
+			},
+			handleClear(e) {
+
+				console.log('handleClear', e);
 			},
 			open() {
 				if (!uni.getStorageSync('city') && !uni.getStorageSync('district')) {
--- a/components/SearchShopList/SearchShopList.vue
+++ b/components/SearchShopList/SearchShopList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<SearchShopListItem v-for="item in searchInfoList" :key="searchid" :shopInfo="item" :show-style="showStyle"
+		<SearchShopListItem v-for="item in searchInfoList" :key="item.id" :shopInfo="item" :show-style="showStyle"
 			:isEdit="isEdit" @delItem="handleDel" @updateItem="handleUpdate"></SearchShopListItem>
 	</view>
 </template>
--- a/components/ShowShopList/ShowShopList.vue
+++ b/components/ShowShopList/ShowShopList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<ShowShopListItem v-for="item in shopInfoList" :shopInfo="item" :is-adshow="isADshow"
+		<ShowShopListItem v-for="item in shopInfoList" :key="item.id" :shopInfo="item" :is-adshow="isADshow"
 			:adlinkPath="adlinkPath" :show-style="showStyle" :is-edit="isEdit" @delItem="handleDel"
 			@updateItem="hanldeUpdate"></ShowShopListItem>
 	</view>
--- a/components/ShowShopListItem/ShowShopListItem.vue
+++ b/components/ShowShopListItem/ShowShopListItem.vue
@@ -5,7 +5,7 @@
 				<u-image :src="leftImage" width="80px" height="80px" radius="8px"></u-image>
 			</view>
 			<view class="text-area">
-				<u-text style="font-weight: 500;" :text="shopInfo.tt" :lines="2" ></u-text>
+				<u-text style="font-weight: 500;" :text="shopInfo.tt" :lines="2"></u-text>
 				<view v-if="showStyle == 0" class="pos-and-sqr">
 					<view>
 						<view>
@@ -142,9 +142,22 @@
 		},
 		computed: {

+		},
+		watch: {
+			shopInfo(newVal, oldVal) {
+				if (newVal.pics.includes(",")) {
+					this.leftImage = this.$api.imgUrl + newVal.pics.split(',')[0]
+				} else {
+					this.leftImage = this.$api.imgUrl + newVal.pics
+				}
+			}
 		},
 		created() {
-			this.leftImage = this.$api.imgUrl + this.shopInfo.pics.split(',')[0]
+			if (this.shopInfo.pics.includes(",")) {
+				this.leftImage = this.$api.imgUrl + this.shopInfo.pics.split(',')[0]
+			} else {
+				this.leftImage = this.$api.imgUrl + this.shopInfo.pics
+			}
 		},
 		methods: {
 			handleEdit(shopid) {
@@ -157,7 +170,7 @@
 				this.$emit('delItem', shopid)
 			},
 			enterDetail() {
-				// console.log("进入详情页面");
+				console.log("进入详情页面", this.shopInfo.id, this.shopInfo.type);
 				const query = this.$u.queryParams({
 					id: this.shopInfo.id,
 					type: this.shopInfo.type
@@ -205,7 +218,8 @@
 			flex-direction: column;
 			justify-content: space-between;

-			>text, >u-text {
+			>text,
+			>u-text {
 				font-size: 14px;
 			}

--- a/main.js
+++ b/main.js
@@ -9,6 +9,8 @@ Vue.use(uView)
 Vue.prototype.$api = apiService
 Vue.prototype.$toast = toast

+import share from './utils/share.js'
+Vue.mixin(share)
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
--- a/pages.json
+++ b/pages.json
@@ -71,7 +71,7 @@
 				"navigationBarTitleText": "",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#339967",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/publish/publishTransfer/publishTransfer",
--- 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>
+		}
+
+		.left-payment {
+			display: flex;
+			flex-direction: column;
+		}
+
+		.label {
+			margin-top: 10rpx;
+			margin-left: 17rpx;
+			color: #c1c1c1;
+			/* font-size: 27rpx; */
+		}
+	</style>
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -9,6 +9,10 @@
 			</view>
 			<view>
 				<u-grid :col="3">
+					<u-grid-item>
+						<view class="grid-textup">{{shopInfo.mianji}}m²</view>
+						<view class="grid-text">面积</view>
+					</u-grid-item>
 					<u-grid-item>
 						<view class="grid-textup">{{shopInfo.zujin}}元/月</view>
 						<view class="grid-text">租金</view>
@@ -18,10 +22,6 @@
 						<view v-if="search" class="grid-text">转让费</view>
 						<view v-else class="grid-text">预计投资</view>
 					</u-grid-item>
-					<u-grid-item>
-						<view class="grid-textup">{{shopInfo.mianji}}m²</view>
-						<view class="grid-text">面积</view>
-					</u-grid-item>
 				</u-grid>
 			</view>
 		</view>
@@ -32,6 +32,9 @@
 			<text>行业：{{shopInfo.trade1+'-'}}{{shopInfo.trade2}}</text>
 			<text>区域：{{shopInfo.area1}}</text>
 			<text v-if="search">地址：{{shopInfo.adress}}</text>
+			<view class="xq_rz" v-if="shopInfo.is_auth=='1'">
+				<image src="../../static/shoplist/xq_rz.png" style="width: 240rpx;height: 171rpx;"></image>
+			</view>
 		</view>
 		<view class="bgc">

@@ -42,7 +45,14 @@
 				<u-cell :title="shopInfo.lianxiren" :label="shopInfo.mobile" :border="false"></u-cell>
 			</view>
 			<u-divider :height="5"></u-divider>
-			<u-cell title="店铺介绍" :label="shopInfo.content" label-style="color = #5D5D5D;font-size: 24rpx;"></u-cell>
+			<u-cell title="店铺介绍" :label="shopInfo.content" label-style="color = #5D5D5D;font-size: 24rpx;">
+				<view slot="label" class="shop-content">
+					<view class="u-flex">
+						<view>{{ shopInfo.content }}</view>
+						<view style="color: #CC3333;">联系我时，请说是在速配商铺上看到的，谢谢!</view>
+					</view>
+				</view>
+			</u-cell>
 		</view>

 		<view class="bottom">
@@ -204,6 +214,7 @@
 	}

 	.location-detail {
+		position: relative;
 		display: flex;
 		// margin-top: 50rpx;
 		background-color: #fff;
@@ -211,6 +222,12 @@
 		padding-left: 16rpx;
 		line-height: 33px;
 		font-size: 15px;
+
+		.xq_rz {
+			position: absolute;
+			top: 30rpx;
+			right: 15rpx;
+		}
 	}

 	.seller-shop-detail {
@@ -231,6 +248,14 @@
 		}
 	}

+	.shop-content {
+		margin-top: 20rpx;
+		display: flex;
+		flex-wrap: wrap;
+		font-size: 24rpx;
+		color: #5D5D5D;
+	}
+
 	.bottom {
 		position: fixed;
 		bottom: 0;
--- a/pages/index/NavBarPages/czxx/czxx.vue
+++ b/pages/index/NavBarPages/czxx/czxx.vue
@@ -1,19 +1,22 @@
 <template>
 	<view>
-		<view class="search-box-bg">
-			<view class="bug-fix"></view>
-			<view class="search-box">
-				<view class="search-box-input">
-					<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 class="sticky">
+			<view class="search-box-bg">
+				<view class="bug-fix"></view>
+				<view class="search-box">
+					<view class="search-box-input">
+						<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>
 			</view>
+
+			<view>
+				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
+			</view>
 		</view>

-		<view>
-			<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
-		</view>
 		<view class="marginLR10">
 			<ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="3" :shopInfoList="shopInfoList" />
 		</view>
@@ -56,12 +59,12 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
 			if (this.shopListLength !== 0) {
-				this.keyword=''
+				this.keyword = ''
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -73,20 +76,25 @@
 			this.getShopList()
 		},
 		methods: {
-			getInput(val){
-				console.log('搜索值',val);
-				if(this.pageNum!==1){
-					this.pageNum=1
+			getInput(val) {
+				console.log('搜索值', val);
+				if (this.pageNum !== 1) {
+					this.pageNum = 1
 				}
 				const q = this.$u.queryParams({
 					type: 3,
 					pageSize: this.pageSize,
 					pageNum: this.pageNum,
-					kw:val
+					kw: val
 				})
 				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) {
--- a/pages/index/NavBarPages/xmzs/xmzs.vue
+++ b/pages/index/NavBarPages/xmzs/xmzs.vue
@@ -1,19 +1,22 @@
 <template>
 	<view>
-		<view class="search-box-bg">
-			<view class="bug-fix"></view>
-			<view class="search-box">
-				<view class="search-box-input">
-					<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 class="sticky">
+			<view class="search-box-bg">
+				<view class="bug-fix"></view>
+				<view class="search-box">
+					<view class="search-box-input">
+						<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>
 			</view>
+
+			<view>
+				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
+			</view>
 		</view>

-		<view>
-			<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
-		</view>
 		<view class="marginLR10">
 			<ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="4" :shopInfoList="shopInfoList" />
 		</view>
@@ -56,7 +59,7 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
@@ -87,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) {
--- a/pages/index/NavBarPages/zdxx/zdxx.vue
+++ b/pages/index/NavBarPages/zdxx/zdxx.vue
@@ -1,19 +1,22 @@
 <template>
 	<view>
-		<view class="search-box-bg">
-			<view class="bug-fix"></view>
-			<view class="search-box">
-				<view class="search-box-input">
-					<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 class="sticky">
+			<view class="search-box-bg">
+				<view class="bug-fix"></view>
+				<view class="search-box">
+					<view class="search-box-input">
+						<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>
 			</view>
+
+			<view>
+				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
+			</view>
 		</view>

-		<view>
-			<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
-		</view>
 		<view class="marginLR10">
 			<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
 		</view>
@@ -55,11 +58,12 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
 			if (!this.refresh && this.searchListLength !== 0) {
-				this.keyword=''
+				this.keyword = ''
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -71,20 +75,25 @@
 			this.getShopList()
 		},
 		methods: {
-			getInput(val){
-				console.log('搜索值',val);
-				if(this.pageNum!==1){
-					this.pageNum=1
+			getInput(val) {
+				console.log('搜索值', val);
+				if (this.pageNum !== 1) {
+					this.pageNum = 1
 				}
 				const q = this.$u.queryParams({
 					type: 2,
 					pageSize: this.pageSize,
 					pageNum: this.pageNum,
-					kw:val
+					kw: val
 				})
 				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) {
--- a/pages/index/NavBarPages/zrxx/zrxx.vue
+++ b/pages/index/NavBarPages/zrxx/zrxx.vue
@@ -1,19 +1,22 @@
 <template>
 	<view>
-		<view class="search-box-bg">
-			<view class="bug-fix"></view>
-			<view class="search-box">
-				<view class="search-box-input">
-					<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 class="sticky">
+			<view class="search-box-bg">
+				<view class="bug-fix"></view>
+				<view class="search-box">
+					<view class="search-box-input">
+						<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>
 			</view>
+
+			<view>
+				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
+			</view>
 		</view>

-		<view>
-			<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
-		</view>
 		<view class="marginLR10">
 			<ShowShopList :showStyle="1" :shopInfoList="shopInfoList" />
 		</view>
@@ -55,12 +58,12 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-
+			this.keyword = ''
 			// }
 		},
 		onReachBottom() {
 			if (!this.refresh && this.shopListLength !== 0) {
-				this.keyword=''
+				this.keyword = ''
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -86,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) {
@@ -155,8 +163,6 @@

 	.search-box-bg {
 		width: 100%;
-		position: relative;
-		z-index: 3;
 		background-color: #F8F8F8;

 		.bug-fix {
--- a/pages/index/map/map.vue
+++ b/pages/index/map/map.vue
@@ -118,21 +118,7 @@
 					// 	alpha: 1
 					// }
 				],
-				shopList: {
-					shopid: 1,
-					imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
-					title: '琴行铺面转让',
-					promotionNum: 23,
-					price: 6000,
-					date: '2023-11-02',
-					pos: '锦江区',
-					exactPos: '锦江区-汇源南路366号',
-					sqr: 100,
-					zrfText: "转让费：20万",
-					category: '餐饮美食',
-					uname: "张先生",
-					phoneNum: 13348946108,
-				}
+				shopList: {}
 			}
 		},
 		onShow() {
@@ -189,24 +175,10 @@
 					console.log('详情', res);
 					const data = res.data.data
 					if (res.data.code == 1) {
-						this.shopList = data
-						// {
-						// 	shopid: 1,
-						// 	pics: this.$api.imgUrl + data.pics,
-						// 	tt: data.tt,
-						// 	num: data.num,
-						// 	zujin: data.zujin,
-						// 	date: data.update_time,
-						// 	area1: data.area1,
-						// 	address: data.address,
-						// 	mianji: data.mianji,
-						// 	zhuanrangfei: "转让费：" + data.zhuanrangfei,
-						// 	trade: data.trade,
-						// 	lianxiren: data.lianxiren,
-						// 	mobile: data.mobile,
-						// }
-						// data.pics = [this.$api.imgUrl + data.pics]
-						// this.shopInfo = data
+						this.shopList = {
+							...data,
+							id: id
+						}
 					}
 				})
 			},
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -109,6 +109,9 @@
 						uni.setStorageSync("uid", data.user_id)
 						uni.setStorageSync("member", data.member)
 					}
+					if (res.data.msg == "登录超时，请重新登录") {
+						this.isLoad = false
+					}
 				})
 			}
 		}
--- a/pages/publish/publishTransfer/publishTransfer.vue
+++ b/pages/publish/publishTransfer/publishTransfer.vue
@@ -7,7 +7,7 @@
 						multiple :maxCount="5"></u-upload>
 				</view>
 				<!-- <u-upload max-count="5" upload-icon="photo"></u-upload> -->
-				<text class="count">发布房源图片({{imageLength}}/5)</text>
+				<text class="count">发布房源图片({{imageLength}}/5})</text>
 			</view>
 			<u-form-item label="标题" label-position="top" border-bottom="true" prop="title" label-width="auto">
 				<u-input v-model="form.title" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class"
--- a/pages/published/published.vue
+++ b/pages/published/published.vue
@@ -1,12 +1,15 @@
 <template>
 	<view>
-		<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>
+		<view class="search-bg sticky">
+			<view class="search-box">
+				<view class="search-box-input">
+					<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>
 		</view>
+
 		<view class="content">
 			<ShowShopList v-if="listId == 0" :isEdit="true" :showStyle="1" :shopInfoList="searchInfoList" @delItem="handleDel"
 				@updateItem="handleUpdate1"></ShowShopList>
@@ -19,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>

@@ -37,18 +44,84 @@
 				pageNum: 1,
 				matchPageSize: 5,
 				matchPageNum: 1,
+				keyword: '',
+				refresh: false,
+				showNull: false,
 			}
 		},
+		onPullDownRefresh() {
+			this.refresh = true
+			if (this.listId !== 4) {
+				this.getMyPublished(this.listId + 1, this.pageSize, 1)
+			} else {
+				this.getMatch(this.matchPageSize, 1)
+			}
+			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) {
+			} 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.listId !== 4) {
+					if (this.pageNum !== 1) {
+						this.pageNum = 1
+					}
+					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 {
+					if (this.matchPageNum !== 1) {
+						this.matchPageNum = 1
+					}
+					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({
@@ -103,14 +176,25 @@
 				})

 			},
-			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)
 					}
@@ -122,14 +206,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) {
+						if (isDelete == 1|| this.refresh) {
 							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)
 					}
@@ -162,9 +253,8 @@

 			if (this.titletext == '我的匹配') {
 				this.listId = 4
-				this.getMatch()
+				this.getMatch(this.matchPageSize, this.matchPageNum)
 			}
-
 		},
 		computed: {

@@ -173,6 +263,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;
@@ -182,7 +286,6 @@

 		.search-box-input {
 			border-radius: 12rpx;
-			margin-top: 20rpx;
 			background-color: #fff;
 			opacity: 0.85;

--- a/pages/shopAddress/shopAddress.vue
+++ b/pages/shopAddress/shopAddress.vue
@@ -1,17 +1,13 @@
 <template>
 	<view class="root">
-		<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh"></InputAndSwiper>
-
-		<view>
-			<view class="dropdown-bug">
-
-			</view>
+		<view class="sticky">
+			<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" ref="input"></InputAndSwiper>
 			<view class="marginLR10">
 				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
 			</view>
-			<view class="marginLR10">
-				<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
-			</view>
+		</view>
+		<view class="marginLR10">
+			<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
 		</view>
 		<view v-if="showNull" class="showNull">
 			<text>没有符合条件的数据, 请下拉刷新重置数据~
@@ -36,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,
@@ -58,7 +54,7 @@
 		},
 		onReachBottom() {
 			if (!this.refresh && this.searchListLength !== 0) {
-				this.isRefresh = true
+				this.$refs.input.resetInfo()
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -94,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) {
@@ -143,7 +144,11 @@

 	}
 </script>
-
+<style>
+	page {
+		background-color: #f8f8f8;
+	}
+</style>
 <style lang="scss" scoped>
 	.showNull {
 		display: flex;
@@ -153,22 +158,10 @@
 		color: darkgray;
 	}

-	page {
-		background-color: $uni-bg-color-grey;
-	}
-
 	.root {
 		position: relative;
 	}

-	.dropdown-bug {
-		position: absolute;
-		background-color: $uni-bg-color-grey;
-		height: 120rpx;
-		width: 100%;
-		transform: translateY(-20rpx);
-		z-index: 2;
-	}

 	.marginLR10 {
 		margin: 0 10px;
--- a/pages/shopTransfer/shopTransfer.vue
+++ b/pages/shopTransfer/shopTransfer.vue
@@ -1,22 +1,18 @@
 <template>
 	<view class="root">
-		<InputAndSwiper  @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh">
-		</InputAndSwiper>
-
-		<view>
-			<view class="dropdown-bug">
-
-			</view>
-			<view class="marginLR10">
+		<view class="sticky">
+			<InputAndSwiper @getQueryInfo="getInput" ref="input" :bannerURL="swiperList">
+			</InputAndSwiper>
+			<view class="marginLR10 ">
 				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
 			</view>
-			<view class="marginLR10">
-				<ShowShopList :showStyle="1" :shopInfoList="shopInfoList"></ShowShopList>
-			</view>
 		</view>
-		<view v-if="showNull" class="showNull">
-			<text>没有符合条件的数据, 请下拉刷新重置数据~
-			</text>
+		<view class="marginLR10">
+			<ShowShopList :showStyle="1" :shopInfoList="shopInfoList"></ShowShopList>
+			<view v-if="showNull" class="showNull">
+				<text>没有符合条件的数据, 请下拉刷新重置数据~
+				</text>
+			</view>
 		</view>
 		<TabBar :current-page="1"></TabBar>
 	</view>
@@ -24,6 +20,9 @@

 <script>
 	import DropDownItem from "@/components/DropDown/DropDownItem.vue"
+	import {
+		nextTick
+	} from "vue"
 	export default {
 		components: {
 			DropDownItem
@@ -37,8 +36,7 @@
 				swiperList: [],
 				shopListLength: '',
 				showNull: false,
-				refresh: false,
-				isRefresh: false
+				refresh: false
 			}
 		},
 		onPullDownRefresh() {
@@ -54,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("触底加载");
@@ -94,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) {
@@ -121,6 +125,7 @@
 						console.log('查询');
 						this.shopInfoList = [...this.shopInfoList, ...res.data.data]
 					}
+
 					uni.stopPullDownRefresh()
 					console.log(this.shopInfoList);
 				})
@@ -141,32 +146,27 @@
 		}
 	}
 </script>
-
-<style lang="scss" scoped>
+<style>
 	page {
-		background-color: $uni-bg-color-grey;
+		background-color: #f8f8f8;
 	}
-
+</style>
+<style lang="scss" scoped>
 	.showNull {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		height: 100rpx;
 		color: darkgray;
+		// position: absolute;
+		// top: 0;
+		// background-color: red;
 	}

 	.root {
 		position: relative;
 	}

-	.dropdown-bug {
-		position: absolute;
-		background-color: $uni-bg-color-grey;
-		height: 120rpx;
-		width: 100%;
-		transform: translateY(-20rpx);
-		z-index: 2;
-	}

 	.marginLR10 {
 		margin: 0 10px;
--- a/service/request.js
+++ b/service/request.js
@@ -1,7 +1,7 @@
 const serverHost = 'https://spsp.feashow.com/api' //http://xx.xxx.xx
 function isOutTime(res) {
 	if (res.data.msg == '登录超时，请重新登录') {
-		uni.showToast('登录信息已过期,请重新登录')
+		// uni.showToast('登录信息已过期,请重新登录')
 		// setTimeout(() => {
 		uni.redirectTo({
 			url: '/pages/login/login'
--- a/static/shoplist/xq_rz.png
+++ b/static/shoplist/xq_rz.png
--- a/static/tabbar/di_icon_dzh.png
+++ b/static/tabbar/di_icon_dzh.png
--- a/static/tabbar/di_icon_syh.png
+++ b/static/tabbar/di_icon_syh.png
--- a/static/tabbar/di_icon_wdh.png
+++ b/static/tabbar/di_icon_wdh.png
--- a/static/tabbar/di_icon_zrh.png
+++ b/static/tabbar/di_icon_zrh.png
--- a/uni.scss
+++ b/uni.scss
@@ -74,3 +74,11 @@ $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
+
+
+.sticky {
+    position: sticky;
+    top: 0;
+    z-index: 9;
+		background-color: #F8F8F8;
+}
--- a/utils/share.js
+++ b/utils/share.js
@@ -0,0 +1,8 @@
+export default{
+    onShareAppMessage() {
+        return {}
+    },
+    onShareTimeline() {
+        return {}
+    }
+}
Author	SHA1	Message	Date
LuoShijie	8d7cf8d8b2	罗世杰：支持分享到朋友、朋友圈	2023-11-30 20:10:13 +08:00
odjbin	19a699a968	Merge pull request 'dj' (#119 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/119	2023-11-28 05:54:00 +00:00
dengj	f21f82ba6e	邓洁: 完善搜索功能	2023-11-28 13:53:30 +08:00
邓洁	2a0144d1bd	邓洁 : 修改搜索细节	2023-11-28 12:14:56 +08:00
odjbin	97c1cbbded	Merge pull request '邓洁：修改细节' (#118 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/118	2023-11-27 16:15:20 +00:00
邓洁	2000ce91af	邓洁：修改细节	2023-11-28 00:14:41 +08:00
odjbin	9f62244f16	Merge pull request 'dj' (#117 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/117	2023-11-27 15:49:12 +00:00
邓洁	93d2bb04c7	邓洁：搜索框吸顶	2023-11-27 23:47:51 +08:00
邓洁	096440bbfc	Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer	2023-11-27 23:11:02 +08:00
luojie	6ebb1fc8d8	Merge pull request '罗世杰：下拉栏吸顶' (#115 ) from lj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/115	2023-11-27 12:50:45 +00:00
LuoShijie	c99a58c97f	罗世杰：下拉栏吸顶	2023-11-27 20:50:12 +08:00
odjbin	0411b70025	Merge pull request '邓洁：优化小程序样式' (#114 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/114	2023-11-27 08:02:19 +00:00
邓洁	5e200924b9	邓洁：优化小程序样式	2023-11-27 16:02:06 +08:00
odjbin	d857a56aff	Merge pull request '邓洁：修改详情页细节' (#113 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/113	2023-11-27 06:28:06 +00:00
邓洁	d9f36c70f0	邓洁：修改详情页细节	2023-11-27 14:27:38 +08:00
邓洁	53939da52e	邓洁：修改详情页细节	2023-11-27 14:26:51 +08:00
odjbin	448b198f28	Merge pull request 'dj' (#112 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/112	2023-11-27 06:18:41 +00:00
邓洁	0bbe5b6be6	邓洁：修改地图店铺列表渲染细节	2023-11-27 14:18:18 +08:00
邓洁	e04e0a3859	邓洁：修改地图列表跳转详情问题	2023-11-27 14:09:47 +08:00
luojie	9e561ac223	Merge pull request '罗世杰：详情页微调' (#111 ) from lj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/111	2023-11-27 05:47:27 +00:00
LuoShijie	eee06e9f1d	罗世杰：详情页微调	2023-11-27 13:46:36 +08:00
odjbin	f7699ae669	Merge pull request '邓洁：修改列表图片渲染问题' (#110 ) from dj into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/110	2023-11-27 04:16:26 +00:00
邓洁	690a4a50c4	邓洁：修改列表图片渲染问题	2023-11-27 12:15:59 +08:00
Hot7z	6b95233940	Merge pull request '梁航：表单二级联动' (#109 ) from lh into master Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/109	2023-11-27 02:29:13 +00:00