1

pages/searchPile/chargeProcess/dcCharging.vue

@@ -6,7 +6,7 @@
 			<view class="progress-bar2">
 				<u-circle-progress width="400" active-color="green" duration='20'  :percent="100" border-width="20">
 					<view class="u-progress-content">
-						<!-- <view class="u-progress-dot"></view> -->
+						 
 						<text class='u-progress-info' v-if="chargingGun.gunType==1">
 							{{chargingRecord.endSoc}}%
 							<p class="progress-text">当前电量</p>
@@ -55,7 +55,7 @@
 			</view>
 		</view>
 
-		<view style="background-color: #fff; padding-bottom: 40px;" v-else>
+		<view style="background-color: #fff; padding-bottom: 60px;" v-else>
 			<u-navbar title="充电详情">
 			</u-navbar>
 			<view class="iconfont tittle-font" @click="show = true">
@@ -70,11 +70,11 @@
 						<text class='u-progress-info'>前方等待{{waitNum}}位</text>
 					</view>
 					<view class="u-progress-content" v-else-if="chargingGun.gunType==1">
-						<!-- <view class="u-progress-dot"></view> -->
+						
 						<text class='u-progress-info'>{{percent}}%</text>
 					</view>
 					<view class="u-progress-content" v-else-if="chargingGun.gunType==2">
-						<!-- <view class="u-progress-dot"></view> -->
+						
 						<text class='u-progress-info'>{{chargingRecord.statusText}}...</text>
 					</view>
 					<view class="bot"></view>
@@ -123,7 +123,7 @@
 				<view class="line"></view>
 				<view>
 					<view class="power-num">
-						{{chargingGun.power?chargingGun.power:0}}kW
+						{{chargingRecord.chargingPower?chargingRecord.chargingPower/1000:0}}kW
 					</view>
 					<view class="power-text">
 						功率
@@ -163,7 +163,7 @@
 					停止充电后30分钟即开始收取占位费用，1元/分钟
 				</view>
 			</view>
-			<view class="bottom2">
+			<view class="bottom2" style="    margin-bottom: 20px;">
 				<u-button type="primary"  @click="submit"
 				 :style="chargingRecord.status==1?'background-color: #00b962':'background-color: #9be6c2;'"
 				 shape="circle" >结束充电</u-button>
@@ -284,7 +284,6 @@
 				API.personalCenter().then((res) => {
 					this.detail = res.data
 					 
-			
 				}).catch(error => {
 					uni.showToast({
 						title: error
@@ -335,11 +334,12 @@
 							time=3000;
 							this.init();
 						}
+						
 						setTimeout(()=>{
 							this.getInfo();
 						},time)
 					}
-					//uni.hideLoading()
+					uni.hideLoading()
 
 				}).catch(error => {
 					uni.showToast({
@@ -376,7 +376,9 @@
 				})
 			
 				//this.submitForm.deviceNo = this.detail.deviceNo;
-				API.stopCarCharging(this.submitForm).then((res) => {
+				API.stopCarCharging({
+					chargingRecordId:this.chargingRecord.id
+				}).then((res) => {
 					this.getInfo()
 				}).catch(error => {
 					
@@ -427,8 +429,8 @@
 		/deep/.u-circle-progress {
 			margin-left: 23.3% !important;
 			position: relative;
-			min-width:220px;
-			min-height: 220px;
+			// min-width:220px;
+			// min-height: 220px;
 		}
 
 		.u-progress-content {
@@ -562,7 +564,7 @@
 	}
 
 	.bottom2 {
-		width: 343px;
+		width: 91.4%;
 		position: fixed;
 		bottom: 0;
 		left: 0;
@@ -643,7 +645,7 @@
 
 	.bottom {
 		display: flex;
-		width: 343px;
+		width: 91.4%;
 		padding: 12px 16px;
 		position: fixed;
 		bottom: 0;
@@ -653,7 +655,7 @@
 
 		.u-size-default {
 			border: 1px solid rgba(0, 185, 98, 100);
-			color: #00b962;
+			color: #00b962;	
 			width: 44%;
 		}
 	}