首页，列表

pages/index/index.vue

@@ -131,7 +131,7 @@
 		
 			</view>
 		</view>
-		<template v-if="message == 'getLocation:ok' && stationList.length != 0 && chargeList.length == 0">
+		<!-- <template v-if="message == 'getLocation:ok' && stationList.length != 0 && chargeList.length == 0">
 		
 			
 			<view class=" top-up" >
@@ -144,9 +144,9 @@
 				</view>
 				</view>
 				
-			</view>
+			</view> -->
 			<!-- 附近站点 -->
-			<view class="station"  v-for="(stationData,i) in stationList" :key="i"
+			<!-- <view class="station"  v-for="(stationData,i) in stationList" :key="i"
 				v-show="!listShow||i==0"
 				@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
 				<view class="text">
@@ -183,11 +183,9 @@
 				</view>
 				
 			</view>
-		</template>
+		</template> -->
 		<!-- 附近站点改版 -->
-		<template >
-		
-			
+		<template  v-if="message == 'getLocation:ok' && stationList.length != 0 && chargeList.length == 0">
 			<view class=" top-up" >
 				<view class="top-up-title oldTextjp" oldstyle="font-size:20px;"><text class="line"></text>附近站点
 				<view class="pack-up"  v-show="!listShow" @click="listShow=true"  >
@@ -197,107 +195,55 @@
 					展开<text class="iconfont">&#xe62c;</text>
 				</view>
 				</view>
-				
 			</view>
 			<!-- 附近站点 -->
-			<view class="station" >
+			<view class="station" v-for="(stationData,i) in stationList" :key="i"
+				v-show="!listShow||i==0"
+				@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
 				<view class="head">
-					<view class="title">
-						荆鹏软件园充电站B01
+					<view class="title oldTextjp" oldstyle="font-size: 20px;">
+						{{stationData.name}}
 					</view>
-					<view class="distance">
-						<text class="iconfont" style="color:#666666">&#xe615;</text>小于100米
+					<view class="distance oldTextjp" oldstyle="font-size: 16px;">
+						<text class="iconfont" style="color:#666666">&#xe615;</text>{{stationData.distance!=null&&stationData.distance>0.1 ? stationData.distance.toFixed(1)+'公里':'小于100米'}}
 					</view>
 				</view>
 				<view class="sign">
-					<view class="sign-1">会员享服务费8.5折</view>
-					<view class="sign-2">2小时停车免费</view>
-					<view class="sign-2">包月卡</view>
-					<view class="sign-2">服务费代金券</view>
-					<view class="sign-2">超级代金券</view>
+					<view class="sign-1" v-if="stationData.giveDiscount">会员享服务费{{stationData.discountRatio/10}}折</view>
+					<view class="sign-2" v-if="stationData.tagList.length != 0" v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
 				</view>
 				<view class="price-free">
 					<view class="price">
 						<view class="price-1">
-							<text class="num">0.85</text>
+							<text class="num">
+							{{!stationData.giveDiscount ? (stationData.electricityPrice+stationData.servicePrice).toFixed(2)
+								: (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
 							<text class="unit">元/度 起</text>
 						</view>
-						<view class="price-2">
-							<text class="num">0.87</text>
-							<text class="unit">元/度 起</text>
-						</view>
-						
-						
-					</view>
-					<view class="free">
-						<view class="fast">
-							<view class="fast-font">
-								快
-							</view>
-							<view class="num">
-								3/4
-							</view>
-						</view>
-						<view class="slow">
-							<view class="slow-font">
-								慢
-							</view>
-							<view class="num">
-								3/4
-							</view>
-						</view>
-					</view>
-				</view>
-				
-				
-			</view>
-			<view class="station" >
-				<view class="head">
-					<view class="title">
-						玉桥公园充电站A02
-					</view>
-					<view class="distance">
-						<text class="iconfont" style="color:#666666">&#xe615;</text>1.2公里
-					</view>
-				</view>
-				<view class="sign">
-					
-					<view class="sign-2">2小时停车免费</view>
-					<view class="sign-2">包月卡</view>
-					<view class="sign-2">服务费代金券</view>
-					<view class="sign-2">超级代金券</view>
-				</view>
-				<view class="price-free">
-					<view class="price">
-						<view class="price-1">
-							<text class="num">0.85</text>
+						<view class="price-2" v-if="stationData.giveDiscount">
+							<text class="num">{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
 							<text class="unit">元/度 起</text>
 						</view>
-						
-						
-						
 					</view>
 					<view class="free">
-						<view class="fast">
+						<view class="fast" v-if="stationData.type == '1' || stationData.type == '1,2'">
 							<view class="fast-font">
 								快
 							</view>
 							<view class="num">
-								3/4
+								{{stationData.fastAvailableNum}}/{{stationData.fastNum}}
 							</view>
 						</view>
-						<view class="slow">
+						<view class="slow" v-if="stationData.type == '2' || stationData.type == '1,2'">
 							<view class="slow-font">
 								慢
 							</view>
 							<view class="num">
-								3/4
+								{{stationData.slowAvailableNum}}/{{stationData.slowNum}}
 							</view>
 						</view>
 					</view>
 				</view>
-				
-				
 			</view>
 		</template>
 		

pages/searchPile/searchPile.vue

@@ -147,45 +147,47 @@
 							<view class="name">
 								{{item.name}}
 							</view>
-							<view class="distance">
-								<text class="iconfont" style="color:#666666">&#xe615;</text>小于100米
+							<view class="distance" v-if="item.distance != '99999999'">
+								<text class="iconfont" style="color:#666666">&#xe615;</text>
+								{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'公里' : '小于100米'}}
+							</view>
+							<view class="distance" v-else>
+								<text class="iconfont" style="color:#666666">&#xe615;</text>
 							</view>
 						</view>
 						<view class="sign">
-							<view class="sign-1">会员享服务费8.5折</view>
-							<view class="sign-2">2小时停车免费</view>
-							<view class="sign-2">包月卡</view>
-							<view class="sign-2">服务费代金券</view>
-							<view class="sign-2">超级代金券</view>
+							<view class="sign-1" v-if="item.giveDiscount">会员享服务费{{item.discountRatio/10}}折</view>
+							<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
 						</view>
 						<view class="price-free">
 						<view class="price">
 							<view class="price-1">
-								<view class="num">{{item.price.toFixed(2)}}</view>
+								<view class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+								: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</view>
 								<view class="unit">
 									 元/度 起
 								</view>
 							</view>
-							<view class="price-2">
-								<text class="num">0.87</text>
+							<view class="price-2" v-if="item.giveDiscount">
+								<text class="num">{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
 								<text class="unit">元/度 起</text>
 							</view>
 						</view>
 						<view class="free">
-							<view class="fast">
+							<view class="fast" v-if="item.type == '快充' || item.type == '快/慢'">
 								<view class="fast-font">
 									快
 								</view>
 								<view class="num">
-									3/4
+									{{item.fastAvailableNum}}/{{item.fastNum}}
 								</view>
 							</view>
-							<view class="slow">
+							<view class="slow" v-if="item.type == '慢充' || item.type == '快/慢'">
 								<view class="slow-font">
 									慢
 								</view>
 								<view class="num">
-									3/4
+									{{item.slowAvailableNum}}/{{item.slowNum}}
 								</view>
 							</view>
 						</view>
@@ -829,7 +831,7 @@ export default {
 				data1.latitude = pos.latitude.toString(); 
 			if(this.info.miles_type[this.preference.miles_index].distance!=null)
 				data1.raidus = this.info.miles_type[this.preference.miles_index].distance.toString();
-			//data1.online = "0";//在线	
+			// data1.online = "0";//在线	
 			if(pos.findType != null)
 				data1.findType = pos.findType;
 			else