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

pages/index/index.vue

@@ -81,7 +81,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">
@@ -109,7 +109,7 @@
 		 		{{item.statusText}}
 		 	</view>
 			<view v-if="item.status == '4'" class="text-2">
-				前方等待2位
+				前方等待{{item.waitNum}}位
 			</view>
 			<view v-if="item.status == '1'" class="text-2">
 				已充{{item.dueFee != null ? item.dueFee : '0.00'}}元
@@ -118,7 +118,7 @@
 				超出时间将收取占位费
 			</view>
 			<view class="text-3">
-				{{item.stationName}}/{{item.deviceNo}}
+				{{item.deviceName}}/{{item.deviceNo}}
 			</view>
 		 </view>
 	 	<view class="img-box">

pages/user/finance/balance.vue

@@ -1,6 +1,10 @@
 <template>
 	<view>
-		<u-navbar title="我的余额"></u-navbar>
+		<u-navbar title="我的余额">
+			<view class="slot-wrap">
+				<span class="navBtn" @click="toRefundList">退费</span>
+			</view>
+		</u-navbar>
 		<view class="balance">
 			<view class="balanceHead">
 				<view class="balanceCard">
@@ -82,6 +86,11 @@
 			this.getAccountRecordData();
 		},
 		methods: {
+			toRefundList() {
+				uni.navigateTo({
+					url: '/pages/user/finance/refundList'
+				})
+			},
 			getAccountRecordData() {
 				uni.showLoading({
 					title: "加载中",
@@ -133,6 +142,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.slot-wrap{
+		flex: 1;
+	}
+	.navBtn{
+		float: right;
+		margin-right: 15px;
+		color:#3fbd70;
+	}
 	.carNone{
 		display: flex;
 		flex-direction: column;