Merge branch 'master' of http://172.16.90.201:3000/parking/parking_pda

pages/getin/getin.scss

@@ -67,6 +67,8 @@
 			// line-height: 81rpx;
 			/deep/ .uni-input-input,/deep/ .uni-input-placeholder{
 				padding-left: 31rpx;
+				font-size: 40rpx;
+				font-weight: 500;
 				// height: 81rpx;
 				// line-height: 81rpx;
 			}

pages/getin/getin.vue

@@ -32,9 +32,9 @@
 				<u-input v-model="vehicleNo" height="80" type="text" placeholder="输入车牌号" />
 				<u-button type="primary" @click="handleParkInInfo">确认</u-button>
 			</view>
-			<view class="other-info-item">
+			<!-- <view class="other-info-item">
 				<u-input style="width: 100%;" v-model="depositAmount" height="80" type="text" placeholder="输入进场押金" />
-			</view>
+			</view> -->
 			
 		</view>
 		<view class="upload-wrap">

pages/getout/getoutpage/getoutpage.vue

@@ -2,17 +2,17 @@
 	<view class="wrap">
 		<view class="car-info u-flex">
 			<view class="car-info-img">
-				<u-image src="../../../static/img/default-car.png" width="100%" height="100%"></u-image>
+				<u-image :src="vehicleImage" mode="aspectFit" width="100%" height="100%"></u-image>
 			</view>
 			<view class="car-info-text u-flex-1">
 				<view class="text-item">
 					<view class="car">{{ orderVehicleNo }}</view>
 					<view class="position">车位：{{orderSpaceName}}</view>
 				</view>
-				<view class="text-item" style="color: #3192FB;">临时卡</view>
+				<!-- <view class="text-item" style="color: #3192FB;">临时卡</view> -->
 				<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 class="recharge" @click="$refs.uToast.show({title: '建设中'})">充值</view> -->
 				</view>
 				<view class="text-item">类型：小车（计时）</view>
 			</view>
@@ -50,6 +50,7 @@
 	export default {
 		data() {
 			return {
+				vehicleImage:'/static/img/default-car.png',
 				showOrderDetails:false,//是否线上订单细节
 				content:'',
 				orderID:'',
@@ -89,6 +90,7 @@
 					// });
 					this.payAmount = res.data.payAmount;
 					this.payStatus = res.data.payStatus;
+					this.vehicleImage =res.data.vehicleImage;
 					this.content = `
 					   <dl><dt>停车时长：</dt> <dd>` + this.frontDuration + `</dd></dl>`
 					+ `<dl><dt>账户类型：</dt><dd>` + '暂无' + `</dd></dl>`