Merge branch 'master' into lh

components/DropDown/DropDown.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="container">
+		<view class="tabs-bg"/>
+		<view class="tabs">
+			<view
+				class="title-view"
+				v-for="(item, index) in title"
+				:key="item"
+				@click="changeActiveIndex(index)"
+				:class="{isActive: activeIndex === index}"
+			>
+				<text>{{item}}</text>
+				<view class="arrow" v-if="activeIndex !== index">
+					<u-image src="/static/dropdown/dp_icon_lxia.png" width="14rpx" height="11rpx"/>
+				</view>
+				<view class="arrow" v-if="activeIndex === index">
+					<u-image src="/static/dropdown/dp_icon_hlxia.png" width="14rpx" height="11rpx"/>
+				</view>
+				
+			</view>
+		</view>
+		<view class="item-border">
+			<DropDownItem v-if="activeIndex !== -1" :list="tablist"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * @property {Array} postlist   传递一个二维数组
+	 */
+	import DropDownItem from "./DropDownItem.vue"
+	export default {
+		name:"DropDown",
+		components: {
+			DropDownItem
+		},
+		props: {
+			postlist: {
+				type:Array,
+				default(){
+					return	[['全部', '餐饮美食', '百货超市', '美容美发'],['区域1', '区域2', '区域3', '区域4'],['100m2','200m2','300m2'],['附近的', '最新发布的', '其他']]
+				}
+			}
+		},
+		data() {
+			return {
+				title: ['行业','区域','面积','筛选'],
+				activeIndex: -1,
+				// postlist: [['全部', '餐饮美食', '百货超市', '美容美发'],['区域1', '区域2', '区域3', '区域4'],['100m2','200m2','300m2'],['附近的', '最新发布的', '其他']]
+			};
+		},
+		computed: {
+			tablist: function() {
+				return this.postlist[this.activeIndex]
+			}
+		},
+		methods: {
+			changeActiveIndex(index){
+				if(this.activeIndex === index){
+					this.activeIndex = -1;
+				}else 
+					this.activeIndex = index
+			}
+		},
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.isActive{
+		color: #CC3333;
+	}
+	.container{
+		margin-top: 10px;
+		position: relative;
+		.tabs-bg {
+			position: absolute;
+			background-color: $uni-bg-color-grey;
+			height: 120rpx;
+			width: 100%;
+			transform: translateY(-20rpx);
+			z-index: 2;
+		}
+		.tabs{
+			background-color: #fff;
+			height: 100rpx;
+			display: flex;
+			justify-content: space-around;
+			position: relative;
+			z-index: 3;
+		}
+		.title-view {
+			display: flex;
+			>text {
+				font-size: 14px;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+		}
+		.arrow {
+			margin-left: 8rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+		}
+	}
+	.item-border{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+	}
+</style>

components/DropDown/DropDownItem.vue

@@ -0,0 +1,69 @@
+<template>
+	<view class="root">
+		<view class="mask"/>
+		<view class="list-container">
+			<view 
+				class="item"
+				v-for="(item,index) in list"
+			>
+				<view></view>
+				<text class="list-text">{{item}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default(){
+					return	[]
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.mask{
+	    position: fixed;
+	    top: 0;
+	    left: 0;
+	    width: 100%;
+	    height: 100%;
+	    background-color: #000;
+		-webkit-backdrop-filter:saturate(150%) blur(8px);
+		background-color:rgba(0,0,0,.3);
+		z-index: 20;
+	}
+	.root {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		
+		font-size: 28rpx;
+		background-color: #fff;
+		position: absolute;
+		z-index: 1;
+		.list-container {
+			position: relative;
+			background-color: #fff;
+			width: 100%;
+			z-index: 21;
+			
+			border-radius: 0px 0px 20px 20px;
+			.item {
+				border-top: 1px solid #EEEEEE;
+				font-weight: 500;
+				padding-left: 61rpx;
+				height: 80rpx;
+				
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+		}
+	}
+</style>

components/InputAndSwiper/InputAndSwiper.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="input-and-swiper-root">
 		<view class="search-box">
 			<view class="search-box-input">
 				<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
@@ -31,62 +31,86 @@
 						"https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"
 					]
 				}
-			},
-			position: {
-				type: String,
-				default () {
-					return '定位'
-				}
 			}
 		},
 		data() {
 			return {
-
+				position: ''
 			};
 		},
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
 		},
 		created() {
-			// this.getLocation()
+			console.log('createsd');
+			this.open()
 		},
 		methods: {
-			getLocation() {
+			getLocation1() {
-				uni.getLocation({
+				var that = this
+				let qqmapsdk = new QQMapWX({
+					key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB'
+				});
+				uni.getFuzzyLocation({
 					type: 'wgs84',
-					// geocode: true, // 返回城市信息
+					success(res) {
-					// enableHighAccuracy: false, // 开启高精度模式
+						console.log('res.latitude', res.latitude);
-					success: function(res) {
+						console.log('res.longitude', res.longitude);
-						let qqmapsdk = new QQMapWX({
-							key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB'
-						});
 						qqmapsdk.reverseGeocoder({
 							location: {
 								latitude: res.latitude,
 								longitude: res.longitude
 							},
 							success: (re) => {
-								console.log(re.result.ad_info.city, '成都市==');
+								console.log("解析地址成功", re);
-								console.log(re.result.ad_info.district, '武侯区==');
+								console.log(re.result.ad_info.city,);
+								console.log(re.result.ad_info.district, );
+								let city=re.result.ad_info.city
+								let district=re.result.ad_info.district
+								that.position = city.slice(0,2) + district.slice(0,2)
 							},
 							fail: (re) => {
 								console.log(re, '失败信息');
 							}
 						})
-					}
+					},
+					fail(err) {
+						console.log("获取经纬度失败", err);
+					},
 				});
 			},
 			//提示用户开启定位服务
 			open() {
-				// uni.authorize({
+				var that = this
-				// 	scope: 'scope.userLocation',
+				uni.authorize({
-				// 	success: function() {
+					scope: 'scope.userFuzzyLocation',
-				// 		console.log('授权成功');
+					success: function() {
-				// 	},
+						console.log('授权成功');
-				// 	fail: function() {
+						that.getLocation1()
-				// 		console.log('授权失败');
+					},
-				// 	}
+					fail: function() {
-				// })
+						console.log('授权失败');
+						uni.showModal({
+							content: '检测到您没打开获取信息功能权限，是否去设置打开？',
+							confirmText: "确认",
+							cancelText: '取消',
+							success: (res) => {
+								if (res.confirm) {
+									uni.openSetting({
+										success: (res) => {
+											console.log(res);
+											that.getLocation1();
+										}
+									})
+								} else {
+									console.log('取消');
+									return false;
+								}
+							}
+						})
+						return false;
+					}
+				})
 				// wx.getSetting({
 				// 	success: (res) => {
 				// 		if (res.authSetting['scope.userLocation'] === false) {
@@ -109,6 +133,10 @@
 </script>
 
 <style lang="scss">
+	.input-and-swiper-root {
+		position: relative;
+		z-index: 2;
+	}
 	.search-box {
 		position: absolute;
 		z-index: 1;

components/SearchShopList/SearchShopList.vue

@@ -4,6 +4,8 @@
 			v-for="item in shopInfoList"
 			:key="searchid"
 			:shopInfo="item"
+			:show-style="showStyle"
+			@delItem="handleDel"
 		></SearchShopListItem>
 	</view>
 </template>
@@ -20,6 +22,18 @@
 			};
 		},
 		props: {
+			showStyle:{
+				type: Number,
+				default() {
+					return 0
+				}
+			},
+			isEdit: {
+				type: Boolean,
+				default() {
+					return false
+				}
+			},
 			shopInfoList: {
 				type: Array,
 				default() {
@@ -33,7 +47,8 @@
 							pos: '锦江区',
 							category: '餐饮美食',
 							uname: 'A先生',
-							sqr: 500
+							sqr: 500,
+							yjtzText: "423万元"
 						},
 						{
 							searchid: 2,
@@ -44,11 +59,21 @@
 							pos: '锦江区',
 							category: '餐饮美食',
 							uname: '王先生',
-							sqr: 200
+							sqr: 200,
+							yjtzText: "423万元"
 						}
 					]
 				}
 			}
+		},
+		methods: {
+			handleDel(shopid){
+				console.log("删除了商铺", shopid);
+				// const delindex = this.shopInfoList.findIndex((item,index)=> item.shopid === shopid)
+				// TODO：不能直接修改
+				// if(delindex !== -1)  this.shopInfoList = this.shopInfoList.slice(delindex,1)
+				// console.log(this.shopInfoList);
+			}
 		}
 	}
 </script>

components/SearchShopListItem/SearchShopListItem.vue

@@ -3,6 +3,28 @@
 		<view class="list-container">
 			<view class="text-area">
 				<text>{{shopInfo.title}}</text>
+				
+				<view class="style2" v-if="showStyle === 1">
+					<view class="rent-and-cost">
+						<text>租金：{{shopInfo.price}}元/月</text>
+						<text v-if="showStyle==1">预计投资：{{shopInfo.yjtzText}}</text>
+					</view>
+					<view class="cart-and-pos">
+						<view>
+							<view>
+								<u-image src="/static/shoplist/sy_icon_lbhy.png" width="12px" height="15px"></u-image>
+							</view>
+							<text>{{shopInfo.category}}</text>
+						</view>
+						<view>
+							<view>
+								<u-image src="/static/shoplist/sy_icon_lbhdw.png" width="12px" height="15px"></u-image>
+							</view>
+							<text>{{shopInfo.pos}}</text>
+						</view>
+					</view>
+				</view>
+				
 				<view class="pos-and-sqr">
 					<view>
 						<view>
@@ -23,7 +45,8 @@
 						<text>{{shopInfo.phoneNum}}</text>
 					</view>
 				</view>
-				<view class="cart-and-date">
+				
+				<view class="cart-and-date" v-if="showStyle === 0">
 					<view>
 						<view>
 							<u-image src="/static/shoplist/sy_icon_lbhy.png" width="12px" height="15px"></u-image>
@@ -43,6 +66,18 @@
 						<text>发布日期：{{shopInfo.date}}</text>
 					</view>
 				</view>
+				
+				<view v-if="isEdit" class="del-and-edit bottom-common">
+					<view class="edit" @click="handleEdit(shopInfo.searchid)">
+						<u-image src="/static/shoplist/dp_icon_pj.png" width="12px" height="15px"></u-image>
+						<text>编辑</text>
+					</view>
+					<view class="del" @click="handleDel(shopInfo.searchid)">
+						<u-image src="/static/shoplist/dp_icon_sc.png" width="12px" height="15px"></u-image>
+						<text>删除</text>
+					</view>
+				</view>
+				
 			</view>
 		</view>
 	</view>
@@ -66,7 +101,18 @@
 					}
 				}
 			},
-			
+			showStyle: {
+				type:Number,
+				default() {
+					return 0
+				}
+			},
+			isEdit: {
+				type:Boolean,
+				default(){
+					return false
+				}
+			}
 			
 		},
 		data() {
@@ -77,6 +123,15 @@
 		},
 		computed: {
 			
+		},
+		methods: {
+			handleEdit(searchid) {
+				// TODO 完成页面跳转
+				console.log("点击了编辑ID为",searchid);
+			},
+			handleDel(searchid) {
+				this.$emit('delItem', searchid)
+			}
 		}
 	}
 </script>
@@ -91,7 +146,26 @@
 		font-size: 12px;
 		.list-container {
 			display: flex;
-			height: 90px;
+			height: auto;
+		}
+		.bottom-common {
+			border-top: 1px solid #f7f7f7;
+			padding-top: 5px;
+			display: flex;
+			> view {
+				display: flex;
+			}
+		}
+		.del-and-edit{
+			margin-top: 6px;
+			justify-content: flex-end;
+			>view{
+				margin-left: 38rpx;
+			}
+			text {
+				margin-left: 4px;
+				color: #666666;
+			}
 		}
 		.text-area {
 			display: flex;
@@ -103,13 +177,43 @@
 			>view {
 				display: flex;
 				>view {
-					flex:1;
 					display: flex;
 					>view {
 						margin-right: 4px;
 					}
 				}
 			}
+			
+			.style2 {
+				display: flex;
+				flex-direction: column;
+				color: #CC3333;
+				font-weight: 500;
+				.rent-and-cost {
+					text{
+						margin-right: 26rpx;
+					}
+					margin-top: 5px;
+					padding-top: 5px;
+					padding-bottom: 6px;
+				}
+				.cart-and-pos{
+					> view{
+						margin-right: 27px;
+						display: flex;
+					}
+					display: flex;
+					border-top: 1px solid #f7f7f7;
+					padding-top: 5px;
+					margin-bottom: 5px;
+					justify-content: start;
+					font-weight: 500;
+					text {
+						color: #CC3333;
+						line-height: 12px;
+					}
+				}
+			}
 			.pos-and-sqr {
 				justify-content: space-between;
 				margin-top: 5px;
@@ -119,6 +223,7 @@
 					line-height: 12px;
 				}
 				>view {
+					flex:1;
 					display: flex;
 					>view {
 						margin-right: 4px;
@@ -126,6 +231,7 @@
 				}
 			}
 			.cart-and-date {
+				display: flex;
 				border-top: 1px solid #f7f7f7;
 				padding-top: 5px;
 				justify-content: space-between;
@@ -133,6 +239,7 @@
 				text {
 					color: #CC3333;
 					line-height: 12px;
+					margin-right: 48rpx;
 				}
 			}
 		}

components/ShowShopList/ShowShopList.vue

@@ -6,6 +6,7 @@
 			:shopInfo="item"
 			:is-adshow="isADshow"
 			:show-style="showStyle"
+			@delItem="handleDel"
 		></ShowShopListItem>
 	</view>
 </template>
@@ -15,6 +16,7 @@
 	 * @property {Array}    shopInfoList     对象数组，（带图片）需要展示的商铺列表
 	 * @property {Number}   showStyle        展示商铺的样式类型(0为首页默认)
 	 * @property {Boolean}  isADshow         是否显示推广广告
+	 * @property {Boolean}  isEdit           是否显示编辑和删除
 	 */
 	export default {
 		name:"ShowShopList",
@@ -36,6 +38,12 @@
 					return true
 				}
 			},
+			isEdit: {
+				type: Boolean,
+				default() {
+					return false
+				}
+			},
 			shopInfoList: {
 				type: Array,
 				default() {
@@ -76,6 +84,15 @@
 		},
 		computed: {
 			
+		},
+		methods: {
+			handleDel(shopid){
+				console.log("删除了商铺", shopid);
+				// const delindex = this.shopInfoList.findIndex((item,index)=> item.shopid === shopid)
+				// TODO：不能直接修改
+				// if(delindex !== -1)  this.shopInfoList = this.shopInfoList.slice(delindex,1)
+				// console.log(this.shopInfoList);
+			}
 		}
 	}
 </script>

components/ShowShopListItem/ShowShopListItem.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="list-border">
-		<view class="list-container">
+		<view class="list-container" @click="enterDetail()">
-			<view class="shop-list-img">
+			<view class="shop-list-img" >
 				<u-image width="80px" height="80px" :src="shopInfo.imageUrl" radius="8px"></u-image>
 			</view>
 			<view class="text-area">
@@ -35,7 +35,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="cart-and-date" v-if="showStyle==1">
+		
+		<view class="cart-and-date bottom-common" v-if="showStyle==1">
 			<view>
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
@@ -61,20 +62,35 @@
 				<text>{{shopInfo.phoneNum}}</text>
 			</view>
 		</view>
-		<view v-if="isADShow" class="list-ads" style="font-size: 11px;">
+		
+		<view v-if="isADShow" class="list-ads bottom-common" style="font-size: 11px;">
 			<view>
-				<text>已将该店推给 </text> 
+				<text>已将该店推给</text> 
 				<text style="color:#ce3b3b;margin: 0 4px;"> {{shopInfo.promotionNum}} </text> 
 				<text> 位潜在客户</text>
 			</view>
 			<text style="color:#ce3b3b">我也要推广>></text>
 		</view>
+		
+		<view v-if="isEdit" class="del-and-edit bottom-common">
+			<view class="edit" @click="handleEdit(shopInfo.shopid)">
+				<u-image src="/static/shoplist/dp_icon_pj.png" width="12px" height="15px"></u-image>
+				<text>编辑</text>
+			</view>
+			<view class="del" @click="handleDel(shopInfo.shopid)">
+				<u-image src="/static/shoplist/dp_icon_sc.png" width="12px" height="15px"></u-image>
+				<text>删除</text>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	/**
-	 * @property shopInfo {Object}  传入商铺对象数据
+	 * @property {Object}   shopInfo          传入商铺对象数据
+	 * @property {Number}   showStyle        展示商铺的样式类型(0为首页默认)
+	 * @property {Boolean}  isADshow         是否显示推广广告
+	 * @property {Boolean}  isEdit           是否显示编辑和删除
 	 */
 	export default {
 		props: {
@@ -89,7 +105,7 @@
 			showStyle:{
 				type: Number,
 				default() {
-					return 1
+					return 0
 				}
 			},
 			isADShow: {
@@ -97,17 +113,37 @@
 				default() {
 					return true
 				}
+			},
+			isEdit: {
+				type: Boolean,
+				default() {
+					return false
+				}
 			}
 			
 		},
 		data() {
 			return {
-				
+				delshopid: 0,
 			}
 			
 		},
 		computed: {
 			
+		},
+		methods: {
+			handleEdit(shopid) {
+				// TODO 完成页面跳转
+				console.log("点击了编辑ID为",shopid);
+			},
+			handleDel(shopid) {
+				this.$emit('delItem', shopid)
+			},
+			enterDetail(){
+				uni.navigateTo({
+					url: '/pages/detail/detail'
+				})
+			}
 		}
 	}
 </script>
@@ -161,10 +197,16 @@
 				}
 			}
 		}
-		.cart-and-date {
+		
-			display: flex;
+		.bottom-common {
 			border-top: 1px solid #f7f7f7;
 			padding-top: 5px;
+			display: flex;
+			> view {
+				display: flex;
+			}
+		}
+		.cart-and-date {
 			margin-bottom: 6px;
 			justify-content: space-between;
 			font-weight: 500;
@@ -174,17 +216,27 @@
 			}
 			>view {
 				flex:1;
-				display: flex;
 				>view {
 					margin-right: 4px;
 				}
 			}
 		}
+		.del-and-edit{
+			margin-top: 6px;
+			justify-content: flex-end;
+			>view{
+				margin-left: 38rpx;
+			}
+			text {
+				margin-left: 4px;
+				color: #666666;
+			}
+		}
 		.list-ads {
-			border-top: 1px solid #f7f7f7;
-			padding-top: 5px;
-			display: flex;
 			justify-content: space-between;
+			text {
+				color: #359867;
+			}
 		}
 	}
 	

components/publishSlide/publishSlide.vue

@@ -60,7 +60,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.mask{
 	           position: fixed;
 	           top: 0;

manifest.json

@@ -59,9 +59,12 @@
 			// 获取当前的地理位置、速度 配置
 			"scope.userLocation": {
 				"desc": "你的位置信息将用于小程序位置接口的效果展示"
+			},
+			"scope.userFuzzyLocation": {
+				"desc": "你的位置信息将用于小程序位置的效果展示"
 			}
-		}
+		},
-
+		"requiredPrivateInfos": ["choosePoi", "chooseAddress", "getFuzzyLocation"]
 	},
 	"mp-alipay": {
 		"usingComponents": true

pages.json

@@ -97,17 +97,56 @@
 			}
 
 		}
-	    
+
-        ,{
+		, {
-            "path" : "pages/Partnerships/Partnerships",
+			"path": "pages/Partnerships/Partnerships",
-            "style" :                                                                                    
+			"style": {
-            {
+				"navigationBarTitleText": "成功合伙人",
-                "navigationBarTitleText": "成功合伙人",
+				"enablePullDownRefresh": false
-                "enablePullDownRefresh": false
+			}
-            }
+
-            
+		},
-        }
+		{
-    ],
+			"path" : "pages/index/NavBarPages/zrxx/zrxx",
+			"style" : 
+			{
+				"navigationBarTitleText" : "转让信息",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/NavBarPages/zdxx/zdxx",
+			"style" : 
+			{
+				"navigationBarTitleText" : "找店信息",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/NavBarPages/czxx/czxx",
+			"style" : 
+			{
+				"navigationBarTitleText" : "出租信息",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/NavBarPages/xmzs/xmzs",
+			"style" : 
+			{
+				"navigationBarTitleText" : "项目招商",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/NavBarPages/cjal/cjal",
+			"style" : 
+			{
+				"navigationBarTitleText" : "成交案例",
+				"enablePullDownRefresh" : false
+			}
+		}
+	],
 	"tabBar": {
 		"color": "#CCCCCC",
 		"borderStyle": "white",
@@ -146,6 +185,11 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},
+	"permission": {
+		"scope.userFuzzyLocation": {
+			"desc": "你的位置信息将用于小程序位置的效果展示"
+		}
+	},
 	"uniIdRouter": {},
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)

pages/index/HomeMainContent/HomeNavCard.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="nav-card">
-		<u-grid :col="4" customStyle="height: 334rpx;align-content: normal" >
+		<u-grid :col="4" customStyle="height: 334rpx;align-content: normal">
 			<u-grid-item v-for="(item, index) in navItems" :key="item.icon" @click="handleItemClick(index)">
 				<u-icon :name="item.icon" :size="46"></u-icon>
 				<view class="grid-text">{{ item.text }}</view>
@@ -15,31 +15,38 @@
 			return {
 				navItems: [{
 						icon: "/static/navbar/sy_icon_zrxx.png",
-						text: "转让信息"
+						text: "转让信息",
+						url: "/pages/index/NavBarPages/zrxx/zrxx"
 					},
 					{
 						icon: "/static/navbar/sy_icon_zdxx.png",
-						text: "找店信息"
+						text: "找店信息",
+						url: "/pages/index/NavBarPages/zdxx/zdxx"
 					},
 					{
 						icon: "/static/navbar/sy_icon_czxx.png",
-						text: "出租信息"
+						text: "出租信息",
+						url: "/pages/index/NavBarPages/czxx/czxx"
 					},
 					{
 						icon: "/static/navbar/sy_icon_xmzs.png",
-						text: "项目招商"
+						text: "项目招商",
+						url: "/pages/index/NavBarPages/xmzs/xmzs"
 					},
 					{
 						icon: "/static/navbar/sy_icon_cjal.png",
-						text: "成交案例"
+						text: "成交案例",
+						url: "/pages/index/NavBarPages/cjal/cjal"
 					},
 					{
 						icon: "/static/navbar/sy_icon_spdt.png",
-						text: "速配地图"
+						text: "速配地图",
+						url: '/pages/index/map/map'
 					},
 					{
 						icon: "/static/navbar/sy_icon_zmhb.png",
-						text: "招募合伙"
+						text: "招募合伙",
+						url:'/pages/Partnerships/Partnerships'
 					},
 					{
 						icon: "/static/navbar/sy_icon_lxwm.png",
@@ -51,9 +58,12 @@
 		},
 		methods: {
 			handleItemClick(index) {
-				// 在这里处理点击事件，并使用下标值
+				// 跳转页面
-				console.log(`项目 ${index} 被点击了`);
+				if (index >= 0 && index <= 6) {
-				// 或者执行其他需要的操作
+					uni.navigateTo({
+						url: this.navItems[index].url
+					})
+				}
 			}
 		}
 	};

pages/index/NavBarPages/cjal/cjal.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/NavBarPages/czxx/czxx.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/NavBarPages/xmzs/xmzs.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/NavBarPages/zdxx/zdxx.vue

@@ -0,0 +1,64 @@
+<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>
+		</view>
+		<view>
+			<DropDown></DropDown>
+		</view>
+		<view>
+			<SearchShopList :showStyle="1"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F8F8F8;
+	}
+	.search-box {
+		position: relative;
+		z-index: 1;
+		left: 50%;
+		width: 84.6%;
+		transform: translateX(-50%);
+	
+		.search-box-input {
+			border-radius: 12rpx;
+			margin-top: 20rpx;
+			background-color: #fff;
+			opacity: 0.85;
+	
+			.u-border {
+				border: none;
+	
+				.u-input__content {
+					height: 62rpx;
+					border-radius: 12rpx;
+					background-color: #fff;
+	
+					.u-input__content__field-wrapper__field {
+						font-size: 26rpx !important;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/index/NavBarPages/zrxx/zrxx.vue

@@ -0,0 +1,64 @@
+<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>
+		</view>
+		<view>
+			<DropDown></DropDown>
+		</view>
+		<view>
+			<ShowShopList :showStyle="1"></ShowShopList>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F8F8F8;
+	}
+	.search-box {
+		position: relative;
+		z-index: 1;
+		left: 50%;
+		width: 84.6%;
+		transform: translateX(-50%);
+	
+		.search-box-input {
+			border-radius: 12rpx;
+			margin-top: 20rpx;
+			background-color: #fff;
+			opacity: 0.85;
+	
+			.u-border {
+				border: none;
+	
+				.u-input__content {
+					height: 62rpx;
+					border-radius: 12rpx;
+					background-color: #fff;
+	
+					.u-input__content__field-wrapper__field {
+						font-size: 26rpx !important;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -20,9 +20,9 @@
 </template>
 
 <script>
-	import HomeNoticeBar from "./HomeNoticeBar.vue"
+	import HomeNoticeBar from "./HomeMainContent/HomeNoticeBar.vue"
-	import HomeNavCard from "./HomeNavCard.vue"
+	import HomeNavCard from "./HomeMainContent/HomeNavCard.vue"
-	import Statistics from "./Statistics.vue"
+	import Statistics from "./HomeMainContent/Statistics.vue"
 	export default {
 		components: {
 			HomeNavCard,

pages/index/map/map.vue

@@ -12,7 +12,7 @@
 				:longitude="lng"></map>
 		</view>
 		<view class="down-shop">
-			<ShowShopListItem :shopInfo="shopList"></ShowShopListItem>
+			<ShowShopListItem :shopInfo="shopList" :is-adshow="true" :show-style="0"></ShowShopListItem>
 		</view>
 	</view>
 </template>
@@ -45,11 +45,19 @@
 					}
 				],
 				shopList: {
+					shopid: 1,
 					imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 					title: '琴行铺面转让',
 					promotionNum: 23,
-					price: 5000,
+					price: 6000,
-					date: '2023-11-02'
+					date: '2023-11-02',
+					pos: '锦江区',
+					exactPos: '锦江区-汇源南路366号',
+					sqr: 100,
+					zrfText: "转让费：20万",
+					category: '餐饮美食',
+					uname: "张先生",
+					phoneNum: 13348946108,
 				}
 			}
 		},
@@ -119,8 +127,8 @@
 		position: absolute;
 		z-index: 1;
 		bottom: 60rpx;
-		left: 10%;
+		left: 50%;
-		transform: translateX(-10%);
+		transform: translateX(-50%);
 
 		.list-border {
 			margin: 0;

pages/shopAddress/shopAddress.vue

@@ -1,12 +1,29 @@
 <template>
-	<view>
+	<view class="root">
-		找店地址
+		<InputAndSwiper></InputAndSwiper>
+		
+		<view>
+			<view class="dropdown-bug">
+				
+			</view>
+			<view class="marginLR10">
+				<DropDown></DropDown>
+			</view>
+			<view class="marginLR10">
+				<SearchShopList :showStyle="1"/>
+			</view>
+		</view>
+		
 		<TabBar :current-page="3"></TabBar>
 	</view>
 </template>
 
 <script>
+	import DropDownItem from "@/components/DropDown/DropDownItem.vue"
 	export default {
+		components: {
+			DropDownItem
+		},
 		data() {
 			return {
 				
@@ -18,6 +35,23 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
-
+	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;
+	}
+	
 </style>

pages/shopTransfer/shopTransfer.vue

@@ -1,12 +1,29 @@
 <template>
-	<view>
+	<view class="root">
-		店铺转让
+		<InputAndSwiper></InputAndSwiper>
+		
+		<view>
+			<view class="dropdown-bug">
+				
+			</view>
+			<view class="marginLR10">
+				<DropDown></DropDown>
+			</view>
+			<view class="marginLR10">
+				<ShowShopList :showStyle="1"></ShowShopList>
+			</view>
+		</view>
+		
 		<TabBar :current-page="1"></TabBar>
 	</view>
 </template>
 
 <script>
+	import DropDownItem from "@/components/DropDown/DropDownItem.vue"
 	export default {
+		components: {
+			DropDownItem
+		},
 		data() {
 			return {
 				
@@ -18,6 +35,23 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
-
+	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;
+	}
+	
 </style>