瀏覽代碼

Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

# Conflicts:
#	pages.json
zhengkaixin 3 年之前
父節點
當前提交
1c10c12bcf

+ 35 - 11
components/Chargermap.vue

@@ -289,6 +289,8 @@
 							//this.mapcharger.setCenter([112.28541,30.308354])
 							//this.mapcharger.setCenter([121.504919,31.351083])
 							this.mapcharger.setCenter(posCenter); //设置地图中心点
+							
+							
 						}
 			
 					}else{
@@ -297,6 +299,13 @@
 				
 				
 			},
+			logMapInfo() {
+			  var posCenter = this.mapcharger.getCenter();
+			  //console.log('center'+JSON.stringify(posCenter));
+			  var limitBounds = this.mapcharger.getBounds();
+ 			  let pos = {center:posCenter,bounds:limitBounds};
+			  return pos;
+			},
 			
 			init(){
 				console.log('init')
@@ -317,10 +326,24 @@
 					});
 					 
 					var clickHandler = function(e) {
-					  alert('您在[ '+e.lnglat.getLng()+','+e.lnglat.getLat()+' ]的位置点击了地图!');
+						console.log('您在[ '+e.lnglat.getLng()+','+e.lnglat.getLat()+' ]的位置点击了地图!');
 					};
 					_this.mapcharger.on('click', clickHandler); 
 					_this.$emit('onload')
+					var mapMovestart = function(){
+						console.log('movestart')
+					}
+					var mapMove = function(){
+						//console.log('mapMove')
+					}
+					var mapMoveend = function(){
+						let pos = _this.logMapInfo();
+						_this.$emit('onMoveEnd',pos);
+						console.log('mapMoveend')
+					}
+					_this.mapcharger.on('movestart', mapMovestart);
+					_this.mapcharger.on('mapmove', mapMove);
+					_this.mapcharger.on('moveend', mapMoveend); 
 				}, e => {
 					//_this.mui.toast('地图加载失败');
 					console.log('地图加载失败', e)
@@ -441,7 +464,9 @@ opacity:0;
 	position: absolute;
 	top: 89px;
 	left: 38px;
-	.corner{
+	
+}
+.corner{
 	   width: 0;
 	   height: 0;
 		position: absolute;
@@ -454,8 +479,6 @@ opacity:0;
 		border-right: 4px solid transparent;
 		border-top: 6px solid #b58cff ;
 	}
-}
-
 .station-icon2 {
 	width: 100px;
 	height: 36px;
@@ -467,7 +490,9 @@ opacity:0;
 	position: absolute;
 	top: 191px;
 	left: 168px;
-	.icon2-left{
+	
+}
+.icon2-left{
 		width: 36px;
 		height: 36px;
 		line-height: 36px;
@@ -476,12 +501,11 @@ opacity:0;
 		border-radius: 999px;
 		background-color: #fff;
 		color: #00b962;
-	}
-	.icon2-right{
-		color: #ffffff;
-		line-height: 14px;
-		padding: 4px;
-	}
+}
+.icon2-right{
+	color: #ffffff;
+	line-height: 14px;
+	padding: 4px;
 }
 .corner2{
    width: 0;

+ 1 - 1
pages.json

@@ -42,7 +42,7 @@
 			}
 
 		},
-	
+
 		{
 			"name": "主页",
 			"path": "pages/index/index",

+ 37 - 8
pages/index/index.vue

@@ -19,7 +19,7 @@
 				</view>
 
 			</view>
-			<view class="list-item">
+			<view class="list-item" @click="fastRecharge">
 				<view class="icon iconfont" style="background-color:#4BD2C0;">
 					&#xe629;
 				</view>
@@ -28,7 +28,7 @@
 				</view>
 
 			</view>
-			<view class="list-item">
+			<view class="list-item" @click="chargingRecord">
 				<view class="icon iconfont" style="background-color: #6FA5FF;">
 					&#xe625;
 				</view>
@@ -88,7 +88,7 @@
 					<view class="text-2">
 						授权定位后可查询附近充电站
 					</view>
-					<view class="text-3">
+					<view class="text-3" @click="getPoint()">
 						重新定位
 					</view>
 				</view>
@@ -195,6 +195,7 @@
 	export default {
 		data() {
 			return {
+				userId: '',
 				newsList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
@@ -235,6 +236,10 @@
 			}
 		},
 		onReady() {
+			if(this.carhelp.getPersonInfo().id != null) {
+				this.userId = this.carhelp.getPersonInfo().id;
+			}
+			
 			WxJsApi.getWxConfig(['getLocation','addEventListener','scanQRCode']).then((res)=>{
 				// console.log(res)
 			}).catch(error => {
@@ -252,11 +257,35 @@
 			},
 			//微信扫二维码
 			scanCode() {
-				WxJsApi.scanQRCode(1).then(res => {
-					
-				}).catch(error => {
-					
-				})
+				if(this.userId != null) {
+					WxJsApi.scanQRCode(1).then(res => {
+						
+					}).catch(error => {
+						
+					})
+				} else {
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
+			fastRecharge() {
+				if(this.userId != null) {
+					this.gotoUrl('pages/user/finance/recharge?id=' + this.userId)
+				} else {
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
+			chargingRecord() {
+				if(this.userId != null) {
+					this.gotoUrl('pages/user/finance/rechargeList?id=' + this.userId)
+				} else {
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}
 			},
 			getPoint() {
 				WxJsApi.getLocation().then((res) => {

+ 51 - 1
pages/login/login.vue

@@ -113,7 +113,7 @@
 			
 				var checkPhoneResult = checkPhone(this.form.telephone);
 			
-				if (false && checkPhoneResult !== true) {
+				if (checkPhoneResult !== true) {
 					uni.showToast({
 						title: checkPhoneResult,
 					})
@@ -125,7 +125,57 @@
 				this.value = !this.value;
 			},
 			login() {
+				var checkPhoneResult = checkPhone(this.form.telephone);
+				
+				if(!this.form.telephone || checkPhoneResult != true) {
+					uni.showToast({
+						title: checkPhoneResult,
+						icon: "none"
+					})
+					return;
+				}
+				if(!this.form.verifyCode) {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+					return
+				}
+				if(!this.value) {
+					uni.showToast({
+						title: "请勾选协议",
+						icon: "none"
+					})
+					return
+				}
 				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				loginApi.validateCode({
+					verifyCode: this.form.verifyCode,
+					telephone: this.form.telephone,
+					openId: this.carhelp.getOpenId(),
+				}).then((response) => {
+					uni.hideLoading();
+					
+					var token = response ? response.data.token : '';
+					this.carhelp.setToken(token);
+					this.carhelp.setPersonInfo(response.data.regUser);
+					
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+					// uni.switchTab({
+					// 	url: '/pages/index/index'
+					// })
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			}
 		}
 	}

+ 139 - 0
pages/record/details.vue

@@ -0,0 +1,139 @@
+<template>
+	<view>
+		<u-navbar title="收益详情"></u-navbar>
+		<view class="details">
+			<view class="details-head">
+				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>
+				<h4>荆鹏软件园充电站</h4>
+			</view>
+			<view class="details-main">
+				<view class="details-price">
+					<span>¥</span><h3>15.00</h3><span>元</span>
+				</view>
+				<p>订单总额</p>
+			</view>
+			<view class="details-row"><p>电费(元)</p><span>¥400.00</span></view>
+			<view class="details-row"><p>服务费(元)</p><span>¥100.00</span></view>
+		</view>
+		<view class="details">
+			<view class="details-title">
+				<h4>充电详情</h4>
+			</view>
+			<view class="details-row"><p>消费电量(kW-h)</p><span>40.000</span></view>
+			<view class="details-row"><p>开始时间</p><span>2022-05-01 10:00:00</span></view>
+			<view class="details-row"><p>结束时间</p><span>2022-05-01 11:59:59</span></view>
+			<view class="details-row"><p>充电时长</p><span>1小时59分59秒</span></view>
+		</view>
+		<view class="details">
+			<view class="details-title">
+				<h4>更多信息</h4>
+			</view>
+			<view class="details-row"><p>结束原因</p><span>用户手动结束</span></view>
+			<view class="details-row"><p>订单状态</p><span>已缴费</span></view>
+			<view class="details-row"><p>充电桩编号</p><span>A000152</span></view>
+			<view class="details-row"><p>更新时间</p><span>2022-05-01 12:00:00</span></view>
+			<view class="details-row"><p>充电车辆</p><span>鄂D999999</span></view>
+		</view>
+		<view class="detailsBtn">
+			<u-button class="detailsBtn-btn" type="primary" shape="circle" plain>返回</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form: {
+					name: '',
+					intro: '',
+				},
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.detailsBtn{
+		margin: 16px;
+		.detailsBtn-btn{
+			border-color:#00B962!important;
+			border-radius: 8px!important;
+			background: none!important;
+			color:#00B962!important;
+		}
+	}
+	.details-title{
+		margin-bottom: 16px;
+		h4{
+			font-weight: normal;
+			font-size: 16px;
+			position: relative;
+			padding-left:10px;
+			&::after{
+				content: '';
+				position: absolute;
+				height: 12px;
+				width: 4px;
+				background-color: #27B148;
+				left: 0;
+				top:5px;
+			}
+		}
+	}
+	.details-row{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 15px;
+		p{color:#888}
+	}
+	.details{
+		margin: 16px;
+		padding: 20px;
+		background-color: #fff;
+		border-radius: 8px;
+		.details-head{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			h4{
+				font-size: 18px;
+				font-weight: normal;
+				margin-left: 4px;
+			}
+		}
+		.details-price{
+			margin-top: 28px;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			h3{
+				font-size: 36px;
+				color:#FF6200;
+				line-height: 36px;
+				margin: 0  4px;
+				font-weight: normal;
+			}
+			span{
+				font-size: 20px;
+				color:#FF6200;
+			}
+		}
+		.details-main{
+			text-align: center;
+			margin-bottom: 20px;
+			p{
+				color:#777;
+				margin-top: 4px;
+			}
+		}
+	}
+</style>

+ 129 - 0
pages/record/index.vue

@@ -0,0 +1,129 @@
+<template>
+	<view>
+		<u-navbar title="充电订单"></u-navbar>
+		
+		<view class="record">
+			<view class="recordTime">
+				<p>5月</p>
+				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
+			</view>
+			<view class="recordList">
+				<view class="recordList-item">
+					<view class="recordList-name">
+						<h4>荆鹏软件园充电站/A0001</h4>
+						<span class="state1">排队中</span>
+					</view>
+					<view class="recordList-row">
+						<p>开始时间:2022-05-05 12:00:00</p>
+					</view>
+					<view class="recordList-row">
+						<p>充电电量:20.000kW-h</p>
+					</view>
+					<view class="recordList-row">
+						<p>充电时长:10分20秒</p>
+						<h4>61.50</h4>
+					</view>
+				</view>
+				<view class="recordList-item">
+					<view class="recordList-name">
+						<h4>荆鹏软件园充电站/A0001</h4>
+						<span class="state2">进行中</span>
+					</view>
+					<view class="recordList-row">
+						<p>开始时间:2022-05-05 12:00:00</p>
+					</view>
+					<view class="recordList-row">
+						<p>充电电量:20.000kW-h</p>
+					</view>
+					<view class="recordList-row">
+						<p>充电时长:10分20秒</p>
+						<h4>61.50</h4>
+					</view>
+				</view>
+				<view class="recordList-item">
+					<view class="recordList-name">
+						<h4>荆鹏软件园充电站/A0001</h4>
+						<span class="state3">已结束</span>
+					</view>
+					<view class="recordList-row">
+						<p>开始时间:2022-05-05 12:00:00</p>
+					</view>
+					<view class="recordList-row">
+						<p>充电电量:20.000kW-h</p>
+					</view>
+					<view class="recordList-row">
+						<p>充电时长:10分20秒</p>
+						<h4>61.50</h4>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.recordTime{
+		height: 44px;
+		background-color: #fff;
+		border-bottom: 1px solid #F2F2F2;
+		display: flex;
+		align-items: center;
+		padding: 0 16px;
+		p{
+			margin-right: 4px;
+		}
+	}
+	.recordList{
+		background-color: #fff;
+	}
+	.recordList-item{
+		background-color: #fff;
+		border-bottom: 1px solid #ededed;
+		margin-left: 16px;
+		padding: 16px 16px 16px 0;
+		.recordList-name{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 12px;
+			h4{
+				font-weight: normal;
+				font-size: 15px;
+			}
+			.state1{
+				color:#8161FF;
+			}
+			.state2{
+				color:#00B962;
+			}
+			.state3{
+				color:#666666;
+			}
+		}
+		.recordList-row{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 8px;
+			p{
+				color:#888;
+			}
+			h4{
+				font-size: 16px;
+			}
+		}
+	}
+</style>

+ 27 - 59
pages/search/search.vue

@@ -2,80 +2,32 @@
 <template>
 	<view>
 		<u-navbar title="">
-			<u-search class="search" placeholder="搜索站点名称" v-model="keyword" color="#c8c8c8"></u-search>
+			<u-search class="search" placeholder="搜索站点名称" v-model="keyword" color="#c8c8c8" @search="search" @click="search" @clickicon='back' @custom='search'></u-search>
 		</u-navbar>
 		<view class="recommend">推荐充电站</view>
-		<view class="charing-slow">
-			<text class="trickle-charge">慢充</text> <text class="station-items">荆鹏软件园充电站</text>
+		<view class="charing-slow" v-for="(item,index) in stations" :key="item.id">
+			<text :class="item.type == '慢充'? 'trickle-charge':'fast-charge'">{{item.type}}</text> <text class="station-items">{{item.name}}</text>
 			<view class="address">
-				湖北省荆州市沙市区江津东路附155号
+				{{item.position}}
 			</view>
 			<view class="price">
-				<view class="num">1.20</view> <view class="unit">
+				<view class="num">{{item.price}}</view> <view class="unit">
 					起 元/度
 				</view>
 			</view>
 			 <view class="park">
 				<text class="park-p">p</text>
-				<text class="park-text">2小时免费停车</text>
+				<text class="park-text">{{item.park}}</text>
 			</view>
 			<view class="free">
 				<view class="free-num">
-					  <text style="color:#009143;">空闲1</text>/总数5
+					  <text style="color:#009143;">空闲{{item.idleNum}}</text>/总数{{item.total}}
 				</view>
 				<view class="distance">
-					<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
+					<text class="iconfont distance-font">&#xe615;</text>{{item.distance}}公里 {{item.time}}分钟
 				</view>
 			</view>
-		</view>
-		<view class="charing-slow">
-			<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
-			<view class="address">
-				湖北省荆州市沙市区江津东路附155号
-			</view>
-			<view class="price">
-				<view class="num">1.25</view> <view class="unit">
-					起 元/度
-				</view>
-			</view>
-			 <view class="park">
-				<text class="park-p">p</text>
-				<text class="park-text">2小时免费停车</text>
-			</view>
-			<view class="free">
-				<view class="free-num">
-				  <text style="color:#009143;">空闲10</text>/总数10
-				</view>
-				<view class="distance">
-					<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
-				</view>
-			</view>
-		</view>
-		
-		<view class="charing-slow">
-			<text class="trickle-charge">慢充</text> <text class="station-items">荆鹏软件园充电站</text>
-			<view class="address">
-				湖北省荆州市沙市区江津东路附155号
-			</view>
-			<view class="price">
-				<view class="num">1.20</view> <view class="unit">
-					起 元/度
-				</view>
-			</view>
-			 <view class="park">
-				<text class="park-p">p</text>
-				<text class="park-text">2小时免费停车</text>
-			</view>
-			<view class="free">
-				<view class="free-num">
-				  <text style="color:#009143;">空闲1</text>/总数5
-				</view>
-				<view class="distance">
-					<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
-				</view>
-			</view>
-		</view>
-		
+		</view>		
 	</view>
 </template>
 
@@ -84,13 +36,29 @@
 	export default {
 		
 		data() {
+			
 			return {
-          
+				keyword:'',
+			  stations:[
+					{name:'荆鹏软件园充电站',position:'湖北省荆州市沙市区江津东路附155号',price:1.2,idleNum:10,total:10,distance:0.1,time:1,type:'慢充',park:'2小时免费停车'},
+					{name:'荆鹏软件园充电站2',position:'湖北省荆州市沙市区江津东路附156号',price:1.2,idleNum:10,total:10,distance:0.15,time:12,type:'快充',park:'3小时免费停车'},
+					{name:'荆鹏软件园充电站3',position:'湖北省荆州市沙市区江津东路附157号',price:1.2,idleNum:10,total:10,distance:0.2,time:13,type:'慢充',park:'4小时免费停车'},
+					{name:'荆鹏大道求助站充电站',position:'湖北省荆州市沙市区江津东路附158号',price:1.2,idleNum:10,total:10,distance:0.3,time:14,type:'快充',park:'5小时免费停车'},
+				
+				],
 			}
 		},
 		 // conponents:{charingSlows},
 		methods: {
-
+			back(){
+				console.log('back');
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			search(){
+				console.log('search ' + this.keyword);
+			}
 		}
 	}
 </script>

+ 166 - 1053
pages/searchPile/searchPile.vue

@@ -1,1755 +1,868 @@
 <template>
-
 	<view>
-
 		<u-navbar :is-back="false" height="88" style="background-color: bisque;">
-
 			<view style="display: flex;flex-direction: column; width: 100%;height: 100%;">
-
 				<view style="display: flex;flex-direction: row; height: 100%; align-items: center;margin-top:0rpx;padding-top: 0rpx;padding-bottom: 20rpx;">
-
 					<view style="margin-left:20rpx;">
-
 						<label class="arrow">{{ area }}</label>
-
 						<u-icon name="arrow-down-fill" size="13" color="#c0c4cc"></u-icon>
-
 					</view>
-
 					<view style="margin-left: 20rpx;margin-right: 20rpx; flex:1"><u-search placeholder="搜索站点名称" v-model="keyword" :showAction="false"></u-search></view>
-
 					<view style="margin-right: 20rpx;" v-show="viewMode" @click="listMode">
-
 						<text class="iconfont">&#xe613;</text> <text class="list">列表</text>
-
 <!--						<u-icon name="list-dot" size="26" color="#c0c4cc"></u-icon>
-
 						<label>列表</label>-->
-
 					</view>
-
 					<view style="margin-right: 20rpx;" v-show="!viewMode" @click="mapMode">
-
 						<text class="iconfont">&#xe622;</text> <text class="list">地图</text>						
-
 						<!--<u-icon name="map" size="26" color="#c0c4cc"></u-icon>
-
 						<label>地图</label>
-
 						-->
-
 					</view>
-
 				</view>
 
-
-
 				<view style="display: flex;flex-direction: row;width:100%; justify-content: space-between;align-items: center;">
-
 					<view style="margin-left: 20rpx;">
-
 						<label class="arrow">{{ info.miles_type[preference.miles_index].text }}</label>
-
 						<u-icon name="arrow-down-fill" size="13" color="#c0c4cc"></u-icon>
-
 					</view>
-
 					<view style="margin-left: 20rpx;margin-right: 20rpx;flex:1">
-
 						<label class="arrow">{{ info.obc_type[preference.obc_type_index].text }}</label>
-
 						<u-icon name="arrow-down-fill" size="13" color="#c0c4cc"></u-icon>
-
 					</view>
-
 					<view style="margin-right: 20rpx;" @click="open">
-
 						<label class="arrow">{{ action }}</label>
-
 						<u-icon v-if="show" name="arrow-down-fill" size="13" color="#00B962"></u-icon>
-
 						<u-icon v-else name="arrow-down-fill" size="13" color="#c0c4cc"></u-icon>
-
 					</view>
-
 				</view>
-
 			</view>
-
 		</u-navbar>
-
-		<view class="content">
-
+		<view class="content" >
 			<view v-if="show" class="preference" :style="show ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'">
-
 				<view class="preference_group">
-
 					<view class="preference_group_item"><label class="preference_label">距离我</label></view>
-
 					<view>
-
 						<u-tag
-
 							class="preference_item"
-
 							v-for="(item, index) in info.miles_type"
-
 							:style="index == preference.miles_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-
 							shape="circle"
-
 							:text="item.text"
-
 							@click="selectMiles(index)"
-
 						></u-tag>
-
 					</view>
-
 				</view>
-
 				<view class="preference_group">
-
 					<view class="preference_group_item"><label class="preference_label">充电站类型</label></view>
-
 					<view>
-
 						<u-tag
-
 							class="preference_item"
-
 							v-for="(item, index) in info.obc_type"
-
 							:style="index == preference.obc_type_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-
 							shape="circle"
-
 							:text="item.text"
-
 							@click="selectOBSType(index)"
-
 						></u-tag>
-
 					</view>
-
 				</view>
-
 			
-
 				<view class="preference_group">
-
 					<view class="preference_group_item"><label class="preference_label">是否对外开放</label></view>
-
 					<view>
-
 						<u-tag
-
 							class="preference_item_plus"
-
 							v-for="(item, index) in info.obc_status"
-
 							:style="index == preference.obc_status_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-
 							shape="circle"
-
 							:text="item.text"
-
 							@click="selectOBSStatus(index)"
-
 						></u-tag>
-
 					</view>
-
 				</view>
-
 				<view class="preference_group">
-
 					<view class="preference_group_item"><label class="preference_label">充电桩电压 (V)</label></view>
-
 					<view>
-
 						<u-tag
-
 							class="preference_item_plus"
-
 							v-for="(item, index) in info.obc_voltage"
-
 							:style="index == preference.obc_voltage_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-
 							shape="circle"
-
 							:text="item.text"
-
 							@click="selectOBCVoltage(index)"
-
 						></u-tag>
-
 					</view>
-
 				</view>
-
 				<view class="preference_group">
-
 					<view class="preference_group_item"><label class="preference_label">充电桩电压 (kW)</label></view>
-
 					<view style="height: 50rpx;margin-left: 30rpx;">
-
 						<DoubleSlider
-
 							ref="obc_voltage"
-
 							sliderHeight="15rpx"
-
 							blockSize="36rpx"
-
 							:minValue="info.obc_power.minValue"
-
 							:maxValue="info.obc_power.maxValue"
-
 							v-model="preference.obc_power"
-
 							:currentMinValue="preference.obc_power.minValue"
-
 							:currentMaxValue="preference.obc_power.maxValue"
-
 							labelColor="#B8C9C5"
-
 							borderRadius="25rpx"
-
 							borderColor="#00B962"
-
 							borderStyle="solid"
-
 							borderWidth="3rpx"
-
 							blockColor="#FFFFFF"
-
 							activeColor="#00B962"
-
 							indicatorColor="#DBDBDB"
-
 							@change="handlerDoubleSlider"
-
 					>	</DoubleSlider>
-
 					</view>
-
 				</view>
-
 				<view class="preference_group">
-
 					<view style="margin-left: 30rpx;"><u-checkbox shape="circle" v-model="preference.save_preference" @change="radioChange">保存偏好设置</u-checkbox></view>
-
 				</view>
-
 				<view style="display: flex;flex-direction: row;">
-
 					<u-button @click="reset" style="width: 30%;">重置</u-button>
-
 					<u-button @click="close" style="width: 70%;background-color: #00B962;">确定</u-button>
-
 				</view>
-
 			</view>
-
-			<view v-show="!viewMode">
-
-				<view v-for="(item,index) in stations" :key="item.id" >
-
-					<text class="fast-charge">{{item.type}}</text> <text class="station-items">{{item.name}}</text>
-
+			<view v-show="!viewMode" >
+				 
+				<view v-for="(item,index) in stations" :key="item.id" class="charing-slow" >
+					<text :class="item.type == '快充' ? 'fast-charge':'trickle-charge'">{{item.type}}</text> <text class="station-items">{{item.name}}</text>
 					<view class="address">
-
 						{{item.position}}
-
 					</view>
-
 					<view class="price">
-
 						<view class="num">{{item.price}}</view>
-
 						<view class="unit">
-
 							起 元/度
-
 						</view>
-
 					</view>
-
 					<view class="park">
-
 						<text class="park-p">p</text>
-
 						<text class="park-text">2小时免费停车</text>
-
 					</view>
-
 					<view class="free">
-
 						<view class="free-num">
-
 							<text style="color:#009143;">空闲{{item.idleNum}}</text>/总数{{item.total}}
-
 						</view>
-
 						<view class="distance">
-
 							<text class="iconfont distance-font">&#xe615;</text>{{item.distance}}公里 {{item.time}}分钟
-
 						</view>
-
 					</view>
-
 				</view>
-
-				<!--
-
-				<view class="charing-slow">
-
-					<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
-
-					<view class="address">
-
-						湖北省荆州市沙市区江津东路附155号
-
-					</view>
-
-					<view class="price">
-
-						<view class="num">1.25</view>
-
-						<view class="unit">
-
-							起 元/度
-
-						</view>
-
-					</view>
-
-					<view class="park">
-
-						<text class="park-p">p</text>
-
-						<text class="park-text">2小时免费停车</text>
-
-					</view>
-
-					<view class="free">
-
-						<view class="free-num">
-
-							<text style="color:#009143;">空闲10</text>/总数10
-
-						</view>
-
-						<view class="distance">
-
-							<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
-
-						</view>
-
-					</view>
-
-				</view>
-
-				<view class="charing-slow">
-
-					<text class="trickle-charge">慢充</text> <text class="station-items">荆鹏软件园充电站</text>
-
-					<view class="address">
-
-						湖北省荆州市沙市区江津东路附155号
-
-					</view>
-
-					<view class="price">
-
-						<view class="num">1.25</view>
-
-						<view class="unit">
-
-							起 元/度
-
-						</view>
-
-					</view>
-
-					<view class="park">
-
-						<text class="park-p">p</text>
-
-						<text class="park-text">2小时免费停车</text>
-
-					</view>
-
-					<view class="free">
-
-						<view class="free-num">
-
-							<text style="color:#009143;">空闲1</text>/总数5
-
-						</view>
-
-						<view class="distance">
-
-							<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
-
-						</view>
-
-					</view>
-
-				</view>
-
-				<view class="charing-slow">
-
-					<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
-
-					<view class="address">
-
-						湖北省荆州市沙市区荆沙大道15号
-
-					</view>
-
-					<view class="price">
-
-						<view class="num">1.20</view>
-
-						<view class="unit">
-
-							起 元/度
-
-						</view>
-
-					</view>
-
-					<view class="park">
-
-						<text class="park-p">p</text>
-
-						<text class="park-text">2小时免费停车</text>
-
-					</view>
-
-					<view class="free">
-
-						<view class="free-num">
-
-							<text style="color:#009143;">空闲10</text>/总数10
-
-						</view>
-
-						<view class="distance">
-
-							<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
-
-						</view>
-
-					</view>
-
-				</view>-->
-
+				 
+				<u-divider margin-top="20" bg-color="#F2F4F4">已经到底了</u-divider>
+				 
+				
+				
 			</view>
-
-			<view v-show="viewMode">					
-
+			<view v-show="viewMode" >					
 				<view>
-
-					<Chargermap  ref="amap" @onload="mapdown" @clickMap="clickMap"></Chargermap>					
-
+					<Chargermap  @onMoveEnd="moveEnd" ref="amap" @onload="mapdown" @clickMap="clickMap"></Chargermap>
 				</view>
-
-				
-
-				<!--<view class="charing-slow">
-
-					<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
-
-					<view class="address">
-
-						湖北省荆州市沙市区江津东路附155号
-
-					</view>
-
-					<view class="price">
-
-						<view class="num">1.25</view>
-
-						<view class="unit">
-
-							起 元/度
-
-						</view>
-
-					</view>
-
-					<view class="park">
-
-						<text class="park-p">p</text>
-
-						<text class="park-text">2小时免费停车</text>
-
-					</view>
-
-					<view class="free">
-
-						<view class="free-num">
-
-							<text style="color:#009143;">空闲10</text>/总数10
-
-						</view>
-
-						<view class="distance">
-
-							<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
-
-						</view>
-
-					</view>
-
-				</view>-->
-
 				 
-
 				<view v-if="stations.length>0" class="chargerCard" style="border-radius: 20rpx;" > 
-
 					<swiper :current="currentIndex" @change="swiperChange" @transition="swiperTransition" style="height: 100%;">
-
 					 	<swiper-item v-for="(item,index) in stations" style="height: 100%;">							 
-
 							
-
 							<view class="swiper-item" style="height: 100%; background-color: #ffffff;">
-
 								<view class="card_item" style="font-size: 35rpx;padding-top: 5rpx;">
-
 									<view style="display: flex;flex-direction: row;">
-
 										<view class="round2" style="margin-right: 5rpx;">
-
 											{{item.type}}
-
 										</view>
-
 										<view>
-
 											{{item.name}}											
-
 										</view>
-
 										
-
 									</view>
-
 								</view>		
-
 								<view class="card_item" style="color:#8898A9;font-size: 15rpx;">
-
 									{{item.position}}
-
 								</view>
-
 								
-
 								<view class="card_item2" >
-
  									<view style="color:#FF6573;font-size:45rpx;margin-right: 10rpx;">
-
 										{{item.price}}
-
 									</view>
-
 									<view style="display: flex; justify-content: center;align-items: center">
-
 									起 元/度										
-
 									</view>
-
 								</view>
-
 								<view class="card_item" style="border-bottom: #F1F4F3; border-bottom-width: 2rpx;border-style: solid;border-top-width: 0rpx;border-left-width: 0rpx;border-right-width:0rpx; padding-bottom:20rpx">
-
 									<view style="display: flex;flex-direction: row;">
-
 										<view style="background-color: #7DB1FF;padding-left: 10rpx;padding-right: 10rpx;">
-
 											P
-
 										</view>
-
 										<label>{{item.park}}</label>
-
 									</view>
-
 									<view style="display: flex;flex-direction: row;">
-
 										<view style="color: #00B962;">
-
 											空闲{{item.idleNum}}
-
 										</view>
-
 										
-
 										<view>
-
 											/总数{{item.total}}
-
 										</view>
-
 									</view>
-
 								</view>
-
 								<view class="card_item" style="padding-bottom: 20rpx;">
-
-									<u-button shape='circle' style="color: #00B962;">
-
+									<u-button shape='circle' style="color: #00B962;" @click="charge(item)">
 										<u-icon name="scan" size="26" color="#00B962" style="margin-right: 20rpx;"></u-icon>
-
 										<label>扫码充电</label></u-button>
-
 									<view class="round">
-
 										<text class="iconfont distance-font">&#xe615;</text>
-
 										<view  style="margin-right: 10rpx;">
-
 											{{item.distance}}公里											
-
 										</view>
-
 										<view  style="margin-right: 10rpx;">
-
 											{{item.time}}分钟
-
 										</view>
-
 									</view>
-
 								</view>
-
 							</view>
-
 						</swiper-item>
-
 					</swiper>
-
 				</view>
-
 			</view>
-
 		</view>
-
-		<u-divider margin-top="20" bg-color="#F2F4F4">已经到底了</u-divider>
-
-		<u-tabbar v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
-
+		<u-tabbar  v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
 	</view>
-
 </template>
 
-
-
 <script>
-
 //	import api from './site-index.js'
-
 //	export default   api
-
 import * as api from '@/apis/site.js';
-
 import Chargermap from '@/components/Chargermap.vue';
-
 import DoubleSlider from '@/components/double-slider/DoubleSlider.vue';
 
-
-
 let _self;
-
 export default {
-
 	components: {
-
 		Chargermap,
-
 		DoubleSlider
-
 	},
-
 	data() {
-
 		return {
-
 			tabbarList: [{
-
 					iconPath: "home-3-line",
-
 					selectedIconPath: "home-3-fill",
-
 					text: '主页 ',
-
 					count: 0,
-
 					isDot: true,
-
 					customIcon: true,
-
 				},
-
 				{
-
 					iconPath: "road-map-line",
-
 					selectedIconPath: "road-map-fill",
-
 					text: '找桩',
-
 					midButton: true,
-
 					customIcon: true,
-
 				},
-
 				{
-
 					iconPath: "user-5-line",
-
 					selectedIconPath: "user-5-fill",
-
 					text: '我的',
-
 					count: 0,
-
 					isDot: false,
-
 					customIcon: true,
-
 			
-
 				}
-
 			],
-
 			currentIndex:-1,
-
 			navBarHeight:88,
-
 			viewMode: true, //地图
-
 			keyword: '',
-
 			show: false,
-
 			mapopen: false,
-
 			isReady: false,
-
 			id: '',
-
 			longitude: 112.28468,
-
 			latitude: 30.307094,
-
 			//			longitude: '',
-
 			//			latitude: '',
-
 			nearbyStationInfo: {
-
 				nearbyShiftDTOList: []
-
 			},
-
 			area: '荆州市',
-
 			action: '筛选',
-
 			preference: {
-
 				miles_index: 3,
-
 				obc_type_index: 0,
-
 				obc_status_index: 0,
-
 				obc_voltage_index: 0,
-
 				save_preference: false,
-
 				obc_power: { minValue: 0, maxValue: 500 }
-
 			},
-
 			stations:[
-
 /*				{name:'荆鹏软件园充电站',position:'湖北省荆州市沙市区江津东路附155号',price:1.2,idle:10,total:10,distance:0.1,time:1,type:'慢充'},
-
 				{name:'荆鹏软件园充电站2',position:'湖北省荆州市沙市区江津东路附156号',price:1.2,idle:10,total:10,distance:0.1,time:1,type:'快充'},
-
 				{name:'荆鹏软件园充电站3',position:'湖北省荆州市沙市区江津东路附157号',price:1.2,idle:10,total:10,distance:0.1,time:1,type:'慢充'},
-
 				{name:'荆鹏大道求助站充电站',position:'湖北省荆州市沙市区江津东路附158号',price:1.2,idle:10,total:10,distance:0.1,time:1,type:'快充'},
-
 	*/			
-
 			],
-
 			info: {
-
 				miles_type: [
-
 					{ distance: 1, text: '1公里' },
-
 					{ distance: 2, text: '2公里' },
-
 					{ distance: 5, text: '5公里' },
-
 					{ distance: 10, text: '10公里' },
-
 					{ distance: 20, text: '20公里' },
-
 					{ distance: 50, text: '50公里' },
-
 					{ distance: 100, text: '100公里' },
-
 					{ distance: 200, text: '200公里' }
-
 				],
-
 				obc_type: [{ value: 0, text: '直流快充' }, { value: 1, text: '交流慢充' }],
-
 				obc_status: [{ value: 0, text: '对外开放' }, { value: 1, text: '不对外开放' }],
-
 				obc_voltage: [{ value: 0, text: '低于700V' }, { value: 1, text: '700V及以上' }],
-
 				obc_power: { minValue: 0, maxValue: 1000 }
-
 			}
-
 		};
-
 	},
-
 	onLoad(op) {
-
 		_self = this;
-
 		console.log('longitude0  ' + _self.longitude);
-
 		console.log('latitude0  ' + _self.latitude);
-
 		if (op != null) {
-
 			if (op.longitude != null) this.longitude = op.longitude;
-
 			if (op.latitude != null) this.latitude = op.latitude;
-
 			if (op.id != null) this.id = op.id;
-
 		}
-
 	},
-
 	onReady() {
-
 		//		console.log('longitude2  '+this.longitude)
-
 		//		console.log('latitude2  '+this.latitude)
-
 		this.getNearbyStationInfo();
-
 		this.isReady = true;
-
 		this.$refs.amap.init();
-
+		 
+		//let state = {};
+		uni.getSystemInfo({
+			success: (res) => {
+				// #ifndef MP
+				let navbarH = 0
+				// #endif
+				// #ifdef MP
+				let navbarH = uni.upx2px(90)
+				// #endif
+				/*state.status_width = res.windowWidth;
+				console.log('window width'+state.status_width);*/
+				
+				let scrollH = res.windowHeight;// - uni.upx2px(88) - navbarH
+				console.log('布局结果'+ JSON.stringify(res));
+				console.log('scrollH'+scrollH)
+				//#ifdef MP-WEIXIN
+				const {
+					statusBarHeight,
+					windowWidth,
+				} = uni.getSystemInfoSync();
+				console.log('height ' + statusBarHeight);
+				//this.status_height = uni.getStatusbarHeight();
+				let res1 =  uni.getMenuButtonBoundingClientRect()
+				console.log('layout selectHeight '+JSON.stringify(res1))
+				//state.selectHeight = (res1.top-res.statusBarHeight)*2+ res1.height;
+				//#endif
+				//console.log('status height'+state.status_height)
+				_self.$refs.amap.setMyStyle("height:"+(scrollH-88-50)+ "px;width:100%;");
+			}
+		})
+//		this.$refs.amap.setMyStyle("height:1500rpx;width:100%;");
+//	this.$refs.amap.setMyStyle("height:calc(100%-176rpx);width:100%;");
+				
 		//		console.log('longitude3  '+this.longitude)
-
 		//		console.log('latitude3  '+this.latitude)
-
 	},
-
 	onShow() {
-
 		if (this.isReady) {
-
 			this.getNearbyStationInfo();
-
 		}
-
 	},
-
 	methods: {
-
+		charge(item){
+			 console.log('扫码充电')
+			//#ifdef MP-WEIXIN
+			uni.scanCode({
+				success:function(res){
+					uni.navigateTo({
+						url:'chargingPileDetails?pile='+encodeURIComponent(JSON.stringify(data))
+					})
+					
+				}
+			}) 
+			return;
+			//#endif
+			 
+			 console.log('扫码充电1')
+			 uni.navigateTo({
+			 	url:'stationAndPile/chargingPileDetails'
+			 })
+			
+		},
+		moveEnd(e){
+			console.log('moveEnd'+JSON.stringify(e))
+		},
 		clickTabItem (index) {
-
 			
-
 			this.currentIndex = index
-
 		},
-
 		swiperChange (e) {
-
 			this.currentIndex = e.detail.current
-
 			let station = this.stations[this.currentIndex];
-
 			
-
 			let posCenter= {longitude: station.longitude,latitude: station.latitude};
-
 			console.log('currentIndex'+JSON.stringify(this.currentIndex))
-
 			console.log('currentIndex'+JSON.stringify(posCenter))
-
 			console.log('station'+JSON.stringify(station))
-
 			this.$refs.amap.setCenter(posCenter);
-
 			this.$refs.amap.updateCharger(station);
-
 			 //console.log('currentIndex'+e.detail.current)
-
 			/*if(e.detail.current>= 2) {
-
 			this.scrollIntoView = 'index' + (e.detail.current-2)
-
 			}
-
 			*/
-
 		},
-
 		swiperTransition (e) {
-
 			// console.log(e)
-
 		},
-
 		listMode() {
-
 			this.viewMode = false
-
 		},
-
 		mapMode() {
-
 			this.viewMode = true
-
 		},
-
 		radioChange(e) {
-
 			//			console.log('e'+JSON.stringify(e))
-
 			this.preference.save_preference = e.value;
-
 			//			 console.log('save_preference '+this.preference.save_preference);
-
 		},
-
 		handlerDoubleSlider(e) {
-
 			//			console.log('e'+JSON.stringify(e))
-
 			this.preference.obc_power = e;
-
 			//this.preference.obc_power.minValue = e.minValue;
-
 			//this.preference.obc_power.maxValue = e.maxValue;
-
 		},
-
 		selectOBSType(index) {
-
 			this.preference.obc_type_index = index;
-
 		},
-
 		selectOBSStatus(index) {
-
 			this.preference.obc_status_index = index;
-
 		},
-
 		selectOBCVoltage(index) {
-
 			this.preference.obc_voltage_index = index;
-
 		},
-
 		selectMiles(index) {
-
 			this.preference.miles_index = index;
-
 		},
-
 		reset() {
-
 			this.preference.obc_status_index = 0;
-
 			this.preference.obc_voltage_index = 0;
-
 			this.preference.obc_type_index = 0;
-
 			this.preference.miles_index = 3;
-
 			this.preference.save_preference = false;
-
 			//			this.$refs.obc_voltage.currentValue = [0,100];
-
 			this.preference.obc_power.minValue = 0;
-
 			this.preference.obc_power.maxValue = 500;
-
 			this.preference.obc_power.minP = Math.floor((this.preference.obc_power.minValue / (this.info.obc_power.maxValue - this.info.obc_power.minValue)) * 100);
-
 			this.preference.obc_power.maxP = Math.floor((this.preference.obc_power.maxValue / (this.info.obc_power.maxValue - this.info.obc_power.minValue)) * 100);
-
 			//            console.log('minP'+this.preference.obc_power.minP)
-
 			//            console.log('maxP'+this.preference.obc_power.maxP)
-
 			this.$refs.obc_voltage.reset(this.preference.obc_power);
-
 			//			this.$refs.obc_voltage.currentMaxValue = this.preference.obc_power[1];
-
 			// 			console.log('reset')
-
 		},
-
 		open() {
-
 			this.show = true;
-
 			//this.$refs.obc_voltage.currentMinValue = this.preference.obc_power[0];
-
 			//this.$refs.obc_voltage.currentMaxValue = this.preference.obc_power[1];
-
 			console.log('open');
-
 		},
-
 		close() {
-
 			console.log('偏好设置' + JSON.stringify(this.preference));
-
 			this.show = false;
-
 			// console.log('close');
-
 		},
-
 		// 获取当前位置
-
 		clickMap(obj) {
-
 			//this.currentIndex = 5;
-
 //			console.log('longitude1  ' + _self.longitude);
-
 //			console.log('latitude1  ' + _self.latitude);
-
 			if (obj == null || obj.type == null) return;
-
 			if (obj.type == 'charger') {
-
 				api.getChargerInfoById(obj).then(
-
 					function(data) {
-
 						if (obj.obj != null) {
-
 							//obj.obj.price = 2.25;
-
 							//obj.obj.idleNum = 12;
-
 							_self.$refs.amap.updateCharger(obj.obj);
-
 							let index = _self.stations.findIndex(item => item.id == obj.obj.id);
-
 							_self.currentIndex = index;
-
 							console.log('find Index'+index);
-
 						}
-
 						//					console.log('点击1'+JSON.stringify(obj));
-
 					},
-
 					function(err) {
-
 						console.log('点击2' + JSON.stringify(obj));
-
 					}
-
 				);
-
 			}
-
 		},
-
 		mapdown() {
-
 			//console.log('this'+JSON.stringify(this))
-
 //			console.log('longitude1  ' + this.longitude);
-
 //			console.log('latitude1  ' + this.latitude);
 
-
-
 			var obj = {
-
 				longitude: _self.longitude,
-
 				latitude: _self.latitude
-
 			};
-
 //			console.log('obj ' + JSON.stringify(obj));
-
 			this.$refs.amap.setPerson(obj);
-
 			/*			var obj2 = {
-
 				longitude: this.nearbyStationInfo.longitude,
-
 				latitude: this.nearbyStationInfo.latitude
-
 			};*/
-
 			let arr = [];
-
 			for (let i = 0; i < 10; i++) {
-
 				let obj = {name:'荆鹏软件园充电站'+i.toString(),
-
 							position:'湖北省荆州市沙市区江津东路附155号',
-
 							price:1.2,idleNum:10,total:10,distance:0.1,
-
-							time:1,type:'慢充',
-
+							time:1,
+							type:'慢充',
 							id: i,
-
 							park: i%2 == 0? '以实际费用为准':'2小时免费停车',
-
 							longitude: 112.28541 + i * 0.001,
-
 							latitude: 30.308354 + i * 0.01
-
 							};
-
-				if(i == 0){
-
+				if(i%2 == 0){
 					obj.longitude = 112.28571 ;
-
 					obj.latitude = 30.307539;
-
+				}else{
+					obj.type = '快充';
 				}
-
+				
 				//arr.push(obj);
-
 				this.stations.push(obj);
-
 			}
-
 			console.log('stations'+JSON.stringify(this.stations))
 
-
-
 			this.$refs.amap.setChargerList(this.stations);
-
 			//this.$refs.amap.setPerson(obj);
-
 			//this.$refs.amap.setSite(obj2);
-
 		},
-
 		gotoLine(item, downid) {
-
 			uni.navigateTo({
-
 				url: '/pages/route/index?id=' + item.routeId + '&upid=' + item.startStationId + '&downid=' + downid
-
 			});
-
 		},
-
 		mapopenBtn() {
-
 			this.mapopen = !this.mapopen;
-
 			if (this.mapopen) {
-
 				this.$refs.amap.setMyStyle('width: 100%; height: 340px;');
-
 			} else {
-
 				this.$refs.amap.setMyStyle('width: 100%; height: 140px;');
-
 			}
-
 		},
 
-
-
 		getNearbyStationInfo() {
-
 			var obj = {
-
 				longitude: this.longitude,
-
 				latitude: this.latitude,
-
 				id: this.id
-
 			};
 
-
-
 			//this.$refs.common.showLoading();
-
 			/*
-
 					API.nearbyStationInfo(obj).then((res) => {
-
 						this.nearbyStationInfo=res.data;
-
 						
-
 						this.$refs.common.showLoading(false);
-
 					}).catch(error => {
-
 						this.$refs.common.showLoading(false,error);
-
 						
-
 					})*/
-
 		}
-
 	}
-
 };
-
 </script>
 
-
-
 <style>
-
 .cj-slider {
-
 	width: 90%;
-
 	margin: auto;
-
 }
 
-
-
 .cj-slide__text {
-
 	text-align: center;
-
 	padding: 20rpx;
-
 }
-
 .preference_group_item {
-
 	padding: 15rpx;
-
 }
-
 .preference_group {
-
 	padding-bottom: 20rpx;
-
 }
-
 .preference {
-
 	background-color: #ffffff;
-
 	left: 0rpx;
-
 	position: absolute;
-
 }
-
 .preference_item {
-
 	margin-bottom: 10rpx;
-
 	margin-left: 20rpx;
-
 	text-align: center;
-
 	border-style: none;
-
 	width: 20%;
-
 }
-
 .preference_item_plus {
-
 	margin-bottom: 10rpx;
-
 	margin-left: 20rpx;
-
 	align-items: center;
-
 	justify-content: center;
-
 	text-align: center;
-
 	width: 25%;
-
 	border-style: none;
-
 }
-
 .preference_label {
-
 	color: #9f9c99;
-
 	margin-left: 20rpx;
-
 	margin-bottom: 100rpx;
-
 }
-
 .map{
-
 	background-color: #ffffff;
-
 	left: 0rpx;
-
 	position: absolute;
-
 	
-
 }
-
 .chargerCard{
-
 /*	background-color: #fff;
-
 	margin: 0 12px;
-
 	border-radius: 8px;
-
 	padding: 10px 12px 0px;
-
 	position: absolute;
-
 	bottom: 68px;
-
 	left: 0;
-
 	right: 0;
-
 	z-index:1021
-
 */
-
 	background-color: #fff;
-
 	margin: 0 12px;
-
 	border-radius: 8px;
-
 	padding: 10px 12px 0px;
-
 	bottom: 68px;
-
 	left: 0;
-
 	right: 0;	
-
 	position: fixed;
-
 	height:360rpx;
-
 	/*
-
 	z-index: 1021; 
-
 	width: 80%;
-
 	margin-left: 10%;
-
 	bottom: 50rpx;
-
 	
-
 	*/
-
 }
-
 .arrow{
-
 	margin-right: 15rpx;
-
 }
-
 .card_item{
-
 	display: flex;
-
 	flex-direction: row;
-
 	justify-content: space-between;
-
 	margin-left: 20rpx;
-
 	margin-right: 20rpx;
-
 	margin-bottom: 10rpx;
-
 }
-
 .card_item2{
-
 	display: flex;
-
 	flex-direction: row;
-
 	margin-left: 20rpx;
-
 	margin-right: 20rpx;
-
 	margin-bottom: 10rpx;
-
 }
-
 .round{
-
 	border-radius:50rpx; 
-
 	background-color: #00B962;
-
 	color: #ffffff;
-
 	text-align: center;
-
 	justify-content: center;
-
 	align-items: center;
-
 	width: 250rpx;
-
 	display: flex;
-
 	flex-direction: row;
-
 }
-
 .round2{
-
 	border-radius:50rpx; 
-
 	background-color: #00B962;
-
 	color: #ffffff;
-
 	text-align: center;
-
 	justify-content: center;
-
 	align-items: center;
-
 	width:125rpx;
-
   }
 
-
-
 .swiper-item{
-
  }
-
  
-
  .list {
-
  	margin-left: 2px;
-
  
-
  }
-
  
-
  .charing-slow {
-
  	background-color: #fff;
-
- 	margin: 0 12px;
-
- 	border-radius: 8px;
-
+	margin: 20rpx;
+	border-radius: 8px;
  	padding: 10px 12px 0px;
-
- 	position: fixed;
-
- 	bottom: 68px;
-
+ 	position: relative;
  	left: 0;
-
  	right: 0;
-
-	/*height: 25%;*/
-
-	
-
- 	.fast-charge1 {
-
+}
+ 	.fast-charge {
  		display: inline-block;
-
  		width: 44px;
-
  		height: 20px;
-
  		line-height: 20px;
-
  		border-radius: 50px;
-
  		background-color: #9d9fff;
-
  		color: rgba(255, 255, 255, 100);
-
  		font-size: 12px;
-
  		text-align: center;
-
  	}
-
+	.trickle-charge {
+		display: inline-block;
+		width: 44px;
+		height: 20px;
+		line-height: 20px;
+		border-radius: 50px;
+		background-color: rgba(0, 185, 98, 100);
+		color: rgba(255, 255, 255, 100);
+		font-size: 12px;
+		text-align: center;
+	}
  
-
  	.station-items {
-
  		display: inline-block;
-
  		height: 16px;
-
  		line-height: 16px;
-
  		font-size: 16px;
-
  		margin-left: 4px;
-
  		color: #101010;
-
  
-
  
-
  	}
-
 	
-
 	.fast-charge {
-
 		display: inline-block;
-
 		width: 44px;
-
 		height: 20px;
-
 		line-height: 20px;
-
 		border-radius: 50px;
-
 		background-color: #9d9fff;
-
 		color: rgba(255, 255, 255, 100);
-
 		font-size: 12px;
-
 		text-align: center;
-
 	}
-
  
-
  	.address {
-
  		margin-top: 8px;
-
  		line-height: 16px;
-
  		font-size: 11px;
-
  		color: rgba(119, 119, 119, 100);
-
  	}
-
  
-
  	.price {
-
  		display: flex;
-
  		height: 20px;
-
- 
-
- 		.num {
-
- 			height: 20px;
-
- 			color: rgba(255, 98, 0, 100);
-
- 			font-size: 20px;
-
- 			text-align: left;
-
- 			font-family: Roboto-medium;
-
- 		}
-
  
-
- 		.unit {
-
- 			height: 14px;
-
- 			line-height: 14px;
-
- 			color: rgba(102, 102, 102, 100);
-
- 			font-size: 14px;
-
- 			text-align: left;
-
- 			font-family: AlibabaPuHui-regular;
-
- 			margin-top: 6px;
-
- 			margin-left: 4px;
-
- 		}
-
  	}
-
  
-
+ 
+ .num {
+ 	height: 20px;
+ 	color: rgba(255, 98, 0, 100);
+ 	font-size: 20px;
+ 	text-align: left;
+ 	font-family: Roboto-medium;
+ }
+  
+ .unit {
+ 	height: 14px;
+ 	line-height: 14px;
+ 	color: rgba(102, 102, 102, 100);
+ 	font-size: 14px;
+ 	text-align: left;
+ 	font-family: AlibabaPuHui-regular;
+ 	margin-top: 6px;
+ 	margin-left: 4px;
+ }
  	.park {
-
  		margin-top: 8px;
-
  		display: flex;
-
  
-
- 		.park-p {
-
- 			display: inline-block;
-
- 			width: 20px;
-
- 			height: 18px;
-
- 			line-height: 12px;
-
- 			text-align: center;
-
- 			background-color: rgba(125, 177, 255, 100);
-
- 			color: #fff;
-
- 		}
-
+ 		
  
-
- 		.park-text {
-
- 			display: inline-block;
-
- 			width: 300px;
-
- 			height: 17px;
-
- 			color: rgba(102, 102, 102, 100);
-
- 			font-size: 12px;
-
- 			text-align: left;
-
- 			margin-left: 4px;
-
- 			margin-top: 2px;
-
- 		}
-
+ 		
  	}
-
- 
-
+	.park-p {
+		display: inline-block;
+		width: 20px;
+		height: 18px;
+		line-height: 12px;
+		text-align: center;
+		background-color: rgba(125, 177, 255, 100);
+		color: #fff;
+	}
+	.park-text {
+		display: inline-block;
+		width: 300px;
+		height: 17px;
+		color: rgba(102, 102, 102, 100);
+		font-size: 12px;
+		text-align: left;
+		margin-left: 4px;
+		margin-top: 2px;
+	}
+	
+	 .map {
+		width: 100%;
+	 
+		height: 100%;
+		position: relative;
+	}
+	#container {
+	  width: 100%;
+	  height: 100%;
+	}
  	.free {
-
  		display: flex;
-
  		justify-content: space-between;
-
  		height: 52px;
-
  		border-top: 1px solid rgba(238, 242, 240, 100);
-
  		margin-top: 10px;
-
  
+ 		
+ 	} 
+	.free-num {
+		line-height: 52px;
+		font-size: 16px
+	} 
+	.distance {
+		width: 130px;
+		height: 28px;
+		line-height: 28px;
+		color: rgba(255, 255, 255, 100);
+		font-size: 14px;
+		background-color: #00b962;
+		border-radius: 50px;
+		margin: 12px;
+		text-align: center;
 
- 		.free-num {
-
- 			line-height: 52px;
-
- 			font-size: 16px
-
- 		}
-
- 
-
- 		.distance {
-
- 			width: 130px;
-
- 			height: 28px;
-
- 			line-height: 28px;
-
- 			color: rgba(255, 255, 255, 100);
-
- 			font-size: 14px;
-
- 			background-color: #00b962;
-
- 			border-radius: 50px;
-
- 			margin: 12px;
-
- 			text-align: center;
-
- 
-
- 			.distance-font {
-
- 				font-size: 16px
-
- 			}
-
- 
-
- 		}
-
- 	}
-
- }
+		
 
-</style>
+	}
+	.distance-font {
+		font-size: 16px
+	}
+</style>

+ 36 - 91
pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -7,105 +7,21 @@
 					:current="current" @change="change"></u-tabs>
 			</view>
 			<view class="line-box"><u-line color="#999999" /></view>
-			<view class="time-frame">
+			<view class="time-frame" v-for="(item,index) in list[current].items">
 				<view class="time-items">
 					<view class="time-price">
 						<view class="time">
-							00:00-07:00
+							{{item.time}}
 						</view>
 						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
+							<text style="color: #ff3d00; font-size: 18px;">{{item.price.toFixed(2)}}</text>
 							<text class="unit">元/度</text>
 						</view>
 					</view>
 					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
+						充电单价:¥{{item.single_price.toFixed(4)}} | 服务费:¥{{item.service_price.toFixed(4)}}
 					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							00:70-09:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							09:00-15:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							15:00-20:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							20:00-22:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							22:00-23:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							23:00-23:59
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价:¥1.0000 | 服务费:¥0.2500
-					</view>
-				</view>
+				</view> 
 			</view>
 		</view>
 	<view class="hint">
@@ -115,17 +31,46 @@
 </template>
 
 <script>
+	import * as api from "@/apis/site.js"
+	let _self;
 	export default {
 		data() {
 			return {
 				list: [{
-					name: '直流快充'
+					name: '直流快充',
+/*					items:[
+						{time:'00:00-07:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'07:00-09:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'09:00-15:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'15:00-20:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'20:00-22:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'22:00-23:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'23:00-23:59',single_price:1.0,service_price:0.25,price:1.25},
+					]*/
 				}, {
-					name: '交流慢充'
+					name: '交流慢充',
+/*					items:[
+						{time:'00:00-07:00',single_price:0.5,service_price:0.25,price:0.75},
+						{time:'07:00-09:00',single_price:0.7,service_price:0.25,price:1.00},
+						{time:'09:00-15:00',single_price:0.7,service_price:0.25,price:1.00},
+						{time:'15:00-20:00',single_price:0.7,service_price:0.25,price:1.00},
+						{time:'20:00-22:00',single_price:0.6,service_price:0.25,price:0.90},
+						{time:'22:00-23:00',single_price:0.5,service_price:0.25,price:0.75},
+						{time:'23:00-23:59',single_price:0.5,service_price:0.25,price:0.75},
+					]*/
 				}],
 				current: 0
 			}
 		},
+		onLoad(op){
+			_self = this;
+			api.getPriceDetails(op).then(function(res){
+					_self.list = res;
+ 				},function(err){
+					
+				}
+			);
+		},
 		methods: {
 			change(index) {
 				this.current = index;

+ 173 - 151
pages/searchPile/stationAndPile/stationDetails.vue

@@ -1,48 +1,49 @@
 <template>
 	<view style="padding-bottom: 138px;">
 		<u-navbar title="站点详情"></u-navbar>
-		<!-- 站点信息 -->
+		 
 		<view class="station-details">
 			<view class="station-name">
-				荆鹏软件园充电站
+				{{info.station.name}}
 			</view>
+			
 			<view class="details-item" style="margin-top: 22px;">
 				<text class="iconfont" style="color: #00b962;font-size: 20px;">&#xe60a;</text> <text
-					class="item-text">交流慢充</text>
+					class="item-text">{{info.station.type}}</text>
 			</view>
 			<view class="details-item">
-				<text class="iconfont" style="color: #4e94ff;font-size: 20px;"">&#xe60e;</text> <text class="
-					item-text">0.1公里</text>
+				<text class="iconfont" style="color: #4e94ff;font-size: 20px;">&#xe60e;</text> 
+				<text class="item-text">{{info.station.distance}}公里</text>
 			</view>
 			<view class="details-item">
-				<text class="iconfont" style="color: #ffad79;font-size: 20px;"">&#xe621;</text> <text class="
-					item-text"> 周一到周日 07:00~22:00 (节假日除外)</text>
+				<text class="iconfont" style="color: #ffad79;font-size: 20px;">&#xe621;</text>
+				 <text class="item-text"> {{info.station.time}}</text>
 
 			</view>
 			<view class="station-address">
 				<img src="/static/img/Frame 201.png" alt="">
-				<view class="address-text">
-					湖北省荆州市沙市区江津东路附155号
+				<view class="address-text" >
+					{{info.station.address}}
 				</view>
-				<view class="iconfont address-font">
+				<view class="iconfont address-font" @click="map">
 					&#xe60c;
 				</view>
 			</view>
-		</view>
-		<!-- 价格详情 -->
+		</view> 
+		
 		<view class="price-details">
 			<view class="detail-title">
 				<view class="title-left">价格详情</view>
-				<view class="title-right">
+				<view class="title-right" @click="priceDetail">
 					<view class="right-text">价格详情 </view>
 					<view class="iconfont right-font">&#xe600;</view>
 				</view>
 			</view>
-			<view class="price-item">
-				<view class="text1">慢充</view>
-				<view class="text2">1.20</view>
+			<view class="price-item" v-for="(item,index) in info.prices">
+				<view :class="item.name=='慢充'?'text1':'text5'">{{item.name}}</view>
+				<view class="text2">{{item.price}}</view>
 				<view class="text3">起 元/度</view>
-				<view class="text4">00:00:00 ~ 23:59:59</view>
+				<view class="text4">{{item.time}}</view>
 			</view>
 			<view class="park-item">
 				<view class="text-box">
@@ -50,161 +51,173 @@
 						停车
 					</view>
 					<view class="text2">
-						免费
+						{{info.park.price}}
 					</view>
 				</view>
 				<view class="text3">
 					仅供参考,以停车场实际价格为准
 				</view>
 			</view>
-		</view>
-	<!-- 设备详情 -->
-	<view class="equipment-details">
-		<view class="title">
-			<view class="title-left">
-				设备详情
-			</view>
-			<view class="title-right">
-				<text class="free">空闲1/</text>
-				<text>总数6</text>
-			
-			</view>
-		</view>
-		
-		<view class="equipment-item">
-			<view class="left-font iconfont">
-				&#xe60a;
-			</view>
-			<view class="name">
-				<view class="name-text">
-					1号桩
-				</view>
-				<view class="tag-free">
-					空闲
-				</view>
-			</view>
-			<view class="type">
-				2015国标 | 直流快充 | 120kW
-			</view>
-			<view class="charging-gun">
-				<view class="iconfont">
-					&#xe618;
-				</view>
-				<view class="gun-num">
-					充电枪01
-				</view>
-				<view class="free-state">
-					空闲
-				</view>
-			</view>
-			<view class="charging-gun">
-				<view class="iconfont">
-					&#xe618;
-				</view>
-				<view class="gun-num">
-					充电枪02
-				</view>
-				<view class="recharge-state">
-					充电中 SOC 86.0%
-				</view>
-			</view>
-			
+		</view> 
 		
-			
-		</view>
-		<view class="equipment-item">
-			<view class="left-font iconfont" style="color:#ff6200">
-				&#xe60a;
-			</view>
-			<view class="name">
-				<view class="name-text">
-					2号桩
-				</view>
-				<view class="tag-recharge">
-					充电中
-				</view>
-			</view>
-			<view class="type">
-				2015国标 | 直流快充 | 120kW
-			</view>
-			<view class="charging-gun">
-				<view class="iconfont">
-					&#xe618;
-				</view>
-				<view class="gun-num">
-					充电枪01
-				</view>
-				<view class="free-state">
-					空闲
-				</view>
-			</view>
-			<view class="charging-gun">
-				<view class="iconfont">
-					&#xe618;
-				</view>
-				<view class="gun-num">
-					充电枪02
+		<view class="equipment-details">
+			<view class="title">
+				<view class="title-left">
+					设备详情
 				</view>
-				<view class="recharge-state">
-					充电中 SOC 86.0%
+				<view class="title-right">
+					<text class="free">空闲{{info.devices.idleNum}}/</text>
+					<text>总数{{info.devices.total}}</text>
+				
 				</view>
 			</view>
 			
-		
-			
-		</view>
-		<view class="equipment-item" style="border: none;padding: 0;" >
-			<view class="left-font iconfont" style="color:#ff6200">
-				&#xe60a;
-			</view>
-			<view class="name">
-				<view class="name-text">
-					3号桩
-				</view>
-				<view class="tag-recharge">
-					充电中
-				</view>
-			</view>
-			<view class="type">
-				2015国标 | 直流快充 | 120kW
-			</view>
-			<view class="charging-gun">
-				<view class="iconfont">
-					&#xe618;
+			<view class="equipment-item" v-for="(item,index) in info.devices.items" :key="index">
+				<view class="left-font iconfont" v-if="item.status =='空闲'">
+					&#xe60a;
 				</view>
-				<view class="gun-num">
-					充电枪01
+				<view class="left-font iconfont" style="color:#ff6200" v-else>
+					&#xe60a;
 				</view>
-				<view class="free-state">
-					空闲
-				</view>
-			</view>
-			<view class="charging-gun">
-				<view class="iconfont">
-					&#xe618;
-				</view>
-				<view class="gun-num">
-					充电枪02
+				<view class="name">
+					<view class="name-text">
+						{{item.name}}
+					</view>
+					<view :class="item.status == '空闲'?'tag-free':'tag-recharge'">
+						{{item.status}}
+					</view>
 				</view>
-				<view class="recharge-state">
-					充电中 SOC 86.0%
+				<view class="type">
+					{{item.description}}
 				</view>
-			</view>
+				<view class="charging-gun" v-for="(item1,index1) in item.plugs" >
+					<view class="iconfont">
+						&#xe618;
+					</view>
+					<view class="gun-num">
+						{{item1.name}}
+					</view>
+					<view :class="item1.status == '空闲'?'free-state':'recharge-state'">
+						{{item1.status == '空闲'?item1.status: item1.status + ' ' + item1.soc}}
+					</view>
+				</view>			
+			</view> 
 			
+		</view> 
 		
-			
+		<view class="bottom">
+			<u-button class="button1" shape="circle" size="medium" @click="charge">扫码充电</u-button>
+			<u-button class="button2" shape="circle" size="medium" @click="navigation">导航</u-button>
 		</view>
-		
-	</view>
-	<!-- 底部 -->
-	<view class="bottom">
-		<u-button class="button1" shape="circle" size="medium">扫码充电</u-button>
-		<u-button class="button2" shape="circle" size="medium">导航</u-button>
-	</view>
 	</view>
 </template>
 
 <script>
+	import api from "@/apis/site.js"
+	let _self;
+	export default {
+ 
+		data() {
+			return {
+				currentPos:{
+						name:'荆鹏软件园充电站',
+						longitude: 112.28468,
+						latitude: 30.307094,					
+				},
+				info:{
+					station:{
+						id:1,
+						name:'荆鹏软件园充电站',
+						longitude: 112.28468,
+						latitude: 30.307094,
+						type:'交流慢充',
+						distance:0.1,
+						time:'周一到周日 07:00~22:00(节假日除外)',
+						address:'湖北省荆州市沙市区江津东路附155号'
+					},
+					prices: [
+							{name:'慢充',price:1.20,time:'00:00:00 ~ 23:59.59'},
+							{name:'快充',price:1.20,time:'00:00:00 ~ 23:59.59'},
+						]	 ,
+					park:{ 
+						price:'免费'
+					},
+					
+					devices:{
+						idleNum:1,
+						total:6,
+						items:[
+							{name:'1号桩',status:'空闲',description:'2015国标|直流快充|120kW',plugs:[{name:'充电枪01',status:'空闲',soc:'SOC 86.0%'},{name:'充电枪02',status:'充电中',soc:'SOC 86.0%'}]},
+							{name:'2号桩',status:'充电中',description:'2015国标|直流快充|120kW',plugs:[{name:'充电枪01',status:'空闲',soc:'SOC 86.0%'},{name:'充电枪02',status:'充电中',soc:'SOC 86.0%'}]},
+							{name:'3号桩',status:'充电中',description:'2015国标|直流快充|120kW',plugs:[{name:'充电枪01',status:'空闲',soc:'SOC 86.0%'},{name:'充电枪02',status:'充电中',soc:'SOC 86.0%'}]}
+						]
+					}
+				}
+			}
+		},
+		onLoad(){
+			_self = this;
+		},
+		methods:{
+			navigation(){
+				var packageName = 'com.autonavi.minimap';
+				var main = plus.android.runtimeMainActivity();
+				var packageManager = main.getPackageManager();
+				var PackageManager = plus.android.importClass(packageManager)
+				var packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
+				if (packageInfo) {
+					var Uri = plus.android.importClass("android.net.Uri");
+					var url = "androidamap://route?sourceApplication=amap" +
+						"&sid=A&slat="+this.info.latitude+"&slon="+this.currentPos.longitude+"&sname="+ this.currentPos.name +
+						"&did=B&dlat=" +this.info.latitude.toString()+ "&dlon="+ this.info.longitude+ "&dname="+ this.info.station.name+"&dev=0&t=1";
+					var Intent = plus.android.importClass('android.content.Intent');
+					var intent = new Intent();
+					intent.setAction(Intent.ACTION_VIEW);
+					intent.addCategory(Intent.CATEGORY_DEFAULT);
+					var uri = Uri.parse(url);
+					//将功能Scheme以URI的方式传入data  
+					intent.setData(uri);
+					intent.setPackage("com.autonavi.minimap");
+					var main = plus.android.runtimeMainActivity();
+					main.startActivity(intent);
+				} else {
+					uni.showToast({
+						title:'您暂时没有安装高德地图'
+					})
+				}
+			},
+			charge(){
+				 console.log('扫码充电')
+				//#ifdef MP-WEIXIN
+				uni.scanCode({
+					success:function(res){
+						uni.navigateTo({
+							url:'chargingPileDetails?pile='+encodeURIComponent(JSON.stringify(data))
+						})
+						
+					}
+				}) 
+				return;
+				//#endif
+				 
+				 console.log('扫码充电1')
+				 uni.navigateTo({
+				 	url:'chargingPileDetails'
+				 })
+				
+			},
+			priceDetail(){
+				uni.navigateTo({
+					url:'chargePriceDetails?stationId='+_self.info.station.id
+				})
+			},
+			map(){
+				uni.navigateTo({
+					url:'stationDetailsMap'
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -273,7 +286,6 @@
 	// 价格详情
 	.price-details {
 		width: 100%;
-		height: 145px;
 		margin-top: 12px;
 		background-color: #fff;
 		padding: 20px 15px 16px 16px;
@@ -331,6 +343,16 @@
 			font-size: 12px;
 			text-align: center;
 		}
+		.text5{
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: #9d9fff;
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
 		.text2{
 			line-height: 19px;
 			margin-left: 8px;

文件差異過大導致無法顯示
+ 150 - 38
pages/searchPile/stationAndPile/stationDetailsMap.vue


部分文件因文件數量過多而無法顯示