Browse Source

首页真实数据

aleyds 4 years ago
parent
commit
f0d0fc02c9
3 changed files with 41 additions and 36 deletions
  1. 1 1
      common/apiurl.js
  2. 39 34
      pages/index/index.vue
  3. 1 1
      pages/myCars/myCars.vue

+ 1 - 1
common/apiurl.js

@@ -20,7 +20,7 @@ const apiurl = {
 	// 微信支付 在pay.js中使用
 	// 微信支付 在pay.js中使用
 	wxPayUrl:'/wechat/pay',
 	wxPayUrl:'/wechat/pay',
 	// 客户端首页
 	// 客户端首页
-	getIndexDataUrl:'/index/client',
+	getIndexDataUrl:'/index',
 	
 	
 	// 用户车辆
 	// 用户车辆
 	mycarsUrl:'/membervehicle',
 	mycarsUrl:'/membervehicle',

+ 39 - 34
pages/index/index.vue

@@ -41,45 +41,48 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</u-card>
 		</u-card>
-		
-		<u-card :show-foot="false" border-radius="16" margin="20rpx 40rpx" padding="30">
-			<view class="pending-order-head" slot="head">
-				<view class="pending-order-head-left"><b>P</b>甜蜜小镇D18组团停车场</view>
-				<view class="pending-order-head-right" @click="orderDetails"><u-icon class="arrow-down" name="arrow-down" size="32"></u-icon></view>
-			</view>
-			<view class="pending-order-body" slot="body">
-				<view class="pending-order-body-nav">
-					<view class="nav-item nav-manual" @click="orderNav=0" :class="{active:orderNav==0}">手动缴费</view>
-					<view class="nav-item nav-auto" @click="orderNav=1" :class="{active:orderNav==1}">无感支付</view>
+
+		<template v-for="(item, index) in orderList">
+			<u-card :show-foot="false" border-radius="16" margin="20rpx 40rpx" padding="30">
+				<view class="pending-order-head" slot="head">
+					<view class="pending-order-head-left"><b>P</b>{{item.roadName}}</view>
+					<view class="pending-order-head-right" @click="orderDetails"><u-icon class="arrow-down" name="arrow-down" size="32"></u-icon></view>
 				</view>
 				</view>
-				<view class="pending-order-body-wrap" v-show="orderNav==0">
-					<view class="pending-order-body-left">
-						<view class="car-number">贵A37W45</view>
-						<view class="duration">
-							<span class="pending-order-body-left-label">停车时长</span>
-							<span>01:30:25</span>
+				<view class="pending-order-body" slot="body">
+					<!-- <view class="pending-order-body-nav">
+						<view class="nav-item nav-manual" @click="orderNav=0" :class="{active:orderNav==0}">手动缴费</view>
+						<view class="nav-item nav-auto" @click="orderNav=1" :class="{active:orderNav==1}">无感支付</view>
+					</view> -->
+					<view class="pending-order-body-wrap" v-show="orderNav==0">
+						<view class="pending-order-body-left">
+							<view class="car-number">{{item.vehicleNo}}</view>
+							<view class="duration">
+								<span class="pending-order-body-left-label">停车时长:</span>
+								<span>{{item.duration}}</span>
+							</view>
 						</view>
 						</view>
-					</view>
-					<view class="pending-order-body-right">
-						<view class="order">订单号:5222021022300045</view>
-						<view class="cost">
-							<span class="pending-order-body-left-label">停车费用</span>
-							<span>
-								<span class="number">10.25</span>
-								元
-							</span>
+						<view class="pending-order-body-right">
+							<view class="order">订单号:{{item.id}}</view>
+							<view class="cost">
+								<span class="pending-order-body-left-label">停车费用:</span>
+								<span>
+									<span class="number">¥{{item.payAmount}}</span>
+									元
+								</span>
+							</view>
+						</view>	
+						<view class="go-pay-wrap">
+							<view class="go-pay" @click="handlewxpay">去支付</view>
 						</view>
 						</view>
-					</view>	
-					<view class="go-pay-wrap">
-						<view class="go-pay" @click="handlewxpay">去支付</view>
+						
+					</view>
+					<view class="pending-order-body-wrap" v-show="orderNav==1">
+						
 					</view>
 					</view>
-					
-				</view>
-				<view class="pending-order-body-wrap" v-show="orderNav==1">
-					
 				</view>
 				</view>
-			</view>
-		</u-card>
+			</u-card>
+		</template>
+		
 		
 		
 		<u-modal 
 		<u-modal 
 			v-model="bindCarShow" 
 			v-model="bindCarShow" 
@@ -112,6 +115,7 @@
 				bannerList:[
 				bannerList:[
 					{image: '/static/img/index-banner01.png',title: ''}
 					{image: '/static/img/index-banner01.png',title: ''}
 				],
 				],
+				orderList:[],
 				cityOpen:false,
 				cityOpen:false,
 				pendingOrder:[],
 				pendingOrder:[],
 				code:null,//微信code
 				code:null,//微信code
@@ -161,6 +165,7 @@
 					if(res.data.vehicleList.length<1){
 					if(res.data.vehicleList.length<1){
 						this.bindCarShow = true;
 						this.bindCarShow = true;
 					}
 					}
+					this.orderList = res.data.orderList;
 				}).catch(err=>{
 				}).catch(err=>{
 					alert(err.msg);
 					alert(err.msg);
 					console.log('getIndexData err',err)
 					console.log('getIndexData err',err)

+ 1 - 1
pages/myCars/myCars.vue

@@ -41,7 +41,7 @@
 				delCarshow:false,
 				delCarshow:false,
 				delCarId:null,
 				delCarId:null,
 				delCarContent:'',
 				delCarContent:'',
-				newPlateNumber:'贵A44555',
+				newPlateNumber:'贵AF113Z',
 				vehicleColor:0,
 				vehicleColor:0,
 				mycars:[],
 				mycars:[],
 				mycarsTotal:0,
 				mycarsTotal:0,