auto commit

pages/getout/getoutpage/getoutpage.scss

@@ -1,6 +1,6 @@
 .car-info{
 	margin-top: 20rpx;
-	margin-bottom: 33rpx;
+	padding: 40rpx;
 	.car-info-img{
 		width: 220rpx;
 		height: 287rpx;;
@@ -46,20 +46,23 @@
 	}
 }
 .parking-info{
-	background: #EDF6FF;
+	border-top: 20rpx solid #F4F4F4;
+	// background: #EDF6FF;
 	border-radius: 10rpx;
-	padding: 30rpx;
+	padding: 40rpx;
 	.parking-info-item{
+		padding: 22rpx 0 18rpx;
+		border-bottom: 1px solid #EAEAEA;
 		margin-bottom: 9rpx;
 		font-size: 36rpx;
 		font-weight: 400;
-		color: #63717F;
+		color: #818181;
 		line-height: 50rpx;
 		letter-spacing: 1px;
 	}
 }
 .bottom-btn-box{
-	bottom: 194rpx;
+	bottom: 60rpx;
 }
 
 .orderDetails{

pages/getout/getoutpage/getoutpage.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="wrap">
+	<view class="">
 		<view class="car-info u-flex">
 			<view class="car-info-img">
 				<u-image :src="vehicleImage" mode="aspectFit" width="100%" height="100%"></u-image>
@@ -10,18 +10,19 @@
 					<view class="position">车位：{{orderSpaceName}}</view>
 				</view>
 				<!-- <view class="text-item" style="color: #3192FB;">临时卡</view> -->
-				<view class="text-item u-flex u-flex u-row-between">
+				<!-- <view class="text-item u-flex u-flex u-row-between">
 					<view class="">余额：<span class="balance">暂无</span></view>
-					<!-- <view class="recharge" @click="$refs.uToast.show({title: '建设中'})">充值</view> -->
-				</view>
-				<view class="text-item">类型：小车（计时）</view>
+					<view class="recharge" @click="$refs.uToast.show({title: '建设中'})">充值</view>
+				</view> -->
+				<view class="text-item">类型：{{vehicleType|filterCarType}}</view>
 			</view>
 		</view>
 		<view class="parking-info">
 			<view class="parking-info-item">进场时间：{{orderInTime}}</view>
 			<view class="parking-info-item">出场时间：{{orderOutTime}}</view>
 			<view class="parking-info-item">停车时长：{{frontDuration}}</view>
-			<view class="parking-info-item">进场押金：0.0元</view>
+			<view class="parking-info-item">本次应收：<span class="u-type-primary">{{totalAmount}}元</span></view>
+			<view class="parking-info-item">历史欠费：<span class="u-type-warning">{{totalAmount}}元</span></view>
 		</view>
 		<view class="bottom-btn-wrap" v-if="payStatus==0">
 			<view class="bottom-btn-box u-flex">
@@ -58,6 +59,8 @@
 				orderOutTime:'',
 				orderSpaceName:'',
 				orderVehicleNo:'',
+				totalAmount:'',
+				vehicleType:0,
 				payStatus:null,
 				
 			}
@@ -68,7 +71,7 @@
 			this.orderOutTime = page.orderOutTime;
 			this.orderSpaceName = page.orderSpaceName;
 			this.orderVehicleNo = page.orderVehicleNo;
-			this.handleEntranceOutDetail();
+			// this.handleEntranceOutDetail();
 			
 		},
 		onShow() {
@@ -91,6 +94,8 @@
 					this.payAmount = res.data.payAmount;
 					this.payStatus = res.data.payStatus;
 					this.vehicleImage =res.data.vehicleImage;
+					this.totalAmount = res.data.totalAmount;
+					this.vehicleType = res.data.vehicleType;
 					this.content = `
 					   <dl><dt>停车时长：</dt> <dd>` + this.frontDuration + `</dd></dl>`
 					+ `<dl><dt>账户类型：</dt><dd>` + '暂无' + `</dd></dl>`

utils/filter.js

@@ -50,7 +50,8 @@ Vue.filter("miniImg",function(img,quality){
 
 //车辆类型
 Vue.filter("filterCarType",function(item){
-	console.log(item)
+	// console.log(item)
+	item = Number(item);
 	switch (item){
 		case 0:
 			return '小车'