地图

manifest.json

@@ -79,7 +79,8 @@
     "h5" : {
         "template" : "template.h5.html",
         "router" : {
-            "mode" : "hash"
+            "mode" : "hash",
+            "base" : ""
         },
         "sdkConfigs" : {
             "maps" : {

pages/chargeStandard/chargeStandard.scss

@@ -1,21 +1,18 @@
 .charge {
-	padding: 40rpx;
+	background-color: #F6F6FF;
+	.charge-rules-container {
+		background-color: #fff;
+		border-radius: 25rpx;
+		padding: 32rpx 40rpx;
+		margin-bottom: 20rpx;
+	}
 	.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;
-			}
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #2E2E2E;
+			line-height: 40rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
 		}
 	}
 	.charge-rules {
@@ -42,9 +39,16 @@
 		}
 	}
 	.charge-instructions {
-		margin-top: 38rpx;
-		.charge-instructions-item,
+		background-color: #fff;
+		border-radius: 25rpx;
+		padding: 40rpx;
 		.charge-instructions-title {
+			line-height: 40rpx;
+			font-size: 32rpx;
+			color: #2e2e2e;
+			margin-bottom: 30rpx;
+		}
+		.charge-instructions-item {
 			text-indent: -1.5em;
 			margin-left: 1.5em;
 			line-height: 40rpx;
@@ -53,10 +57,43 @@
 		}
 	}
 	.charge-telphone {
-		margin-top: 38rpx;
+		margin-top: 30rpx;
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #757575;
 		line-height: 40rpx;
 	}
+	.charge-list {
+		width: calc(100% - 78rpx);
+		margin: 0 auto;
+		padding: 33rpx 0;
+		display: flex;
+		justify-content: space-between;
+		.charge-list-item {
+			width: 32%;
+			margin-right: 2%;
+			background-color: #fff;
+			border-radius: 10rpx;
+			padding: 29rpx;
+			text-align: center;
+			&:last-child {
+				margin-right: 0;
+			}
+			view {
+				&:first-child {
+					color: #008CFF;
+					font-size: 30rpx;
+					font-weight: 500;
+					line-height: 42rpx;
+				}
+				&:last-child {
+					color: #999999;
+					font-size: 24rpx;
+					font-weight: 400;
+					margin-top: 7rpx;
+					line-height: 33rpx;
+				}
+			}
+		}
+	}
 }

pages/chargeStandard/chargeStandard.vue

@@ -1,45 +1,104 @@
 <template>
 	<view class="charge">
-		<view class="charge-type">
-			<text>停车场类型</text>
-			<text>路边临时停车位</text>
+		<view class="charge-list">
+			<view class="charge-list-item">
+				<view>2.5元/小时</view>
+				<view>收费标准</view>
+			</view>
+			<view class="charge-list-item">
+				<view>15分钟内</view>
+				<view>免费时长</view>
+			</view>
+			<view class="charge-list-item">
+				<view>59元</view>
+				<view>封顶金额</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 class="charge-rules-container">
+			<view class="charge-type">
+				<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>
-		<view class="charge-rules">
-			<view>小车</view>
-			<view class="charge-rules-right">
-				<view>
-					<text>7:00-22:00</text>
-					<text>5元/小时</text>
+			<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>
-					<text>22:00-次日7:00</text>
-					<text>3元/小时</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>
-		<view class="charge-rules">
-			<view>摩托车</view>
-			<view class="charge-rules-right">
-				<view>
-					<text>7:00-22:00</text>
-					<text>5元/小时</text>
+		<view class="charge-rules-container">
+			<view class="charge-type">
+				<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>
-					<text>22:00-次日7:00</text>
-					<text>3元/小时</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>
@@ -51,14 +110,14 @@
 			<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 class="charge-telphone">
+				<view>客服电话</view>
+				<view>0851-8888888</view>
+			</view>
+			<view class="charge-telphone">
+				<view>监督电话</view>
+				<view>0851-8888888</view>
+			</view>
 		</view>
 	</view>
 </template>

pages/parkingLists/parkingLists.scss

@@ -102,10 +102,9 @@
 	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%;
+	// background-size: 100% 100%;
 	display: flex;
 	flex-direction: row;
 	justify-content: space-around;
@@ -118,11 +117,12 @@
 	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;
+	color: #A4A4A4;
+	font-size: 20rpx;
 }
 .parking-address-list {
 	position: absolute;
@@ -194,13 +194,12 @@
 	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;
+	z-index: 1000000;
 	background: transparent;
 	width: 100%;
 }

pages/parkingLists/parkingLists.vue

@@ -151,9 +151,13 @@
 			// this.page_map = uni.createMapContext("pagemap", this);
 			// console.log('page_map',this.page_map);
 			// this.getNearRoadsl();
+			console.log('load')
 		},
 		onShow() {
-			this.getLocation();
+			console.log('show')
+			this.isShowSearchParking = false
+			this.isShowParkingDetail = false
+			this.getLocation()
 		},
 		methods:{
 			/* 
@@ -170,7 +174,8 @@
 			},
 			getLocation(){
 				let that = this;
-				// console.log("请求定位")
+				console.log("请求定位")
+				// that.loading = true
 				uni.getLocation({
 					type:"gcj02",
 					success : function (res) {
@@ -180,6 +185,7 @@
 						that.currentPosition.latitude = res.latitude
 						that.currentPosition.longitude = res.longitude
 						console.log(that.currentPosition)
+						that.loading = false
 						that.getNearRoadsl()
 					},
 					fail: function(res){
@@ -187,6 +193,9 @@
 					}
 				})
 			},
+			/**
+			  * 导航 
+			  * */
 			navigation (lat, lon) {
 				uni.openLocation({
 					latitude: parseFloat(lat),
@@ -219,7 +228,6 @@
 					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