|
|
@@ -1,8 +1,8 @@
|
|
|
<template>
|
|
|
<view>
|
|
|
<view v-if="chargingRecord.status==2" style="background-color: #fff; " >
|
|
|
- <ujp-navbar title="充电结束">
|
|
|
- </ujp-navbar>
|
|
|
+ <u-navbar title="充电结束">
|
|
|
+ </u-navbar>
|
|
|
<view class="progress-bar2">
|
|
|
<u-circle-progress width="300" active-color="green" duration='20' :percent="100" border-width="20">
|
|
|
<view class="u-progress-content">
|
|
|
@@ -13,7 +13,7 @@
|
|
|
</text>
|
|
|
|
|
|
<text class='u-progress-info' v-if="chargingGun.gunType==2">
|
|
|
- <p style="text-align: center;">{{chargingRecord.electricQuantity/10000}}</p>
|
|
|
+ <p style="text-align: center;">{{chargingRecord.electricQuantity?(chargingRecord.electricQuantity/10000).toFixed(1):0}}</p>
|
|
|
<p class="progress-text">已充电量(度)</p>
|
|
|
</text>
|
|
|
|
|
|
@@ -156,7 +156,16 @@
|
|
|
|
|
|
<view style="background-color: #fff; padding-bottom: 0px;"
|
|
|
class="progress-bar-main" v-else>
|
|
|
-
|
|
|
+
|
|
|
+ <u-modal v-model="descriptionShow2do"
|
|
|
+ confirm-text="知道了"
|
|
|
+ title="【充电SOC限制】" >
|
|
|
+ <view style="padding: 10px;font-size: 14px;">
|
|
|
+ 为保障充电安全，并积极响应主管部门对新能源汽车充电安全工作，从即日起，该站充电设施SOC上限阈值为95%，即充电量达到满充电量95%时，充电设施将自动结束充电。
|
|
|
+ </view>
|
|
|
+ </u-modal>
|
|
|
+
|
|
|
+
|
|
|
<u-modal v-model="showVin" class="showOss" @cancel="confirm()"
|
|
|
confirm-text="继续充电" cancel-text="结束充电"
|
|
|
:show-title="false" :show-cancel-button="true" >
|
|
|
@@ -173,15 +182,24 @@
|
|
|
</u-modal>
|
|
|
|
|
|
<view>
|
|
|
- <ujp-navbar title="充电中">
|
|
|
+ <u-navbar title="充电中">
|
|
|
<view class="to-recharge" @click="gotoUrl('pages/user/finance/recharge')">
|
|
|
去充值
|
|
|
</view>
|
|
|
- </ujp-navbar>
|
|
|
+ </u-navbar>
|
|
|
+
|
|
|
+ <u-alert-tips type="warning"
|
|
|
+ v-if="chargingGun.gunType==1"
|
|
|
+ :descStyle="{
|
|
|
+ fontSize: '14px',
|
|
|
+ color: '#ef7a30',
|
|
|
+ }" @click="alerttipsCk2"
|
|
|
+ :show-icon="true" description="【充电SOC限制】充电量达到满充电量95%时，充电设施将自动结束充电。点击查看详情>"></u-alert-tips>
|
|
|
+
|
|
|
<!-- 充电状态 -->
|
|
|
<view class="charge-state">
|
|
|
<view class="progress-bar">
|
|
|
- <u-circle-progress width="440" active-color="#53b56b" :percent="percent?percent:percentValue" border-width="35">
|
|
|
+ <u-circle-progress width="400" active-color="#53b56b" :percent="percent?percent:percentValue" border-width="35">
|
|
|
|
|
|
|
|
|
<view class="u-progress-content" v-if="chargingRecord.status==4">
|
|
|
@@ -206,7 +224,7 @@
|
|
|
|
|
|
>{{chargingRecord.statusText}}</view>
|
|
|
<view style="
|
|
|
- font-size: 16px;
|
|
|
+ font-size: 14px;
|
|
|
font-weight: bold;
|
|
|
" >预计费用{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元</view>
|
|
|
</text>
|
|
|
@@ -252,7 +270,7 @@
|
|
|
</view>
|
|
|
<view class="info-item">
|
|
|
<view class="content">
|
|
|
- {{chargingGun.kwh}}
|
|
|
+ {{chargingGun.kwh?chargingGun.kwh.toFixed(1):0}}
|
|
|
</view>
|
|
|
<view class="name">
|
|
|
已充电量(度)
|
|
|
@@ -287,7 +305,7 @@
|
|
|
width: 100%;
|
|
|
" @click="parkingTips=true">
|
|
|
停车费说明 <u-icon name="arrow-right" style="
|
|
|
- float: right;" size="28"></u-icon>
|
|
|
+ float: right;margin-top: 6px;" size="28"></u-icon>
|
|
|
</view>
|
|
|
|
|
|
|
|
|
@@ -346,7 +364,7 @@
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="title">
|
|
|
- 站点
|
|
|
+ 充电站点
|
|
|
</view>
|
|
|
<view class="detail">
|
|
|
{{chargingRecord.stationName}}
|
|
|
@@ -354,17 +372,19 @@
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
-
|
|
|
- <view class="item" >
|
|
|
- <view class="title">
|
|
|
- 费用说明
|
|
|
- </view>
|
|
|
- <view class="detail" @click="gotoUrl('pages/searchPile/stationAndPile/chargePriceDetails?stationId='+chargingGun.stationId+'&deviceNo='+chargingGun.deviceNo)">
|
|
|
-
|
|
|
- <u-icon name="arrow-right" size="28"></u-icon>
|
|
|
-
|
|
|
- </view>
|
|
|
+ <view class="item" >
|
|
|
+
|
|
|
+ <view class="title" style="
|
|
|
+ width: 100%;
|
|
|
+ " @click="gotoUrl('pages/searchPile/stationAndPile/chargePriceDetails?stationId='+chargingGun.stationId+'&deviceNo='+chargingGun.deviceNo)" >
|
|
|
+ 充电价格详情
|
|
|
+ <u-icon name="arrow-right" style="
|
|
|
+ float: right;margin-top: 6px;" size="28"></u-icon>
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
</view>
|
|
|
+
|
|
|
|
|
|
</view>
|
|
|
|
|
|
@@ -641,6 +661,7 @@
|
|
|
parkingTips:false,
|
|
|
showVin:false,
|
|
|
showVinBl:false,
|
|
|
+ descriptionShow2do:false,
|
|
|
}
|
|
|
},
|
|
|
onLoad(op) {
|
|
|
@@ -698,7 +719,11 @@
|
|
|
return false
|
|
|
}
|
|
|
},
|
|
|
- methods: {
|
|
|
+ methods: {
|
|
|
+
|
|
|
+ alerttipsCk2(){
|
|
|
+ this.descriptionShow2do=true;
|
|
|
+ },
|
|
|
vinCk(){
|
|
|
|
|
|
if(this.userCard&&this.userCard.vin&&this.chargingGun&&this.chargingGun.vin){
|
|
|
@@ -1060,7 +1085,7 @@
|
|
|
.progress-bar {
|
|
|
|
|
|
text-align: center;
|
|
|
- margin-top: 20px;
|
|
|
+ // margin-top: 20px;
|
|
|
/deep/.u-circle-progress {
|
|
|
|
|
|
position: relative;
|
|
|
@@ -1097,7 +1122,7 @@
|
|
|
}
|
|
|
|
|
|
/deep/.u-circle-progress[data-v-cab6fc66] {
|
|
|
- margin: 30px;
|
|
|
+ margin: 40rpx;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -1312,7 +1337,7 @@
|
|
|
}
|
|
|
|
|
|
/deep/.u-circle-progress[data-v-cab6fc66] {
|
|
|
- margin: 30px;
|
|
|
+ margin: 40rpx;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -1422,7 +1447,7 @@
|
|
|
background-color: #ffffff;
|
|
|
width: 88.2%;
|
|
|
padding: 20px 10px 4px 7px;
|
|
|
- margin: 24px auto 0;
|
|
|
+ margin: 40rpx auto 0;
|
|
|
box-shadow: 0px 2px 8px 0px #1A095A34;
|
|
|
border-radius: 12px;
|
|
|
display: flex;
|
|
|
@@ -1442,9 +1467,9 @@
|
|
|
}
|
|
|
|
|
|
.name {
|
|
|
- line-height: 22px;
|
|
|
+ line-height: 44rpx;
|
|
|
color: rgba(119, 119, 119, 100);
|
|
|
- font-size: 16px;
|
|
|
+ font-size: 32rpx;
|
|
|
|
|
|
}
|
|
|
}
|
zkx