邓洁 : 修改细节

components/InputAndSwiper/InputAndSwiper.vue

@@ -2,8 +2,8 @@
 	<view class="input-and-swiper-root">
 		<view class="search-box" v-if="type!=='0'">
 			<view class="search-box-input">
-				<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
+				<u-input placeholder="请输入店铺名称进行搜索" placeholder-style="color: #969696" prefixIcon="search"
-					prefixIconStyle="font-size: 24px;color: #909399;" border="true">
+					prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="changeInput">
 					<template slot="suffix">
 						<view style="display: flex;align-items: center;">
 							<u-icon name="map-fill" color="#329866" size="22"></u-icon>
@@ -53,6 +53,9 @@
 			}
 		},
 		methods: {
+			changeInput(e){
+				this.$emit('getQueryInfo',e)
+			},
 			open() {
 				if (!uni.getStorageSync('city') && !uni.getStorageSync('district')) {
 					uni.getSystemInfo({

components/SearchShopListItem/SearchShopListItem.vue

@@ -5,22 +5,22 @@
 		</view>
 		<view class="list-container" @click="enterDetail()">
 			<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 class="style2" v-if="showStyle === 1">
 					<view class="rent-and-cost">
 						<text>租金：{{shopInfo.zujin}}元/月</text>
-						<text v-if="showStyle==1">预计投资：{{shopInfo.zhuanrangfei}}</text>
+						<text v-if="showStyle==1">预计投资：{{shopInfo.zhuanrangfei}}万</text>
 					</view>
 					<view class="cart-and-pos">
-						<view>
+						<view style="width: 131rpx;margin-right: 68rpx;">
-							<view>
+							<view style="margin-right: 4px;">
 								<u-image src="/static/shoplist/sy_icon_lbhy.png" width="12px" height="15px"></u-image>
 							</view>
 							<text>{{shopInfo.trade1}}</text>
 						</view>
-						<view>
+						<view style="width: 131rpx;">
-							<view>
+							<view style="margin-right: 4px;">
 								<u-image src="/static/shoplist/sy_icon_lbhdw.png" width="12px" height="15px"></u-image>
 							</view>
 							<text>{{shopInfo.area1}}</text>
@@ -28,16 +28,18 @@
 					</view>
 				</view>
 				<view class="style3" v-if="showStyle === 2">
-					<view class="cjsj">成交时间：{{$u.timeFormat(shopInfo.deal_time,'yyyy-mm-dd')}}</view>
+					<view class="cjsj">
+						<text>成交时间：{{$u.timeFormat(shopInfo.deal_time,'yyyy-mm-dd')}}</text>
+					</view>
 					<view class="cart-and-pos">
-						<view>
+						<view style="width: 131rpx;margin-right: 68rpx;">
-							<view>
+							<view style="margin-right: 4px;">
 								<u-image src="/static/cjal/al_icon_flh.png" width="12px" height="15px"></u-image>
 							</view>
 							<text :class="{style3: showStyle === 2}">{{shopInfo.trade1}}</text>
 						</view>
-						<view>
+						<view style="width: 131rpx;">
-							<view>
+							<view style="margin-right: 4px;">
 								<u-image src="/static/cjal/al_icon_dwh.png" width="12px" height="15px"></u-image>
 							</view>
 							<text :class="{style3: showStyle === 2}">{{shopInfo.area1}}</text>
@@ -46,21 +48,21 @@
 				</view>
 
 				<view class="sqr-and-lx" :class="{pb0: showStyle === 2}">
-					<view>
+					<view style="width: 131rpx;margin-right: 68rpx;">
 						<view>
 							<u-image v-if="showStyle === 2" src="/static/cjal/al_icon_pm.png" width="12px" height="15px"></u-image>
 							<u-image v-else src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
 						</view>
-						<text :class="{style3: showStyle === 2}">{{shopInfo.mianji}}m2</text>
+						<text :class="{style3: showStyle === 2}">{{shopInfo.mianji}}m²</text>
 					</view>
-					<view>
+					<view style="width: 131rpx;margin-right: 64rpx;">
 						<view>
-							<u-image v-if="showStyle === 2" src="/static/cjal/al_icon_mch.png" width="12px" height="15px"></u-image>
+							<u-image v-if=" showStyle===2" src="/static/cjal/al_icon_mch.png" width="12px" height="15px"></u-image>
 							<u-image v-else src="/static/shoplist/sy_icon_lbxm.png" width="12px" height="15px"></u-image>
 						</view>
 						<text :class="{style3: showStyle === 2}">{{shopInfo.lianxiren}}</text>
 					</view>
-					<view style="flex:2">
+					<view style="width: 190rpx;">
 						<view>
 							<u-image v-if="showStyle === 2" src="/static/cjal/al_icon_sjh.png" width="12px" height="15px"></u-image>
 							<u-image v-else src="/static/shoplist/sy_icon_lblxr.png" width="12px" height="15px"></u-image>
@@ -70,19 +72,19 @@
 				</view>
 
 				<view class="cart-and-date" v-if="showStyle === 0">
-					<view>
+					<view style="width: 131rpx;">
 						<view>
 							<u-image src="/static/shoplist/sy_icon_lbhy.png" width="12px" height="15px"></u-image>
 						</view>
 						<text>{{shopInfo.trade1}}</text>
 					</view>
-					<view>
+					<view style="width: 131rpx;">
 						<view>
 							<u-image src="/static/shoplist/sy_icon_lbhdw.png" width="12px" height="15px"></u-image>
 						</view>
 						<text>{{shopInfo.area1}}</text>
 					</view>
-					<view style="flex:2">
+					<view style="width: 290rpx;">
 						<view>
 							<u-image src="/static/shoplist/sy_icon_lbrq.png" width="12px" height="15px"></u-image>
 						</view>
@@ -164,7 +166,6 @@
 		}
 	}
 </script>
-
 <style lang="scss" scoped>
 	.style3 {
 		position: relative;
@@ -183,11 +184,16 @@
 		position: absolute;
 		top: 30rpx;
 		right: 13rpx;
+		z-index: 5;
 	}
 
 	.cjsj {
 		margin-top: 20rpx;
 		margin-bottom: 12rpx;
+
+		>text {
+			font-size: 24rpx;
+		}
 	}
 
 	.list-border {
@@ -235,12 +241,11 @@
 			width: 100%;
 
 			>text {
-				font-size: 14px;
+				font-size: 28rpx;
 			}
 
 			>view {
 				display: flex;
-
 				>view {
 					display: flex;
 
@@ -260,6 +265,7 @@
 				.rent-and-cost {
 					text {
 						margin-right: 26rpx;
+						font-size: 24rpx;
 					}
 
 					margin-top: 5px;
@@ -283,18 +289,21 @@
 					text {
 						color: #CC3333;
 						line-height: 12px;
+						font-size: 24rpx;
 					}
 				}
 			}
 
 			.sqr-and-lx {
-				justify-content: space-between;
+				display: flex;
+				// justify-content: space-between;
 				margin-top: 5px;
 				padding-bottom: 6px;
 
 				text {
 					color: #359867;
 					line-height: 12px;
+					font-size: 24rpx;
 				}
 
 				.style3 {
@@ -302,11 +311,11 @@
 				}
 
 				>view {
-					flex: 1;
+					// flex: 1;
-					display: flex;
+					// display: flex;
 
 					>view {
-						margin-right: 4px;
+						// margin-right: 4px;
 					}
 				}
 			}
@@ -321,7 +330,7 @@
 				text {
 					color: #CC3333;
 					line-height: 12px;
-					margin-right: 48rpx;
+					// margin-right: 48rpx;
 				}
 			}
 		}

pages/detail/detail.vue

@@ -13,9 +13,10 @@
 						<view class="grid-textup">{{shopInfo.zujin}}元/月</view>
 						<view class="grid-text">租金</view>
 					</u-grid-item>
-					<u-grid-item>
+					<u-grid-item v-if="type==1||type==2">
 						<view class="grid-textup">{{shopInfo.zhuanrangfei}}万元</view>
-						<view class="grid-text">转让费</view>
+						<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>
@@ -80,11 +81,13 @@
 			return {
 				shopInfo: {},
 				showM: false,
-				search: true
+				search: true,
+				type: ''
 			}
 		},
 		onLoad: function(options) {
 			console.log('detail', options);
+			this.type = options.type
 			if (options.search == "1") {
 				this.search = false
 			} else {

pages/index/NavBarPages/czxx/czxx.vue

@@ -5,7 +5,7 @@
 			<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">
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
 					</u-input>
 				</view>
 			</view>
@@ -70,6 +70,22 @@
 			this.getShopList()
 		},
 		methods: {
+			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
+				})
+				this.$api.getShopList(q).then(res => {
+					this.shopListLength = res.data.data.length
+					this.shopInfoList = res.data.data
+				})
+			},
 			getShopList(q, type) {
 				let query = {}
 				if (type == "refresh") {

pages/index/NavBarPages/xmzs/xmzs.vue

@@ -5,7 +5,7 @@
 			<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">
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
 					</u-input>
 				</view>
 			</view>
@@ -70,6 +70,22 @@
 			this.getShopList()
 		},
 		methods: {
+			getInput(val){
+				console.log('搜索值',val);
+				if(this.pageNum!==1){
+					this.pageNum=1
+				}
+				const q = this.$u.queryParams({
+					type: 4,
+					pageSize: this.pageSize,
+					pageNum: this.pageNum,
+					kw:val
+				})
+				this.$api.getShopList(q).then(res => {
+					this.shopListLength = res.data.data.length
+					this.shopInfoList = res.data.data
+				})
+			},
 			getShopList(q, type) {
 				let query = {}
 				if (type == "refresh") {

pages/index/NavBarPages/zdxx/zdxx.vue

@@ -5,7 +5,7 @@
 			<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">
+						prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
 					</u-input>
 				</view>
 			</view>
@@ -69,6 +69,22 @@
 			this.getShopList()
 		},
 		methods: {
+			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
+				})
+				this.$api.getShopList(q).then(res => {
+					this.searchListLength = res.data.data.length
+					this.searchInfoList = res.data.data
+				})
+			},
 			getShopList(q, type) {
 				let query = {}
 				if (type == "refresh") {

pages/index/NavBarPages/zrxx/zrxx.vue

@@ -4,8 +4,8 @@
 			<view class="bug-fix"></view>
 			<view class="search-box">
 				<view class="search-box-input">
-					<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
+					<u-input 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>
 				</view>
 			</view>
@@ -69,6 +69,22 @@
 			this.getShopList()
 		},
 		methods: {
+			getInput(val){
+				console.log('搜索值',val);
+				if(this.pageNum!==1){
+					this.pageNum=1
+				}
+				const q = this.$u.queryParams({
+					type: 1,
+					pageSize: this.pageSize,
+					pageNum: this.pageNum,
+					kw:val
+				})
+				this.$api.getShopList(q).then(res => {
+					this.shopListLength = res.data.data.length
+					this.shopInfoList = res.data.data
+				})
+			},
 			getShopList(q, type) {
 				let query = {}
 				if (type == "refresh") {

pages/shopAddress/shopAddress.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="root">
-		<InputAndSwiper></InputAndSwiper>
+		<InputAndSwiper  @getQueryInfo="getInput"></InputAndSwiper>
 
 		<view>
 			<view class="dropdown-bug">
@@ -63,6 +63,22 @@
 			}
 		},
 		methods: {
+			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
+				})
+				this.$api.getShopList(q).then(res => {
+					this.searchListLength = res.data.data.length
+					this.searchInfoList = res.data.data
+				})
+			},
 			getShopList(q, type) {
 				let query = {}
 				if (type == "refresh") {

pages/shopTransfer/shopTransfer.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="root">
-		<InputAndSwiper></InputAndSwiper>
+		<InputAndSwiper @getQueryInfo="getInput"></InputAndSwiper>
 
 		<view>
 			<view class="dropdown-bug">
@@ -63,6 +63,22 @@
 			}
 		},
 		methods: {
+			getInput(val){
+				console.log('搜索值',val);
+				if(this.pageNum!==1){
+					this.pageNum=1
+				}
+				const q = this.$u.queryParams({
+					type: 1,
+					pageSize: this.pageSize,
+					pageNum: this.pageNum,
+					kw:val
+				})
+				this.$api.getShopList(q).then(res => {
+					this.shopListLength = res.data.data.length
+					this.shopInfoList = res.data.data
+				})
+			},
 			getShopList(q, type) {
 				let query = {}
 				if (type == "refresh") {