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

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/charge.vue

@@ -18,7 +18,7 @@
 				<view style="color: rgba(153, 153, 153, 100);
 				font-size: 12px;
 				text-align: left;
-				font-family: AlibabaPuHui-regular;">*金额范围为1元-500元</view>
+				font-family: AlibabaPuHui-regular;"><span style="color:red">*</span>充电金额输入范围为1元-500元的整数。实际充电金额与所选金额会略有出入（一般误差约几分钱），最终结算金额将以实际充入电量为准。</view>
 
 			</view>
 			<p>其他充电模式</p>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -8,12 +8,12 @@
 					<view class="u-progress-content">
 						 
 						<text class='u-progress-info' v-if="chargingGun.gunType==1">
-							{{chargingRecord.endSoc}}%
+							<p style="text-align: center;">{{chargingRecord.endSoc}}%</p>
 							<p class="progress-text">当前电量</p>
 						</text>
 						
 						<text class='u-progress-info' v-if="chargingGun.gunType==2">
-							{{chargingRecord.electricQuantity/10000}}
+							<p style="text-align: center;">{{chargingRecord.electricQuantity/10000}}</p>
 							<p class="progress-text">已充电量(度)</p>
 						</text>
 						
@@ -41,6 +41,7 @@
 					</view>
 				</view>
 			</view>
+			
 			<view 
 			 v-if="chargingRecord.remark"
 			style="
@@ -48,7 +49,18 @@
 				text-align: center;
 			">
 				结束原因：{{chargingRecord.remark}}
-			</view>
+			</view>
+			<view
+			
+			style="
+				margin-top: 20px;
+				text-align: center;
+				padding: 0 65px;
+				color:#9e9e9e;
+			">
+				<span style="color: red;">*</span>实际充电金额与所选金额会略有出入，最终结算金额将以实际充入电量为准。
+			</view>
+			
 			<view class="bottom">
 				<u-button size="default" shape="circle" @click="gotoMain(0)"  >返回首页</u-button>
 				<u-button size="default" shape="circle" @click="gotoMain(1)">查看订单详情</u-button>
@@ -163,7 +175,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 +408,7 @@
 <style>
 	page {
 		background: #fff;
+		padding-bottom: 50px;
 	}
 </style>
 <style lang="scss" scoped>
@@ -564,7 +577,9 @@
 	}
 
 	.bottom2 {
-		width: 91.4%;
+	
+		padding: 12px 20px;
+		background-color: #fff;
 		position: fixed;
 		bottom: 0;
 		left: 0;

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -140,7 +140,7 @@
 								 
 									this.onShowRole = true
 									uni.navigateTo({
-										url: "/pages/user/car/carAdd?code=jp_team51_charge_id:A_" + id
+										url: "/pages/user/car/carDet?code=jp_team51_charge_id:A_" + id
 									})
 								} else if (res.cancel) {
 									console.log('用户点击取消');