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

pages/index/index.vue

@@ -500,9 +500,7 @@
 	.station {
 		width:91.4%;
 		height: 120px;
-		margin-top: 70px;
-
-
+		margin-top: 70px auto 0 ;
 		padding-top: 20px;
 		padding: 0 12px;
 		position: relative;
@@ -615,7 +613,7 @@
 			// 数量
 			.count {
 				margin-top: 12px !important;
-				width: 96%;
+				width: 100%;
 				display: flex;
 				justify-content: space-between;
 			}

pages/record/index.vue

@@ -8,6 +8,10 @@
 				<p>{{month}}月</p>
 				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
+			<view class="carNone" v-if="chargeList.length == 0">
+				<img src="static/img/none2.svg" alt="">
+				<p>暂无充电订单</p>
+			</view>
 			<view class="recordList" v-if="chargeList.length > 0">
 				<view class="recordList-item" v-for="(item,index) in chargeList" :key="item.id" @click="gotoUrl('pages/record/details?id=' + item.id)">
 					<view class="recordList-name">
@@ -111,6 +115,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
 	.recordTime{
 		height: 44px;
 		background-color: #fff;

pages/searchPile/chargeProcess/dcCharging.vue

@@ -308,7 +308,7 @@
 					this.chargingRecord = res.data.chargingRecord
 
 					this.chargingGun = res.data.chargingGun
-					this.waitNum=res.data.waitNum;
+					this.waitNum=res.data.chargingRecord.waitNum;
 					this.isReady = true;
 					//直流
 					if(this.chargingGun.gunType==1){
@@ -333,6 +333,7 @@
 							
 						}else{
 							time=3000;
+							this.init();
 						}
 						setTimeout(()=>{
 							this.getInfo();
@@ -441,7 +442,7 @@
 		}
 
 		.u-progress-info {
-			font-size: 36px;
+			font-size: 26px;
 			padding-left: 16rpx;
 			letter-spacing: 2rpx;
 			color: rgba(51, 51, 51, 100);

pages/user/finance/balance.vue

@@ -35,6 +35,10 @@
 						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 					</view>
 				</view>
+				<view class="carNone" v-if="accountList.length == 0">
+					<img src="static/img/none2.svg" alt="">
+					<p>暂无充值记录</p>
+				</view>
 				<view class="balanceMain-list" v-if="accountList.length > 0">
 					<view class="balanceMain-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
 						<view class="title">
@@ -129,6 +133,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
 	.balanceHead{
 		background-color: #fff;
 		padding: 16px;

pages/user/finance/rechargeList.vue

@@ -6,6 +6,10 @@
 			<span>{{month}}月</span>
 			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 		</view>
+		<view class="carNone" v-if="accountList.length == 0">
+			<img src="static/img/none2.svg" alt="">
+			<p>暂无充值记录</p>
+		</view>
 		<view class="rechargeList" v-if="accountList.length > 0">
 			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
 				<view class="rechargeList-row"><span>充值金额</span><h4>{{item.amount}}</h4></view>
@@ -93,6 +97,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
 	.rechargeTime{
 		background-color: #fff;
 		height: 44px;