梁航：添加图片多出的括号删除

components/InputAndSwiper/InputAndSwiper.vue

@@ -2,9 +2,8 @@
 	<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"
+				<u-input v-model="keyword" placeholder="请输入店铺名称进行搜索" placeholder-style="color: #969696" prefixIcon="search"
-					prefixIconStyle="font-size: 24px;color: #909399;" border="true" @clear="handleClear" clearable
+					prefixIconStyle="font-size: 24px;color: #909399;" border="true" @clear="handleClear" clearable @change="changeInput">
-					@change="changeInput">
 					<template slot="suffix">
 						<view style="display: flex;align-items: center;">
 							<u-icon name="map-fill" color="#329866" size="22"></u-icon>
@@ -47,20 +46,20 @@
 			return {
 				position: uni.getStorageSync('city') + uni.getStorageSync('district').slice(0, 2),
 				currentNum: '',
-				keyword: ''
+				keyword:''
 			};
 		},
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
 		},
-		// watch: {
+		watch: {
-		// 	refresh(newVal, oldVal) {
+			refresh(newVal, oldVal) {
-		// 		console.log('newVal', newVal);
+				console.log('newVal',newVal);
-		// 		// if (newVal) {
+				if(newVal){
-		// 		this.keyword = ''
+					this.keyword=''
-		// 		// }
+				}
-		// 	}
+			}
-		// },
+		},
 		onShow() {
 			if (this.type !== '0') {
 				this.open()
@@ -70,15 +69,12 @@
 		
 		},
 		methods: {
-			resetInfo() {
+			changeInput(e){
-				this.keyword = ''
+				this.$emit('getQueryInfo',e)
 			},
-			changeInput(e) {
+			handleClear(e){
-				this.$emit('getQueryInfo', e)
-			},
-			handleClear(e) {
 				
-				console.log('handleClear', e);
+				console.log('handleClear',e);
 			},
 			open() {
 				if (!uni.getStorageSync('city') && !uni.getStorageSync('district')) {

components/SearchShopList/SearchShopList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<SearchShopListItem v-for="item in searchInfoList" :key="item.id" :shopInfo="item" :show-style="showStyle"
+		<SearchShopListItem v-for="item in searchInfoList" :key="searchid" :shopInfo="item" :show-style="showStyle"
 			:isEdit="isEdit" @delItem="handleDel" @updateItem="handleUpdate"></SearchShopListItem>
 	</view>
 </template>

components/ShowShopList/ShowShopList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<ShowShopListItem v-for="item in shopInfoList" :key="item.id" :shopInfo="item" :is-adshow="isADshow"
+		<ShowShopListItem v-for="item in shopInfoList" :shopInfo="item" :is-adshow="isADshow"
 			:adlinkPath="adlinkPath" :show-style="showStyle" :is-edit="isEdit" @delItem="handleDel"
 			@updateItem="hanldeUpdate"></ShowShopListItem>
 	</view>

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,22 +142,9 @@
 		},
 		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() {
-			if (this.shopInfo.pics.includes(",")) {
+			this.leftImage = this.$api.imgUrl + this.shopInfo.pics.split(',')[0]
-				this.leftImage = this.$api.imgUrl + this.shopInfo.pics.split(',')[0]
-			} else {
-				this.leftImage = this.$api.imgUrl + this.shopInfo.pics
-			}
 		},
 		methods: {
 			handleEdit(shopid) {
@@ -170,7 +157,7 @@
 				this.$emit('delItem', shopid)
 			},
 			enterDetail() {
-				console.log("进入详情页面", this.shopInfo.id, this.shopInfo.type);
+				// console.log("进入详情页面");
 				const query = this.$u.queryParams({
 					id: this.shopInfo.id,
 					type: this.shopInfo.type
@@ -218,8 +205,7 @@
 			flex-direction: column;
 			justify-content: space-between;
 
-			>text,
+			>text, >u-text {
-			>u-text {
 				font-size: 14px;
 			}
 

main.js

@@ -9,8 +9,6 @@ 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

pages.json

@@ -71,7 +71,7 @@
 				"navigationBarTitleText": "",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#339967",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/publish/publishTransfer/publishTransfer",

pages/Partnerships/Partnerships.vue

@@ -27,163 +27,163 @@
 			<rich-text :nodes="content"></rich-text>
 		</u-modal>
 	</view>
-	</template>
+</template>
 
-	<script>
+<script>
-		export default {
+	export default {
-			data() {
+		data() {
-				return {
+			return {
-					color: '#CC3333',
+				color: '#CC3333',
-					btnText: '提交审核',
+				btnText: '提交审核',
-					member: '',
+				member: '',
-					show: false,
+				show: false,
-					disabled: false,
+				disabled: false,
-					btnDisabled: false,
+				btnDisabled: false,
-					content: `申请已提交, 请等待后台审核`,
+				content: `申请已提交, 请等待后台审核`,
-					submitForm: {
+				submitForm: {
-						real_name: '',
+					real_name: '',
-						idcard: ''
+					idcard: ''
-					}
 				}
-			},
+			}
-			onShow() {
+		},
-				this.getInfo()
+		onShow() {
-			},
+			this.getInfo()
-			methods: {
+		},
-				getInfo() {
+		methods: {
-					this.$api.getUser().then(res => {
+			getInfo() {
-						var data = res.data.data
+				this.$api.getUser().then(res => {
-						if (data) {
+					var data = res.data.data
-							this.member = data.member
+					if (data) {
-							if (data.member == 1) {
+						this.member = data.member
-								this.disabled = true
+						if (data.member == 1) {
-								this.btnDisabled = true
+							this.disabled = true
-								this.color = "#C6C6C6"
+							this.btnDisabled = true
-								this.btnText = "审核中…"
+							this.color = "#C6C6C6"
-							}
+							this.btnText = "审核中…"
-							// else if (data.member == 2) {
-							// 	this.disabled = false
-							// 	this.btnDisabled = false
-							// 	this.color = "#CC3333"
-							// 	this.btnText = "联系客服"
-							// }
 						}
-					})
+						// else if (data.member == 2) {
-				},
+						// 	this.disabled = false
-				confirm() {
+						// 	this.btnDisabled = false
-					uni.reLaunch({
+						// 	this.color = "#CC3333"
-						url: '/pages/my/my'
+						// 	this.btnText = "联系客服"
-					})
+						// }
-					// 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('联系客服');
 					}
+				})
+			},
+			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('联系客服');
 				}
 			}
 		}
-	</script>
+	}
+</script>
 
-	<style lang="scss">
+<style lang="scss">
-		.service-btn {
+	.service-btn {
-			height: 40px;
+		height: 40px;
-			background-color: #CC3333;
+		background-color: #CC3333;
-			color: #fff;
+		color: #fff;
-			border-radius: 25px;
+		border-radius: 25px;
 
-			font-size: 32rpx;
+		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;
 		}
+	}
 
-		.hhr {
+	.u-modal__button-group__wrapper--hover {
-			margin-top: 50rpx;
+		background: #0EBB5B !important;
-			margin-bottom: 50rpx;
+	}
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
 
-			.hhr-text {
+	.input-class {
-				margin-top: 28rpx;
+		font-weight: 1rpx;
-				// width: 186rpx;
+		color: #A0A0A0;
-				height: 50rpx;
+	}
-				font-size: 36rpx;
-				font-family: PingFang-SC, PingFang-SC;
-				font-weight: 800;
-				color: #F20C0C;
-				line-height: 50rpx;
-				letter-spacing: 1px;
-			}
-		}
 
-		.u-modal__button-group__wrapper--hover {
+	.submit-btn {
-			background: #0EBB5B !important;
+		width: 80%;
-		}
+		margin-top: 50rpx;
+		translate: 10%;
+	}
 
-		.input-class {
+	.name,
-			font-weight: 1rpx;
+	.id {
-			color: #A0A0A0;
+		padding: 10rpx;
-		}
+	}
 
-		.submit-btn {
+	.text {
-			width: 80%;
+		margin-left: 20rpx;
-			margin-top: 50rpx;
+	}
-			translate: 10%;
-		}
 
-		.name,
+	.payment {
-		.id {
+		margin-top: 20rpx;
-			padding: 10rpx;
+		display: flex;
-		}
+		justify-content: space-between;
 
-		.text {
+	}
-			margin-left: 20rpx;
-		}
 
-		.payment {
+	.left-payment {
-			margin-top: 20rpx;
+		display: flex;
-			display: flex;
+		flex-direction: column;
-			justify-content: space-between;
+	}
 
-		}
+	.label {
-
+		margin-top: 10rpx;
-		.left-payment {
+		margin-left: 17rpx;
-			display: flex;
+		color: #c1c1c1;
-			flex-direction: column;
+		/* font-size: 27rpx; */
-		}
+	}
-
+</style>
-		.label {
-			margin-top: 10rpx;
-			margin-left: 17rpx;
-			color: #c1c1c1;
-			/* font-size: 27rpx; */
-		}
-	</style>

pages/detail/detail.vue

@@ -9,10 +9,6 @@
 			</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>
@@ -22,6 +18,10 @@
 						<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,9 +32,6 @@
 			<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">
 
@@ -45,14 +42,7 @@
 				<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 title="店铺介绍" :label="shopInfo.content" label-style="color = #5D5D5D;font-size: 24rpx;"></u-cell>
-				<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">
@@ -214,7 +204,6 @@
 	}
 
 	.location-detail {
-		position: relative;
 		display: flex;
 		// margin-top: 50rpx;
 		background-color: #fff;
@@ -222,12 +211,6 @@
 		padding-left: 16rpx;
 		line-height: 33px;
 		font-size: 15px;
-
-		.xq_rz {
-			position: absolute;
-			top: 30rpx;
-			right: 15rpx;
-		}
 	}
 
 	.seller-shop-detail {
@@ -248,14 +231,6 @@
 		}
 	}
 
-	.shop-content {
-		margin-top: 20rpx;
-		display: flex;
-		flex-wrap: wrap;
-		font-size: 24rpx;
-		color: #5D5D5D;
-	}
-
 	.bottom {
 		position: fixed;
 		bottom: 0;

pages/index/NavBarPages/czxx/czxx.vue

@@ -1,22 +1,19 @@
 <template>
 	<view>
-		<view class="sticky">
+		<view class="search-box-bg">
-			<view class="search-box-bg">
+			<view class="bug-fix"></view>
-				<view class="bug-fix"></view>
+			<view class="search-box">
-				<view class="search-box">
+				<view class="search-box-input">
-					<view class="search-box-input">
+					<u-input v-model="keyword" placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
-						<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
-							prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
+					</u-input>
-						</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>
@@ -59,12 +56,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("触底加载");
@@ -76,25 +73,20 @@
 			this.getShopList()
 		},
 		methods: {
-			getInput(val) {
+			getInput(val){
-				console.log('搜索值', val);
+				console.log('搜索值',val);
-				if (this.pageNum !== 1) {
+				if(this.pageNum!==1){
-					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) {

pages/index/NavBarPages/xmzs/xmzs.vue

@@ -1,22 +1,19 @@
 <template>
 	<view>
-		<view class="sticky">
+		<view class="search-box-bg">
-			<view class="search-box-bg">
+			<view class="bug-fix"></view>
-				<view class="bug-fix"></view>
+			<view class="search-box">
-				<view class="search-box">
+				<view class="search-box-input">
-					<view class="search-box-input">
+					<u-input v-model="keyword" placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
-						<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
-							prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
+					</u-input>
-						</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>
@@ -59,7 +56,7 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-			this.keyword = ''
+
 			// }
 		},
 		onReachBottom() {
@@ -90,11 +87,6 @@
 				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) {

pages/index/NavBarPages/zdxx/zdxx.vue

@@ -1,22 +1,19 @@
 <template>
 	<view>
-		<view class="sticky">
+		<view class="search-box-bg">
-			<view class="search-box-bg">
+			<view class="bug-fix"></view>
-				<view class="bug-fix"></view>
+			<view class="search-box">
-				<view class="search-box">
+				<view class="search-box-input">
-					<view class="search-box-input">
+					<u-input v-model="keyword" placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
-						<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
-							prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
+					</u-input>
-						</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>
@@ -58,12 +55,11 @@
 			// }
 			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("触底加载");
@@ -75,25 +71,20 @@
 			this.getShopList()
 		},
 		methods: {
-			getInput(val) {
+			getInput(val){
-				console.log('搜索值', val);
+				console.log('搜索值',val);
-				if (this.pageNum !== 1) {
+				if(this.pageNum!==1){
-					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) {

pages/index/NavBarPages/zrxx/zrxx.vue

@@ -1,22 +1,19 @@
 <template>
 	<view>
-		<view class="sticky">
+		<view class="search-box-bg">
-			<view class="search-box-bg">
+			<view class="bug-fix"></view>
-				<view class="bug-fix"></view>
+			<view class="search-box">
-				<view class="search-box">
+				<view class="search-box-input">
-					<view class="search-box-input">
+					<u-input v-model="keyword" placeholder="请输入店铺名称进行搜索" placeholder-style="color: #969696" prefixIcon="search"
-						<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
-							prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
+					</u-input>
-						</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>
@@ -58,12 +55,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("触底加载");
@@ -89,11 +86,6 @@
 				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) {
@@ -163,6 +155,8 @@
 
 	.search-box-bg {
 		width: 100%;
+		position: relative;
+		z-index: 3;
 		background-color: #F8F8F8;
 
 		.bug-fix {

pages/index/map/map.vue

@@ -118,7 +118,21 @@
 					// 	alpha: 1
 					// }
 				],
-				shopList: {}
+				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,
+				}
 			}
 		},
 		onShow() {
@@ -175,10 +189,24 @@
 					console.log('详情', res);
 					const data = res.data.data
 					if (res.data.code == 1) {
-						this.shopList = {
+						this.shopList = data
-							...data,
+						// {
-							id: id
+						// 	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
 					}
 				})
 			},

pages/my/my.vue

@@ -109,9 +109,6 @@
 						uni.setStorageSync("uid", data.user_id)
 						uni.setStorageSync("member", data.member)
 					}
-					if (res.data.msg == "登录超时，请重新登录") {
-						this.isLoad = false
-					}
 				})
 			}
 		}

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"

pages/published/published.vue

@@ -1,15 +1,12 @@
 <template>
 	<view>
-		<view class="search-bg sticky">
+		<view class="search-box">
-			<view class="search-box">
+			<view class="search-box-input">
-				<view class="search-box-input">
+				<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
-					<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
+					prefixIconStyle="font-size: 24px;color: #909399;" border="true">
-						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
+				</u-input>
-					</u-input>
-				</view>
 			</view>
 		</view>
-
 		<view class="content">
 			<ShowShopList v-if="listId == 0" :isEdit="true" :showStyle="1" :shopInfoList="searchInfoList" @delItem="handleDel"
 				@updateItem="handleUpdate1"></ShowShopList>
@@ -22,10 +19,6 @@
 				@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>
 
@@ -44,84 +37,18 @@
 				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.refresh && this.searchListLength !== 0) {
+			if (this.listId !== 4 && this.searchListLength !== 0) {
 				this.pageNum++
 				this.getMyPublished(this.listId + 1, this.pageSize, this.pageNum)
-			} else if (this.listId == 4 && !this.refresh &&this.matchListLength !== 0) {
+			} else if (this.listId == 4 && this.matchListLength !== 0) {
 				this.matchPageNum++
-				this.getMatch(this.matchPageSize, this.matchPageNum)
+				this.getMatch()
-			} 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({
@@ -176,25 +103,14 @@
 				})
 
 			},
-			getMatch(pageSize,pageNum) {
+			getMatch() {
 				this.$api.getMyMatch({
-					pageSize: pageSize,
+					pageSize: this.matchPageSize,
-					pageNum: pageNum
+					pageNum: this.matchPageNum
 				}).then(res => {
 					if (res.data.code == 1) {
 						this.matchListLength = res.data.data.length
-						if(this.refresh){
+						this.matchList = [...this.matchList, ...res.data.data[0]]
-							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)
 					}
@@ -206,21 +122,14 @@
 					pageSize: pageSize,
 					pageNum: pageNum
 				}).then(res => {
-					console.log('发布信息l', res, res.data.data.length);
+					console.log('发布信息', res);
 					if (res.data.code == 1) {
 						this.searchListLength = res.data.data.length
-						if (isDelete == 1|| this.refresh) {
+						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)
 					}
@@ -253,8 +162,9 @@
 
 			if (this.titletext == '我的匹配') {
 				this.listId = 4
-				this.getMatch(this.matchPageSize, this.matchPageNum)
+				this.getMatch()
 			}
+
 		},
 		computed: {
 
@@ -263,20 +173,6 @@
 </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;
@@ -286,6 +182,7 @@
 
 		.search-box-input {
 			border-radius: 12rpx;
+			margin-top: 20rpx;
 			background-color: #fff;
 			opacity: 0.85;
 

pages/shopAddress/shopAddress.vue

@@ -1,13 +1,17 @@
 <template>
 	<view class="root">
-		<view class="sticky">
+		<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh"></InputAndSwiper>
-			<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" ref="input"></InputAndSwiper>
+
+		<view>
+			<view class="dropdown-bug">
+
+			</view>
 			<view class="marginLR10">
 				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
 			</view>
-		</view>
+			<view class="marginLR10">
-		<view class="marginLR10">
+				<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
-			<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
+			</view>
 		</view>
 		<view v-if="showNull" class="showNull">
 			<text>没有符合条件的数据, 请下拉刷新重置数据~
@@ -32,12 +36,12 @@
 				customQuery: {},
 				searchListLength: '',
 				showNull: false,
-				refresh: false
+				refresh: false,
+				isRefresh: false
 			}
 		},
 		onPullDownRefresh() {
 			this.refresh = true
-			this.$refs.input.resetInfo()
 			// if (this.showNull = true) {
 			const q = this.$u.queryParams({
 				type: 2,
@@ -54,7 +58,7 @@
 		},
 		onReachBottom() {
 			if (!this.refresh && this.searchListLength !== 0) {
-				this.$refs.input.resetInfo()
+				this.isRefresh = true
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -90,11 +94,6 @@
 				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) {
@@ -144,11 +143,7 @@
 
 	}
 </script>
-<style>
+
-	page {
-		background-color: #f8f8f8;
-	}
-</style>
 <style lang="scss" scoped>
 	.showNull {
 		display: flex;
@@ -158,10 +153,22 @@
 		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;

pages/shopTransfer/shopTransfer.vue

@@ -1,28 +1,29 @@
 <template>
 	<view class="root">
-		<view class="sticky">
+		<InputAndSwiper  @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh">
-			<InputAndSwiper @getQueryInfo="getInput" ref="input" :bannerURL="swiperList">
+		</InputAndSwiper>
-			</InputAndSwiper>
+
-			<view class="marginLR10 ">
+		<view>
+			<view class="dropdown-bug">
+
+			</view>
+			<view class="marginLR10">
 				<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
 			</view>
-		</view>
+			<view class="marginLR10">
-		<view class="marginLR10">
+				<ShowShopList :showStyle="1" :shopInfoList="shopInfoList"></ShowShopList>
-			<ShowShopList :showStyle="1" :shopInfoList="shopInfoList"></ShowShopList>
-			<view v-if="showNull" class="showNull">
-				<text>没有符合条件的数据, 请下拉刷新重置数据~
-				</text>
 			</view>
 		</view>
+		<view v-if="showNull" class="showNull">
+			<text>没有符合条件的数据, 请下拉刷新重置数据~
+			</text>
+		</view>
 		<TabBar :current-page="1"></TabBar>
 	</view>
 </template>
 
 <script>
 	import DropDownItem from "@/components/DropDown/DropDownItem.vue"
-	import {
-		nextTick
-	} from "vue"
 	export default {
 		components: {
 			DropDownItem
@@ -36,7 +37,8 @@
 				swiperList: [],
 				shopListLength: '',
 				showNull: false,
-				refresh: false
+				refresh: false,
+				isRefresh: false
 			}
 		},
 		onPullDownRefresh() {
@@ -52,12 +54,11 @@
 			// }
 			this.getShopList(q, "refresh")
 			this.$refs.dropdown.resetInfo()
-			this.$refs.input.resetInfo()
 			// }
 		},
 		onReachBottom() {
 			if (!this.refresh && this.shopListLength !== 0) {
-				this.$refs.input.resetInfo()
+				this.isRefresh = true
 				this.pageNum++
 				this.getShopList()
 				console.log("触底加载");
@@ -93,11 +94,6 @@
 				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) {
@@ -125,7 +121,6 @@
 						console.log('查询');
 						this.shopInfoList = [...this.shopInfoList, ...res.data.data]
 					}
-
 					uni.stopPullDownRefresh()
 					console.log(this.shopInfoList);
 				})
@@ -146,27 +141,32 @@
 		}
 	}
 </script>
-<style>
+
-	page {
-		background-color: #f8f8f8;
-	}
-</style>
 <style lang="scss" scoped>
+	page {
+		background-color: $uni-bg-color-grey;
+	}
+
 	.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;

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'

uni.scss

@@ -74,11 +74,3 @@ $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;
-}

utils/share.js

@@ -1,8 +0,0 @@
-export default{
-    onShareAppMessage() {
-        return {}
-    },
-    onShareTimeline() {
-        return {}
-    }
-}