地图

components/Chargermap.vue

@@ -261,17 +261,28 @@
 					content+="<div style='color: #ffffff;line-height: 14px;padding: 4px;font-size: 14px'>";
 					content+="<div style='"+corner2+"'></div>";
 					content+="<div class=''>";
-					if(pos.price != null)
-						content+= "￥" + pos.price.toString();
-					else if(pos.costPrice != null)
-						content+= "￥" + pos.costPrice.toString();
+					// if(pos.price != null) {
+					// 	content+= "￥" + pos.price.toString();
+					// }
+					// else 
+					if(pos.giveDiscount) {
+						content+= "￥" + (pos.electricityPrice+pos.discountServicePrice).toString();
+					}
+					else {
+						content+= "￥" + (pos.electricityPrice+pos.servicePrice).toString();
+					}
 						
 					content+="</div>";
 					content+="<div class=''>";
-					if(pos.idleNum != null)
+					// console.log(pos)
+					if(pos.idleNum != null) {
 						content+="空闲" + pos.idleNum.toString();
-					else if(pos.availableNum != null)
+					}
+					else if(pos.availableNum != null) {
 						content+="空闲" + pos.availableNum.toString();
+					} else {
+						content+="空闲" + (pos.fastAvailableNum+pos.slowAvailableNum).toString();
+					}
 					content+="</div>"
 					content+="</div>";
 					content+="</div>";

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -26,7 +26,8 @@
 				
 				<view class="card_item2 " >
 					<view class="font6" style="color:#FF6573;margin-right: 10rpx;">
-						{{item.costPrice.toFixed(2)}}
+						{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+							: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}
 					</view>
 					<view style="display: flex; justify-content: center;align-items: center">
 					 元/度 起										
@@ -37,15 +38,15 @@
 						<view style="background-color: #7DB1FF;padding-left: 10rpx;padding-right: 10rpx;">
 							P
 						</view>
-						<label>{{item.park}}</label>
+						<label>{{item.parkingDescription}}</label>
 					</view>
 					<view style="display: flex;flex-direction: row;" class="font-weight2">
 						<view style="color: #00B962;">
-							空闲{{item.availableNum}}
+							空闲{{item.fastAvailableNum+item.slowAvailableNum}}
 						</view>
 						
 				 			<view>
-				 				/总数{{item.totalNum}}
+				 				/总数{{item.fastNum+item.slowNum}}
 				 			</view>
 				 		</view>
 				 	</view>