停车规则页面和对接

停车场信息页面

pages/parkingLists/parkingLists.vue

@@ -32,7 +32,7 @@
 						<view>{{item.areaName}}</view>
 						<view class="swiper-item-font">
 							<view>
-								<text>余位</text>
+								<text>空闲车位</text>
 								<text class="yellow-font">{{item.spaceIdle}}</text>
 							</view>
 							<view v-if="item.monthAmount">
@@ -48,7 +48,7 @@
 							<button type="default" @click="navigation(item.latitude, item.longitude)">导航</button>
 							<button type="default" :disabled="!item.monthAmount" :class="{'disabled': !item.monthAmount}" @click="$u.route({url: 'pages/handleMonthly/handleMonthly'})">办理包月</button>
 						</view>
-						<view @click="$u.route({url: 'pages/chargeStandard/chargeStandard'})">
+						<view @click="lookParkingRule(item)">
 							<text>点击查看停车规则</text>
 							<u-icon name="arrow-right"></u-icon>
 						</view>
@@ -56,51 +56,51 @@
 				</swiper-item>
 			</swiper>
 		</view>
-		<view class="parking-address-list" v-if="searchParkingList.length > 0 && isShowSearchParking">
+		<view class="parking-address-list" v-if="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>
+					<image src="../../static/img/distance-icon.png" mode=""  @click.stop="navigation(item.latitude, item.longitude)"></image>
 					<view>路线</view>
 				</view>
 			</view>
 		</view>
-		<view class="parking-address-details" v-if="isShowParkingDetail">
+		<!-- <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>{{parkingDetailData.roadName}}</view>
+						<view>{{parkingDetailData.areaName}}</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 class="padt-timeline">服务时间<text>{{parkingDetailData.workBeginTime.substring(0, 5)}}-{{parkingDetailData.workEndTime.substring(0, 5)}}</text></view>
 			</view>
 			<view class="parking-address-details-numer">
 				<view>
-					<view>120</view>
+					<view></view>
 					<view>共有车位</view>
 				</view>
 				<view>
-					<view>30</view>
+					<view>{{parkingDetailData.spaceIdle}}</view>
 					<view>空闲车位</view>
 				</view>
 			</view>
 			<view class="parking-address-details-price">
 				<view>
-					<text>10</text>
+					<text></text>
 					<text>元/小时  包月费用：300元</text>
 				</view>
-				<view @click="$u.route({url: 'pages/chargeStandard/chargeStandard'})">点击查看停车规则</view>
+				<view @click="lookParkingRule(parkingDetailData)">点击查看停车规则</view>
 			</view>
 			<view class="parking-address-details-button">办理包月</view>
-		</view>
+		</view> -->
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -156,7 +156,7 @@
 		onShow() {
 			this.isShowSearchParking = false
 			this.isShowParkingDetail = false
-			// this.getNearRoadsl()
+			this.getNearRoadsl()
 		},
 		methods:{
 			/* 
@@ -174,7 +174,7 @@
 			getLocation(){
 				let that = this;
 				console.log("请求定位")
-				that.loading = true
+				// that.loading = true
 				uni.getLocation({
 					type:"gcj02",
 					success : function (res) {
@@ -210,6 +210,7 @@
 			},
 			/**
 			 * lon,lat 为当前选中点的经纬度
+			 * 默认首个点放大 如果有传入经纬度则对应的点放大
 			 * */
 			getNearRoadsl(lon, lat){
 				// await this.getLocation();
@@ -252,7 +253,7 @@
 					this.nearParkingFlag = true
 					if (this.searchContent) {
 						this.searchParkingList = nearParkingList
-						this.isShowSearchParking = true
+						this.isShowSearchParking = true 
 						this.nearParkingFlag = false
 					}
 				}).catch(err=>{
@@ -293,13 +294,31 @@
 			  * item 为选中项参数
 			  * */
 			clickSearchParking (item) {
-				this.parkingDetailData = item
-				this.isShowParkingDetail = true
-				this.isShowSearchParking = false
-				this.latitude = item.latitude
-				this.longitude = item.longitude
-				this.getNearRoadsl(item.longitude, item.latitude)
-				this.scale = 18
+				// console.log(item)
+				// this.parkingDetailData = item
+				// this.isShowParkingDetail = true
+				// this.latitude = item.latitude
+				// this.longitude = item.longitude
+				// this.getNearRoadsl(item.longitude, item.latitude)
+				// setTimeout(() => {
+				// 	this.isShowSearchParking = false
+				// }, 500)
+				// this.scale = 18
+				this.$u.route({
+					url: 'pages/parkingInformation/parkingInformation'
+				})
+			},
+			/**
+			 * 跳转停车标准页面
+			 * {roadNo} 路段编码
+			  * */
+			lookParkingRule (item) {
+				this.$u.route({
+					url: 'pages/chargeStandard/chargeStandard',
+					params: {
+						roadNo: item.roadNo
+					}
+				})
 			}
 		}
 	}