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

# Conflicts:
#	pages/searchPile/stationAndPile/chargePriceDetails.vue
#	pages/searchPile/stationAndPile/stationDetails.vue

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -1,6 +1,7 @@
 <template>
 	<view style="padding-bottom: 296rpx;">
 		<ujp-navbar title="充电价格详情"></ujp-navbar>
+
 		<view class="price-main">
 			<view class="price-item" v-for="(item,i) in list" :key="i">
 				<view class="time " v-if="!item.current">
@@ -11,7 +12,7 @@
 				</view>
 				<view class="price">
 					<text class="price-1"><text class="num">{{item.costPrice.toFixed(2)}}</text> <text >元/度</text></text> 
-					<text class="price-2"  v-if="stationDetail.station&&stationDetail.station.giveDiscount" >
+					<text class="price-2"  v-if="stationDetail&&stationDetail.giveDiscount" >
 						<text class="num">{{((item.servicePrice*1000+item.electricityPrice*1000)/1000).toFixed(2)}}元/度</text>
 					</text>
 				</view>
@@ -28,11 +29,11 @@
 					<view 
 						v-if="stationDetail&&!stationDetail.giveDiscount"
 					class="service-price">服务费{{item.servicePrice}}元/度</view>
-				</view>
+
+		</view>
 			</view>
 			
 			
-			
 		</view>
 		<u-divider color="#B6BDC3" style="margin-top:20px;" bg-color="#F2F4F4">*充电费用仅供参考，请以充电桩上的费用为准。</u-divider>
 		
@@ -64,6 +65,7 @@
 			}
 		},
 		onLoad(op){
+			
 			_self = this; 
 			
 			
@@ -93,12 +95,13 @@
 							if (date_str >= obj.startTime && date_str <= obj.endTime) {
 								obj.current = true;
 							}
-						
+
 						}
+						
 					}
 				})
+				
 			}
-
 /*			api.getPriceDetails(op).then(function(res){
 					_self.list = res;
  				},function(err){
@@ -273,8 +276,6 @@
 		.tabs-box{
 			width: 90% !important;
 		}
-		
-		
 		// 价格详情
 		.price-main{
 			background-color: #fff;
@@ -283,8 +284,8 @@
 				margin-left: 20px;
 				border-bottom:rgb(238, 242, 240) solid 1px;
 				.time{
-					color: #27bfa1;
-					font-size: 16px;
+					color:  #00b962;;
+					font-size: 18px;
 					position: relative;
 					
 				}
@@ -293,24 +294,25 @@
 					color: #ff8b17;
 					.current-time{
 						background-color: #ffecdd;
-						width: 88px;
+						width: 72px;
 						line-height: 20px;
 						border-radius: 8px;
 						padding:2px;
 						position: absolute;
 						top: 0;
 					    right: 0;
+						font-size: 14px;
 						text-align: center;
 					}
 				}
 				.price{
 					color: #101010;
-					
+					  font-size: 16px;
 					.price-1{
 						
 						
 						.num{
-							font-size: 30px;
+							font-size: 28px;
 							font-weight: 550;
 							margin-right: 4px;
 						}
@@ -328,9 +330,10 @@
 					display: flex;
 					justify-content: space-between;
 					color:  rgba(153, 153, 153, 100);
-					font-size: 24rpx
+					
 				}
 			}
 			
 		}
+		
 </style>

pages/searchPile/stationAndPile/stationDetails.vue

@@ -1674,8 +1674,8 @@
 		margin-left: 20px;
 		border-bottom:rgb(238, 242, 240) solid 1px;
 		.time{
-			color: #27bfa1;
-			font-size: 16px;
+			color: #00b962;
+			font-size: 18px;
 			position: relative;
 			
 		}
@@ -1684,24 +1684,25 @@
 			color: #ff8b17;
 			.current-time{
 				background-color: #ffecdd;
-				width: 88px;
+				width: 72px;
 				line-height: 20px;
 				border-radius: 8px;
 				padding:2px;
 				position: absolute;
 				top: 0;
-			    right: 0;
+			    right: 0;
+				 font-size: 14px;
 				text-align: center;
 			}
 		}
 		.price{
 			color: #101010;
-			
+			  font-size: 16px;
 			.price-1{
 				
 				
 				.num{
-					font-size: 30px;
+					font-size: 28px;
 					font-weight: 550;
 					margin-right: 4px;
 				}
@@ -1719,7 +1720,7 @@
 			display: flex;
 			justify-content: space-between;
 			color:  rgba(153, 153, 153, 100);
-			font-size: 24rpx
+			
 		}
 	}