wkyy %!s(int64=3) %!d(string=hai) anos
pai
achega
e8c4bbd6cb

+ 16 - 11
pages/index/index.vue

@@ -109,8 +109,8 @@
 		 	<view class="text-1">
 		 		{{item.statusText}}
 		 	</view>
-			<view v-if="item.status == '4'" class="text-2">
-				前方等待{{item.waitNum}}位
+			<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'}}元
@@ -118,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.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">
@@ -283,14 +287,15 @@
 				
 				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;
+					// 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({
 						title: error,

+ 1 - 1
pages/record/index.vue

@@ -9,7 +9,7 @@
 				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
 			<view class="carNone" v-if="chargeList.length == 0">
-				<img src="static/img/none2.svg" alt="">
+				<img src="static/img/暂无数据-缺省页.png" alt="">
 				<p>暂无充电订单</p>
 			</view>
 			<view class="recordList" v-if="chargeList.length > 0">

+ 4 - 4
pages/user/finance/balance.vue

@@ -39,10 +39,6 @@
 						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 					</view>
 				</view>
-				<view class="carNone" v-if="accountList.length == 0">
-					<img src="static/img/none2.svg" alt="">
-					<p>暂无充值记录</p>
-				</view>
 				<view class="balanceMain-list" v-if="accountList.length > 0">
 					<view class="balanceMain-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
 						<view class="title">
@@ -53,6 +49,10 @@
 					</view>
 				</view>
 			</view>
+			<view class="carNone" v-if="accountList.length == 0">
+				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<p>本月暂无充值记录</p>
+			</view>
 		</view>	
 	</view>
 </template>

+ 1 - 1
pages/user/finance/rechargeList.vue

@@ -7,7 +7,7 @@
 			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 		</view>
 		<view class="carNone" v-if="accountList.length == 0">
-			<img src="static/img/none2.svg" alt="">
+			<img src="static/img/暂无数据-缺省页.png" alt="">
 			<p>暂无充值记录</p>
 		</view>
 		<view class="rechargeList" v-if="accountList.length > 0">