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

pages/record/index.vue

@@ -22,7 +22,7 @@
 						<p>开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
 					</view>
 					<view class="recordList-row">
-						<p>充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}kW-h</p>
+						<p>充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
 					</view>
 					<view class="recordList-row">
 						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -163,7 +163,7 @@
 					停止充电后30分钟即开始收取占位费用，1元/分钟
 				</view>
 			</view>
-			<view class="bottom2" style="    margin-bottom: 20px;">
+			<view class="bottom2" >
 				<u-button type="primary"  @click="submit"
 				 :style="chargingRecord.status==1?'background-color: #00b962':'background-color: #9be6c2;'"
 				 shape="circle" >结束充电</u-button>
@@ -396,6 +396,7 @@
 <style>
 	page {
 		background: #fff;
+		padding-bottom: 50px;
 	}
 </style>
 <style lang="scss" scoped>
@@ -564,7 +565,9 @@
 	}
 
 	.bottom2 {
-		width: 91.4%;
+	
+		padding: 12px 20px;
+		background-color: #fff;
 		position: fixed;
 		bottom: 0;
 		left: 0;