样式调整

main.js

@@ -59,7 +59,8 @@ Vue.mixin({
 			if(aaa == "长辈模式") {
 				g = true;
 			} else {
-				g = false;
+				g = false;
+				//g = true;
 			}
 			var style1="";
 			var style2="";

pages/index/index.vue

@@ -427,20 +427,40 @@
 
 		</view>
 		
+		<!-- 新闻 -->
+		<view class="news-title" v-if="chargeList.length > 0">
+			<view class="news-title-left oldTextjp" oldstyle="font-size:20px;">
+				<view class="line" style="margin-top:4px;"></view>充电车辆
+				<view class="lineBox"  v-if="chargeList.length > 1" >{{chargeList.length }}</view>
+			</view>
+		
+			<view class="more oldTextjp2" v-if="false" oldstyle="font-size:16px;"
+			 
+			 @click="toNewsNotice">查看全部<view class="more-icon iconfont"> &#xe600;</view>
+			</view>
+		
+		
+		</view>
 
 		<!-- 充电状态 -->
 		<view class="state1 state" v-if="chargeList.length > 0" v-for="(item,index) in chargeList" :key="item.id"
 			@click="gotoUrl('pages/searchPile/chargeProcess/dcCharging?id=' + item.id)">
 			<view class="state-text">
-				<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
-					{{item.statusText}}	
+				<view class="text-1 " oldstyle="font-size: 20px;">
+					<span v-if="item.carNumber">{{item.carNumber}}</span> 
+				
+					{{item.statusText}}...
 				</view>
-				<view v-if="item.status == '0'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
+				<view v-if="item.status == '0'" class="text-2 " oldstyle="font-size: 16px;">
+					 
 					启动中
 				</view>
-				<view v-if="item.status == '1'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
-					<span v-if="item.carNumber&&chargeList.length>1">{{item.carNumber}}-</span> 
-					已充{{item.dueFee != null ? item.dueFee.toFixed(2) : '0.00'}}元
+				<view v-if="item.status == '1'" class="text-2 " oldstyle="font-size: 16px;">
+					
+					已充
+					<span class="text-21">{{item.electricQuantity?(item.electricQuantity/10000).toFixed(1):'0.0'}}度</span>
+					合计<span class="text-22">{{item.dueFee != null ? item.dueFee.toFixed(2) : '0.00'}}元</span>
+					<view style="display: initial;" v-if="item.endSoc">电量<span class="text-21">{{item.endSoc}}%</span></view>
 				</view>
 				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
 				超出时间将收取占位费
@@ -449,21 +469,23 @@
 					<span v-if="item.waitNum==1">请耐心等待</span>
 					<span v-else >前方等待{{item.waitNum-1}}位</span>
 				</view>
-				<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;">
-				<p style=" width: 160%;">	{{item.stationName}}/{{item.deviceName}}枪{{item.channelNo}}&nbsp;&nbsp;当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
+				<view class="text-3 " oldstyle="font-size: 16px;">
+				<p style=" width: 160%;">{{item.deviceName}}枪{{item.channelNo}}/{{item.stationName}}<br/>当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
 				</view>
 			</view>
-			<view class="img-box" style="height: 110px;">
-				<view class="img-view">点击查看-></view>
+			<view class="img-box4" >
+				
 				<img v-if="item.status == '0'" src="static/img/等待中-缺省页.png">
 				<img v-if="item.status == '1'" src="static/img/充电中-缺省页.png">
 				<img v-if="item.status == '2'" src="static/img/已充满-缺省页.png">
 				<img v-if="item.status == '4'" src="static/img/等待中-缺省页.png">
+				<view class="img-view">
+					<view class="more-icon iconfont">查看 &#xe600;</view>
+					</view>
 				
 			</view>
 		</view>
 
-	
 		
 		<!-- 新闻 -->
 		<view class="news-title" v-if="newsList.length > 0">
@@ -1651,7 +1673,12 @@
 	}
 	
 	.oldTextClassF{
-		
+		.text-2{
+			font-size: 36rpx !important;
+		}
+		.text-3{
+			font-size: 34rpx !important;
+		}
 		.station .price-free .price-1 .num{
 			
 			font-size: 48rpx !important;
@@ -1727,9 +1754,12 @@
 		color: rgba(119, 119, 119, 100);
 	}
 	
-
+.station,.location,.state1{
+	box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
+}
 // 附近站点改版
 .station{
+	
 	width: 91.4%;
 	border-radius: 8px;
 	padding: 12px 12px 12px 11px;
@@ -1921,7 +1951,7 @@
 				margin-top: 11px;
 			}
 		}
-
+		
 		.img-box {
 			width: 120px;
 			height: 120px;
@@ -1929,42 +1959,81 @@
 			
 		}
 	}
-
-	.state1{
-		box-shadow: 3px 3px 10px #888888;
-
+	.img-box4{
+		padding-top: 5px;
+		height: 260rpx;
+		img{
+								 max-width: 100px;
+		}
+		.img-view{
+			color: #0293f0;
+			    float: right;
+					font-size: 10px;
+					margin-top: 3px;
+					 position: relative;
+					bottom: 30rpx;
+					 left: -15px;
+					 .iconfont{
+						 font-size: 14px;
+					 }
+					 
+					 
+		}
 	}
+	 
 	.state {
 		width: 91.4%;
 		background-color: #ffffff;
-		height: 120px;
+		height: 260rpx;
+		min-height:120px;
+		max-height:130px;
 		display: flex;
-		margin: 40rpx auto 0;
+		margin: 20rpx auto 0;
 		border-radius: 8px;
 		border: #F2F4F4 1px;
 
 		.state-text {
-			    min-width: 60%;
-			padding: 48rpx 0 0 56rpx;
-
+			    min-width: 70%;
+			padding: 48rpx 0 0 24rpx;
+			Z-INDEX: 99;
 			.text-1 {
 				height: 16px;
 				line-height: 16px;
-				color: blueviolet;
+				color:  rgba(0, 185, 98, 1);
 				font-size: 16px;
 				text-align: left;
+				font-weight:  bold;
+				span{
+					color:rgba(16, 16, 16, 1);
+					margin-right: 12rpx;
+					
+				}
 			}
 
 			.text-2 {
+				    width: 160%;
 				height: 17px;
 				line-height: 17px;
 				color: #101010;
 				text-align: left;
 				margin-top: 12px;
+				span{
+					font-weight:  bold;
+					margin-right: 6rpx;
+					margin-left: 6rpx;
+				}
+				.text-21{
+					
+					color:  rgba(0, 185, 98, 1);
+				}
+				.text-22{
+					
+					color: #ed7847;
+				}
 			}
 
 			.text-3 {
-				font-size: 12px;
+				font-size: 14px;
 				line-height: 20px;
 				margin-top: 6px;
 				color: #999999;
@@ -1976,12 +2045,7 @@
 			width: 120px;
 			height: 120px;
 			margin-right: 20px;
-			.img-view{
-				color: #0293f0;
-				    float: right;
-						font-size: 10px;
-						margin-top: 3px;
-			}
+			
 		}
 	}
 
@@ -2064,7 +2128,14 @@
 	}
 		
 	}
-
+	.lineBox{
+		background-color: rgba(0, 145, 67, 100);
+		padding:  0px 3px;
+		background-color: rgba(0, 185, 98, 1);
+		color: rgba(255, 255, 255, 1);
+		margin-left: 6px;
+		border-radius: 3px;
+	}
 	// 小竖线
 	.line {
 		display: inline-block;

pages/record/details.vue

@@ -27,7 +27,7 @@
 			<view id="pieEcharts" style="min-height:240px;">
 			
 			</view>
-			<view style="color:#9e9e9e">注：充电时间每5分钟获取一次数据</view>
+			<view style="color:#9e9e9e;margin-top: 4px;">注：充电时间每5分钟获取一次数据</view>
 		</view>
 		<view class="details">
 			<view class="details-title">
@@ -203,9 +203,9 @@
 				  grid: {
 					
 				   
-				    left: '13%',
-				    right: '13%',
-				    bottom: '13%',
+				    left: '8%',
+				    right: '10%',
+				    bottom: '10%',
 				  //  containLabel: true
 				  },
 				 
@@ -257,7 +257,7 @@
 						max:max,
 						min:0,
 				      axisLine: {
-				        show: false,
+				        show: true,
 				        lineStyle: {
 				          color: colors[1]
 				        }
@@ -272,17 +272,20 @@
 				    {
 				      name: 'SOC',
 				      type: 'line',
+					  symbolSize:3,
 				      data: seriesList1
 				    },
 				    {
 				      name: '功率',
 				      type: 'line',
+					   symbolSize:3,
 				      yAxisIndex: 1,
 				      data: seriesList2
 				    },
 				    {
 				      name: '温度',
 				      type: 'line',
+					   symbolSize:3,
 				      yAxisIndex: 0,
 				      data: seriesList3
 				    }

pages/searchPile/searchPile.vue

@@ -1558,6 +1558,10 @@ export default {
 	// width:125rpx;
   }
 
+.charing-slow{
+	box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
+}
+
 .swiper-item{
  }