地图

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "智慧停车",
-    "appid" : "__UNI__29ECCC8",
+    "appid" : "__UNI__6259CD7",
     "description" : "",
     "versionName" : "1.5.0",
     "versionCode" : "100",
@@ -49,7 +49,8 @@
                     }
                 },
                 "geolocation" : {},
-                "push" : {}
+                "push" : {},
+                "ad" : {}
             },
             "splashscreen" : {
                 "androidStyle" : "common"

pages.json

@@ -58,6 +58,7 @@
 		{
 			"path": "pages/parkingLists/parkingLists",
 			"style": {
+				"navigationStyle":"custom",
 				"navigationBarTitleText": "停车场"
 			}
 		},
@@ -75,7 +76,29 @@
 				"navigationBarTitleText": "停车记录"
 			}
 		}
-	],
+        ,{
+            "path" : "pages/parkingInformation/parkingInformation",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "停车场信息",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#008CFF",
+                "navigationBarTextStyle": "white"
+            }
+            
+        }
+        ,{
+            "path" : "pages/chargeStandard/chargeStandard",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收费标准",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uView",

pages/chargeStandard/chargeStandard.scss

@@ -0,0 +1,62 @@
+.charge {
+	padding: 40rpx;
+	.charge-type {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: solid 1rpx #979797;
+		line-height: 80rpx;
+		text {
+			&:first-child {
+				color: #2A2A2A;
+				font-size: 28rpx;
+				font-weight: 500;
+			}
+			&:last-child {
+				color: #6E6E6E;
+				font-size: 24rpx;
+				font-weight: 400;
+			}
+		}
+	}
+	.charge-rules {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 25rpx 0;
+		border-bottom: solid 2rpx #979797;
+		view:first-child {
+			color: #2A2A2A;
+			font-weight: 400;
+		}
+		view.charge-rules-right {
+			width: 70%;
+			view {
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #6E6E6E;
+				line-height: 40rpx;
+			}
+		}
+	}
+	.charge-instructions {
+		margin-top: 38rpx;
+		.charge-instructions-item,
+		.charge-instructions-title {
+			text-indent: -1.5em;
+			margin-left: 1.5em;
+			line-height: 40rpx;
+			font-size: 24rpx;
+			color: #757575;
+		}
+	}
+	.charge-telphone {
+		margin-top: 38rpx;
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #757575;
+		line-height: 40rpx;
+	}
+}

pages/chargeStandard/chargeStandard.vue

@@ -0,0 +1,81 @@
+<template>
+	<view class="charge">
+		<view class="charge-type">
+			<text>停车场类型</text>
+			<text>路边临时停车位</text>
+		</view>
+		<view class="charge-rules">
+			<view>大车</view>
+			<view class="charge-rules-right">
+				<view>
+					<text>7:00-22:00</text>
+					<text>5元/小时</text>
+				</view>
+				<view>
+					<text>22:00-次日7:00</text>
+					<text>3元/小时</text>
+				</view>
+			</view>
+		</view>
+		<view class="charge-rules">
+			<view>小车</view>
+			<view class="charge-rules-right">
+				<view>
+					<text>7:00-22:00</text>
+					<text>5元/小时</text>
+				</view>
+				<view>
+					<text>22:00-次日7:00</text>
+					<text>3元/小时</text>
+				</view>
+			</view>
+		</view>
+		<view class="charge-rules">
+			<view>摩托车</view>
+			<view class="charge-rules-right">
+				<view>
+					<text>7:00-22:00</text>
+					<text>5元/小时</text>
+				</view>
+				<view>
+					<text>22:00-次日7:00</text>
+					<text>3元/小时</text>
+				</view>
+			</view>
+		</view>
+		<view class="charge-instructions">
+			<view class="charge-instructions-title">相关说明</view>
+			<view class="charge-instructions-item">1、全天任何时段，封停必须扫码；</view>
+			<view class="charge-instructions-item">2、停车5分钟未扫码启动缴费程序，将按违法停车处罚；</view>
+			<view class="charge-instructions-item">3、停车时间在30分钟内不收费；超过30分钟按1小时收费；</view>
+			<view class="charge-instructions-item">4、停放车辆须按车位停放，禁止乱停乱放，否则停车场有权采取相应措施；</view>
+			<view class="charge-instructions-item">5、路边临停收费仅是收起个人占用公共资源的费用，非保管合同法律关系，如车辆发生刮蹭，责任由相关部门认定，与运营方无关；</view>
+			<view class="charge-instructions-item">6、贵重东西请妥善保管或随身带走，如有遗失概不负责；</view>
+		</view>
+		<view class="charge-telphone">
+			<view>客服电话</view>
+			<view>0851-8888888</view>
+		</view>
+		<view class="charge-telphone">
+			<view>监督电话</view>
+			<view>0851-8888888</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+@import './chargeStandard.scss';
+</style>

pages/parkingInformation/parkingInformation.scss

@@ -0,0 +1,113 @@
+.parking-information {
+	background-color: #F6F6FF;
+	width: 100%;
+	.parking-information-slider {
+		image {
+			width: 100%;
+			height: 410rpx;
+		}
+	}
+	.parking-information-content {
+		padding: 35rpx 40rpx;
+		.parking-information-content-title {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			.pict-left {
+				.title {
+					font-size: 34rpx;
+					color: #3A3A3A;
+					font-weight: 600;
+				}
+				.tags {
+					display: flex;
+					word-wrap: break-word;
+					margin-top: 10rpx;
+					.tag {
+						padding: 3rpx 18rpx;
+						border: solid 2rpx #FA6400;
+						border-radius: 4px;
+						color: #FA6400;
+						margin-right: 10rpx;
+						font-size: 18rpx;
+					}
+				}
+			}
+			.pict-right {
+				font-size: 18rpx;
+				color: #3A3A3A;
+				font-weight: 400;
+				image {
+					width: 44rpx;
+					height: 44rpx;
+				}
+			}
+		}
+		.parking-information-content-subtitle {
+			font-size: 24rpx;
+			color: #3A3A3A;
+			margin: 13rpx 0;
+		}
+		.parking-information-content-time {
+			color: #727275;
+			font-size: 24rpx;
+			margin-bottom: 15rpx;
+			text {
+				font-size: 30rpx;
+				color: #1099FA;
+				margin-left: 10rpx;
+			}
+		}
+		.parking-information-content-cars {
+			display: flex;
+			justify-content: space-between;
+			.picc-tag {
+				width: 324rpx;
+				height: 73rpx;
+				line-height: 73rpx;
+				background-color: #fff;
+				border-radius: 5px;
+				text-align: center;
+				font-size: 24rpx;
+				color: #838383;
+				font-weight: 400;
+				text:last-child {
+					font-size: 36rpx;
+					color: #525252;
+					font-weight: 500;
+				}
+				
+			}
+		}
+		.parking-information-content-price {
+			text-align: center;
+			margin: 25rpx 0 18rpx 0;
+			font-size: 24rpx;
+			color: #9D9D9D;
+			font-weight: 400;
+			text {
+				font-size: 60rpx;
+				color: #FA6400;
+				font-weight: 500;
+			}
+		}
+		.parking-information-conetnt-button {
+			background-color: #008CFF;
+			color: #fff;
+			height: 100rpx;
+		}
+		.parking-information-content-rule {
+			padding: 33rpx 0 37rpx 0;
+			font-size: 24rpx;
+			color: #3A3A3A;
+			line-height: 40rpx;
+			border-bottom: solid 2rpx #DDDDDD;
+		}
+		.parking-information-content-telphone {
+			padding: 23rpx 0 33rpx 0;
+			font-size: 24rpx;
+			color: #3A3A3A;
+			line-height: 45rpx;
+		}
+	}
+}

pages/parkingInformation/parkingInformation.vue

@@ -0,0 +1,74 @@
+<template>
+	<view class="parking-information">
+		<view class="parking-information-slider">
+			<image src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngfcc26df820e339ac79b1f066b7ed6ac52b440624fa7e7f4a3bf97030b2aac575" mode=""></image>
+		</view>
+		<view class="parking-information-content">
+			<view class="parking-information-content-title">
+				<view class="pict-left">
+					<view class="title">甜蜜小镇D18组团停车场</view>
+					<view class="tags">
+						<view class="tag">无感支付</view>
+						<view class="tag">电子支付</view>
+					</view>
+				</view>
+				<view class="pict-right">
+					<image src="../../static/img/distance-icon.png" mode=""></image>
+					<view class="">238m</view>
+				</view>
+			</view>
+			<view class="parking-information-content-subtitle">
+				贵阳市云岩区中天未来方舟甜蜜小镇D18组团
+			</view>
+			<view class="parking-information-content-time">
+				服务时间<text>7:00-21:00</text>
+			</view>
+			<view class="parking-information-content-cars">
+				<view class="picc-tag">
+					<text>共有车位:</text>
+					<text>120</text>
+				</view>
+				<view class="picc-tag">
+					<text>空闲车位:</text>
+					<text>30</text>
+				</view>
+			</view>
+			<view class="parking-information-content-price">
+				<view class="">
+					<text>10</text>元/小时
+				</view>
+				<view class="">
+					包月费用：300元
+				</view>
+			</view>
+			<u-button class="parking-information-content-button">办理包月</u-button>
+			<view class="parking-information-content-rule">
+				<view>收费规则</view>
+				<view>1、停车不足30分钟，免费；</view>
+				<view>2、停车 超过20分钟，按2元/小时收费；</view>
+				<view>3、月卡会员在有效期内停车免费</view>
+			</view>
+			<view class="parking-information-content-telphone">
+				<view>电话</view>
+				<view>0851-88866688</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+@import './parkingInformation';
+</style>

pages/parkingLists/parkingLists.scss

@@ -0,0 +1,317 @@
+.parking {
+	background-color: #008CFF;
+	position: relative;
+}
+.parking-header {
+	padding: 36rpx 40rpx;
+	display: flex;
+	justify-content: space-between;
+}
+.parking-header .icon {
+	margin-left: 42rpx;
+}
+.parking-details {
+	position: absolute;
+	width: calc(100% - 60rpx);
+	margin: 0 auto;
+	bottom: 68rpx;
+	z-index: 1000;
+	left: 30rpx;
+	background-color: #fff;
+	border-radius: 26.5rpx;
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
+}
+.parking-details-header {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	padding: 40rpx;
+}
+.parking-details-left-address {
+	font-size: 28rpx;
+	font-weight: 700;
+}
+.parking-details-left-number {
+	display: flex;
+	flex-direction: row;
+	color: rgba(47, 47, 47, 0.5);
+	justify-content: space-between;
+	margin-top: 10rpx;
+}
+.parking-details-left-number text {
+	font-size: 40rpx;
+	color: rgba(0, 140, 255, 1);
+}
+.parking-details-button {
+	background-color: #008CFF;
+	height: 103rpx;
+	line-height: 103rpx;
+	border-bottom-left-radius: 26.5rpx;
+	border-bottom-right-radius: 26.5rpx;
+	text-align: center;
+	color: #fff;
+	font-size: 28rpx;
+	font-family: PingFangSC-Medium;
+}
+.parking-details-right-time,
+.parking-details-right-distance {
+	height: 44rpx;
+	line-height: 44rpx;
+	color: #008CFF;
+	display: flex;
+	flex-direction: row;
+	margin-bottom: 20rpx;
+	margin-top: 30rpx;
+}
+.parking-details-right-time image,
+.parking-details-right-distance image {
+	width: 44rpx;
+	height: 44rpx;
+	margin-right: 10rpx;
+}
+.parking-details-right-time text,
+.parking-details-right-distance text {
+	display: block;
+	font-weight: 500;
+}
+.parking-current-address {
+	position: absolute;
+	bottom: 84rpx;
+	z-index: 1000;
+	width: 100%;
+	height: 345rpx;
+}
+.parking-current-address .swiper {
+	height: 400rpx;
+}
+.parking-current-address .swiper-item {
+	background-color: #fff;
+	transform: scaleY(0.9);
+	margin: 0 10rpx;
+	border-radius: 25rpx;
+	padding: 20rpx 30rpx;
+}
+.parking-current-address .swiper-item>view:first-child {
+	font-size: 32rpx;
+	color: #484848;
+	line-height: 50rpx;
+}
+.parking-current-address .swiper-item>view:nth-child(2) {
+	font-size: 24rpx;
+	color: #969696;
+	line-height: 50rpx;
+}
+.parking-current-address .swiper-item>view:nth-child(3) {
+	// background-color: #f3f3f3;
+	background-image: url('./../../static/img/remaining-position-bg.png');
+	background-position: center center;
+	background-size: 100% 100%;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-around;
+	line-height: 120rpx;
+	height: 120rpx;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+}
+.parking-current-address .swiper-item>view:nth-child(4) {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-around;
+	margin-top: 20rpx;
+}
+.parking-current-address .swiper-item>view:nth-child(5) {
+	text-align: center;
+	margin-top: 30rpx;
+}
+.parking-address-list {
+	position: absolute;
+	z-index: 99;
+	width: calc(100% - 28rpx);
+	left: 14rpx;
+	bottom: 0;
+	max-height: 65vh;
+	overflow-y: scroll;
+}
+.parking-address-list-item {
+	background-color: #fff;
+	border-radius: 25rpx;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	padding: 26rpx;
+	margin-top: 20rpx;
+}
+.pali-left {
+	width: 74%;
+}
+.pali-left view:first-child {
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #484848;
+}
+.pali-left view:last-child {
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #969696;
+	margin-top: 10rpx;
+	overflow: hidden;
+	text-overflow:ellipsis;
+	white-space: nowrap;
+}
+.pali-right image {
+	width: 58rpx;
+	height: 58rpx;
+}
+.pali-right view {
+	color: #969696;
+	font-size: 20rpx;
+}
+.yellow-font {
+	color: #FA6400;
+	margin-left: 10rpx;
+}
+.swiper-item-font {
+	color: #6D6D6D;
+	font-size: 28rpx;
+}
+.swiper-item-button button {
+	width: 45%;
+	height: 90rpx;
+}
+.swiper-item-button button:first-child {
+	border: solid 1px #008CFF;
+	color: #008CFF;
+}
+.swiper-item-button button:last-child {
+	background-color: #008CFF;
+	color: #fff;
+}
+.loading {
+	width: 100%;
+	height: calc(100vh - 100rpx);
+	line-height: calc(100vh - 100rpx);
+	position: absolute;
+	z-index: 99999;
+	text-align: center;
+	line-height: ;
+	background-color: rgba(0, 0, 0, 0.1);
+}
+.parking-address-details {
+	position: absolute;
+	bottom: 50rpx;
+	z-index: 1000000000;
+	background: transparent;
+	width: 100%;
+}
+.parking-address-details-title {
+	width: calc(100% - 30rpx);
+	margin: 0 auto;
+	background: url(../../static/img/parking-info-bg.png) center center;
+	background-size: 100% 100%;
+}
+.padt-header {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	padding: 25rpx;
+}
+.padt-header>view>view:nth-child(1) {
+	color: #484848;
+	font-size: 32rpx;
+}
+.padt-header>view.padt-header-title>view:nth-child(2) {
+	color: #969696;
+	font-size: 24rpx;
+	margin-top: 16rpx;
+}
+.padt-header-icon {
+	text-align: center;
+}
+.padt-header-icon view {
+	font-size: 18rpx;
+	color: #3A3A3A;
+}
+.padt-header image {
+	width: 45rpx;
+	height: 45rpx;
+}
+.padt-timeline {
+	padding-left: 25rpx;
+	padding-bottom: 25rpx;
+	font-size: 25rpx;
+	color: #727275;
+}
+.padt-timeline text {
+	color: #FA6B0B;
+	margin-left: 5rpx;
+	font-size: 29rpx;
+}
+.parking-address-details-numer {
+	background-color: #fff;
+	border-radius: 25rpx;
+	width: calc(100% - 30rpx);
+	margin: 10rpx auto 0;
+	padding: 35rpx 25rpx;
+	display: flex;
+	flex-direction: row;
+}
+.parking-address-details-numer>view {
+	width: 48%;
+	height: 110rpx;
+	padding: 15rpx;
+	text-align: center;
+	background: linear-gradient(359deg, #FFFFFF 0%, #F6F6FF 100%);
+	border-radius: 15px;
+}
+.parking-address-details-numer>view>view:first-child {
+	color: #008CFF;
+	font-size: 56rpx;
+	font-weight: 400;
+}
+.parking-address-details-numer>view>view:last-child {
+	color: #838383;
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.parking-address-details-numer>view:last-child {
+	margin-left: 4%;
+}
+.parking-address-details-price {
+	background-color: #fff;
+	border-radius: 25rpx;
+	width: calc(100% - 30rpx);
+	margin: 10rpx auto 0;
+}
+.parking-address-details-price>view:first-child {
+	font-size: 24rpx;
+	color: #787878;
+	font-weight: 400;
+	text-align: center;
+	padding-top: 24rpx;
+}
+.parking-address-details-price>view>text:first-child {
+	font-size: 66rpx;
+	color: #008CFF;
+}
+.parking-address-details-price>view:last-child {
+	width: 100%;
+	height: 81rpx;
+	line-height: 81rpx;
+	background: linear-gradient(180deg, #EFEFFF 0%, #FFFFFF 100%);
+	border-bottom-left-radius: 25rpx;
+	border-bottom-right-radius: 25rpx;
+	text-align: center;
+	margin-top: 36rpx;
+}
+.parking-address-details-button {
+	width: calc(100% - 80rpx);
+	height: 96rpx;
+	line-height: 96rpx;
+	margin: 103rpx auto 57rpx;
+	background-color: #008CFF;
+	border-radius: 10rpx;
+	text-align: center;
+	font-size: 28rpx;
+	color: #fff;
+}

pages/parkingLists/parkingLists.vue

@@ -1,15 +1,106 @@
 <template>
-	<view>
-		<map 
-		id="pagemap" 
-		style="width: 100%; height: 100vh;" 
-		:show-location="true" 
-		:latitude="latitude" 
-		:longitude="longitude" 
-		@markertap="markertap"
-		:markers="covers"></map>
-		<!-- <u-empty src="/static/img/empty.png" icon-size="335" text="正在建设中" color="#878787" mode="search"></u-empty> -->
+	<view class="parking">
+		<view class="loading" v-show="loading">
+			<u-loading size="36" mode="flower"></u-loading>
+		</view>
+		<view class="parking-header">
+			<u-search placeholder="搜索停车场" v-model="searchContent" :show-action="false" @change="searchInputChange"></u-search>
+			<u-icon v-if="!searchContent" class="icon" name="list" size="44" color="#ffffff"
+			placeholder-color="#B5B5B5" search-icon-color="#B3B3B3"></u-icon>
+			<u-icon v-if="searchContent" class="icon" name="close" size="36" color="#ffffff"
+			placeholder-color="#B5B5B5" search-icon-color="#B3B3B3"></u-icon>
+		</view>
+		<view class="parking-map">
+			<map
+				id="pagemap" 
+				style="width: 100%; height: calc(100vh - 240rpx);" 
+				:show-location="true" 
+				:latitude="latitude" 
+				:longitude="longitude" 
+				@markertap="markertap"
+				:enable-traffic="true"
+				:enable-zoom="true"
+				:markers="covers"></map>
+		</view>
 		
+		<!-- <u-empty src="/static/img/empty.png" icon-size="335" text="正在建设中" color="#878787" mode="search"></u-empty> -->
+		<view class="parking-current-address" v-if="searchParkingList.length === 0">
+			<swiper class="swiper" :current="swiperCurrent" :indicator-dots="false" :autoplay="false" previous-margin="30rpx" next-margin="30rpx" @change="swiperChange">
+				<swiper-item v-for="(item, index) in nearParkingList" :key="index + 'n'">
+					<view class="swiper-item">
+						<view>{{item.roadName}}</view>
+						<view>{{item.areaName}}</view>
+						<view class="swiper-item-font">
+							<view>
+								<text>余位</text>
+								<text class="yellow-font">{{item.spaceIdle}}</text>
+							</view>
+							<view>
+								<text>包月费用</text>
+								<text class="yellow-font">300元</text>
+							</view>
+							<view>
+								<text>距离</text>
+								<text>{{item.distance}}m</text>
+							</view>
+						</view>
+						<view class="swiper-item-button">
+							<button type="default" @click="navigation(item.latitude, item.longitude)">导航</button>
+							<button type="default">办理包月</button>
+						</view>
+						<view @click="$u.route({url: 'pages/chargeStandard/chargeStandard'})">
+							<text>点击查看停车规则</text>
+							<u-icon name="arrow-right"></u-icon>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="parking-address-list" v-if="searchParkingList.length > 0 && isShowSearchParking">
+			<view class="parking-address-list-item" v-for="(item, index) in searchParkingList" :key="index + 's'" @click="clickSearchParking(item)">
+				<view class="pali-left">
+					<view>{{item.roadName}}</view>
+					<view>{{item.areaName}}</view>
+				</view>
+				<view class="pali-right">
+					<image src="../../static/img/distance-icon.png" mode=""  @click="navigation(item.latitude, item.longitude)"></image>
+					<view>路线</view>
+				</view>
+			</view>
+		</view>
+		<view class="parking-address-details" v-if="isShowParkingDetail">
+			<view class="parking-address-details-title">
+				<view class="padt-header">
+					<view class="padt-header-title">
+						<view>{{parkingDetailData.roleName}}</view>
+						<view>贵阳市云岩区北京东路与贵阳绕城高速交叉…</view>
+					</view>
+					<view class="padt-header-icon">
+						<image src="../../static/img/distance-icon.png" mode=""></image>
+						<view>{{parkingDetailData.distance}}m</view>
+					</view>
+				</view>
+				<view class="padt-timeline">服务时间<text>7:00-21:00</text></view>
+			</view>
+			<view class="parking-address-details-numer">
+				<view>
+					<view>120</view>
+					<view>共有车位</view>
+				</view>
+				<view>
+					<view>30</view>
+					<view>空闲车位</view>
+				</view>
+			</view>
+			<view class="parking-address-details-price">
+				<view>
+					<text>10</text>
+					<text>元/小时  包月费用：300元</text>
+				</view>
+				<view @click="$u.route({url: 'pages/chargeStandard/chargeStandard'})">点击查看停车规则</view>
+			</view>
+			<view class="parking-address-details-button">办理包月</view>
+		</view>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -18,68 +109,121 @@
 	export default{
 		data(){
 			return{
+				searchContent: '',
 				page_map:'',
+				loading: false,
 				id: 0, //使用 marker点击事件 需要填写id
 				latitude: 26.64969,
 				longitude: 106.636453,
-				covers: [{
-                latitude: 26.597864,
-                longitude: 106.72947,
-                iconPath: 'https://www.baidu.com/img/flexible/logo/pc/result.png'
-            }],
-				
+				currentPosition: {
+					latitude: 26.64969,
+					longitude: 106.636453,
+				},
+				covers: [
+					{
+						latitude: 26.597864,
+						longitude: 106.72947,
+						id: '0',
+						iconPath: require('./../../static/img/parking-icon.png')
+					},
+					{
+						latitude: 26.497864,
+						longitude: 106.72947,
+						id: '1',
+						iconPath: require('./../../static/img/parking-icon.png')
+					}
+				],
+				// 轮播选中
+				swiperCurrent: 0,
+				// 附近停车列表
+				nearParkingList: [],
+				// 是否显示停车场列表
+				isShowSearchParking: false,
+				// 搜索停车场列表
+				searchParkingList: [],
+				// 显示单个停车场数据
+				isShowParkingDetail: false,
+				// 单个停车场数据
+				parkingDetailData: {}
 			}
 		},
 		onLoad(){
-			this.page_map = uni.createMapContext("pagemap",this);
+			// this.page_map = uni.createMapContext("pagemap", this);
 			// console.log('page_map',this.page_map);
-			this.getNearRoadsl();
+			// this.getNearRoadsl();
 		},
 		onShow() {
 			this.getLocation();
-			
 		},
 		methods:{
+			/* 
+			 * 查询输入框发生变化
+			 * 
+			 * */
+			searchInputChange (value) {
+				console.log(value)
+				if (value === '') {
+					this.isShowParkingDetail = false
+					this.isShowSearchParking = false
+				}
+				this.getNearRoadsl()
+			},
 			getLocation(){
 				let that = this;
 				// console.log("请求定位")
 				uni.getLocation({
 					type:"gcj02",
 					success : function (res) {
-						// console.log("定位返回信息:", res);
+						console.log("定位返回信息:", res);
 						that.latitude = res.latitude;
 						that.longitude = res.longitude;
-						// console.log('that.latitude',that.latitude)
-						// console.log(res.longitude + "," + res.latitude )
+						that.currentPosition.latitude = res.latitude
+						that.currentPosition.longitude = res.longitude
+						console.log(that.currentPosition)
+						// that.getNearRoadsl()
 					},
 					fail: function(res){
 						console.log("请求错误:", res)
 					}
 				})
 			},
+			navigation (lat, lon) {
+				uni.openLocation({
+					latitude: parseFloat(lat),
+					longitude:parseFloat(lon),
+					scale: 18
+				})
+			},
 			async getNearRoadsl(){
-				await this.getLocation();
-				this.$u.api.nearRoadsl({latitude:this.latitude,longitude:this.longitude})
+				// await this.getLocation();
+				console.log(this.currentPosition)
+				this.$u.api.nearRoadsl({
+					latitude: this.currentPosition.latitude,
+					longitude:this.currentPosition.longitude,
+					roadName: this.searchContent
+				})
 				.then(res=>{
-					// this.$refs.uToast.show({
-					// 	title: res.msg,
-					// 	type: 'success',
-					// });
-					// this.covers = res.data;
-					// console.log('this.covers',this.covers)
-					res.data.forEach(item=>{
+					const nearParkingList = []
+					res.data.forEach((item, index)=>{
 						if(item.latitude&&item.longitude){
+							nearParkingList.push(item)
 							let marker = {
 								latitude: item.latitude,
 								longitude:item.longitude,
-								// id:'0',
-								iconPath: 'https://www.baidu.com/img/flexible/logo/pc/result.png'
+								id: '1',
+								iconPath: require('./../../static/img/parking-icon.png')
 							}
 							this.covers.push(marker);
 						}
 					})
-					// this.covers = 
-					// console.log('getNearRoadsl',res)
+					this.nearParkingList = nearParkingList
+					this.latitude = nearParkingList[0].latitude
+					this.longitude = nearParkingList[0].longitude
+					this.loading = false
+					if (this.searchContent) {
+						this.searchParkingList = nearParkingList
+						this.isShowSearchParking = true
+					}
 				}).catch(err=>{
 					this.$refs.uToast.show({
 						title: err.msg,
@@ -88,10 +232,38 @@
 					console.log('getNearRoadsl ',err)
 				});
 			},
+			/**
+			 * 点击地图上的标记点触发
+			 * */
 			markertap(e){
-				console.log('markertap',e)
+				console.log(e)
+				for (let i = 0; i < this.nearParkingList.length; i++) {
+					let item = this.nearParkingList[i]
+					if (item.latitude === e.latitude && item.longitude === e.longitude) {
+						this.swiperCurrent = i
+					}
+				}
+			},
+			/* 
+			 *地址发生变化
+			 * 
+			 * */
+			swiperChange (item) {
+				console.log(item.detail)
+				this.latitude = this.nearParkingList[item.detail.current].latitude
+				this.longitude = this.nearParkingList[item.detail.current].longitude
+			},
+			/**
+			  * 点击单个停车场看详情
+			  * item 为选中项参数
+			  * */
+			clickSearchParking (item) {
+				this.parkingDetailData = item
+				this.isShowParkingDetail = true
+				this.isShowSearchParking = false
+				this.latitude = item.latitude
+				this.longitude = item.longitude
 			}
-			
 		}
 	}
 </script>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/3ca988d0-9cfb-11eb-be92-791c9bba8284
+https://service.dcloud.net.cn/build/download/3bb35a10-b163-11eb-8120-7189b0aa5692

unpackage/cache/certdata

@@ -1,3 +1,3 @@
 andrCertfile=D:/Program Files/HBuilderX/plugins/app-safe-pack/Test.keystore
-andrCertAlias=test
+andrCertAlias=android
 andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/cache/wgt/__UNI__29ECCC8/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>