|
@@ -48,7 +48,8 @@
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
+ <view style="height:50px"></view>
|
|
|
<!-- 站点 -->
|
|
|
<view class="station" v-if="message == 'getLocation:ok' && chargeList.length == 0" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
|
|
|
<view class="img-box">
|
|
@@ -81,7 +82,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 定位 -->
|
|
|
- <view class="location-box" v-if="message != 'getLocation:ok'">
|
|
|
+ <view class="location-box" v-if="message != 'getLocation:ok' && chargeList.length == 0">
|
|
|
<view class="location">
|
|
|
<view class="location-text">
|
|
|
<view class="text-1">
|
|
@@ -108,8 +109,8 @@
|
|
|
<view class="text-1">
|
|
|
{{item.statusText}}
|
|
|
</view>
|
|
|
- <view v-if="item.status == '4'" class="text-2">
|
|
|
- 前方等待2位
|
|
|
+ <view v-if="item.status == '0'" class="text-2">
|
|
|
+ 启动中
|
|
|
</view>
|
|
|
<view v-if="item.status == '1'" class="text-2">
|
|
|
已充{{item.dueFee != null ? item.dueFee : '0.00'}}元
|
|
@@ -117,14 +118,18 @@
|
|
|
<view v-if="item.status == '2'" class="text-2" style="color: red;">
|
|
|
超出时间将收取占位费
|
|
|
</view>
|
|
|
+ <view v-if="item.status == '4'" class="text-2">
|
|
|
+ 前方等待{{item.waitNum}}位
|
|
|
+ </view>
|
|
|
<view class="text-3">
|
|
|
- {{item.stationName}}/{{item.deviceNo}}
|
|
|
+ {{item.deviceName}}/<br />{{item.deviceNo}}
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="img-box">
|
|
|
- <img v-if="item.status == '4'" src="static/img/等待中-缺省页.png">
|
|
|
+ <img v-if="item.status == '0'" src="static/img/等待中-缺省页.png">
|
|
|
<img v-if="item.status == '1'" src="static/img/充电中-缺省页.png">
|
|
|
<img v-if="item.status == '2'" src="static/img/已充满-缺省页.png">
|
|
|
+ <img v-if="item.status == '4'" src="static/img/等待中-缺省页.png">
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- <view class="state2 state">
|
|
@@ -280,8 +285,16 @@
|
|
|
mask: true,
|
|
|
})
|
|
|
|
|
|
- API.findChargeData().then((res) => {
|
|
|
- uni.hideLoading()
|
|
|
+ API.findChargeData().then((res) => {
|
|
|
+ uni.hideLoading();
|
|
|
+ // var list1 = res.data.chargingRecordList;
|
|
|
+ // var list2 = [];
|
|
|
+ // for(var i=0;i<list1.length;i++) {
|
|
|
+ // if(list1[i].status != '0') {
|
|
|
+ // list2.push(list1[i]);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // this.chargeList = list2;
|
|
|
this.chargeList = res.data.chargingRecordList;
|
|
|
}).catch(error => {
|
|
|
uni.showToast({
|
|
@@ -500,9 +513,8 @@
|
|
|
.station {
|
|
|
width:91.4%;
|
|
|
height: 120px;
|
|
|
- margin-top: 70px auto 0 ;
|
|
|
+ margin-top: 20px auto 0 ;
|
|
|
padding-top: 20px;
|
|
|
- padding: 0 12px;
|
|
|
position: relative;
|
|
|
|
|
|
.img-box {
|
|
@@ -616,6 +628,7 @@
|
|
|
width: 100%;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
+ padding: 0 5px;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -628,7 +641,7 @@
|
|
|
background-color: #ffffff;
|
|
|
height: 120px;
|
|
|
display: flex;
|
|
|
- margin: 70px auto 0;
|
|
|
+ margin: 20px auto 0;
|
|
|
border-radius: 8px;
|
|
|
border: #F2F4F4 1px;
|
|
|
|
|
@@ -672,12 +685,13 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
.state{
|
|
|
width: 91.4%;
|
|
|
background-color: #ffffff;
|
|
|
height: 120px;
|
|
|
display: flex;
|
|
|
- margin: 70px auto 0;
|
|
|
+ margin: 20px auto 0;
|
|
|
border-radius: 8px;
|
|
|
border: #F2F4F4 1px;
|
|
|
.state-text{
|
|
@@ -700,7 +714,7 @@
|
|
|
|
|
|
.text-3 {
|
|
|
font-size: 12px;
|
|
|
- text-align: center;
|
|
|
+ line-height: 20px;
|
|
|
margin-top: 6px;
|
|
|
color: #999999;
|
|
|
}
|