优化3

pages/attence/attence.vue

@@ -65,7 +65,7 @@
 					</view>
 				</view> -->
 				
-				<map id="navmap" scale="12" :latitude="latitude" :longitude="longitude" :markers="covers" :circles="circles"></map>
+				<map id="navmap" scale="12" :latitude="latitude" :longitude="longitude" :markers="covers" :circles="circles" ></map>
 			</view>
 			
 		</view>
@@ -75,7 +75,7 @@
 			</view>
 		</u-bottom> -->
 		
-		<u-popup class="remark" v-model="remarkPopupShow" @close="remarkClose" mode="bottom">
+		<u-popup class="remark" v-model="remarkPopupShow" @close="remarkClose" mode="top">
 			<u-button class="submit-btn" type="primary" size="mini" @click="getPunchIn">打卡</u-button>
 			<view class="content">
 				<u-form-item 

pages/getin/getin.vue

@@ -161,7 +161,8 @@
 				confirmTime:'',
 				time:'',
 				placeStatus:'',
-				finialtime:''
+				finialtime:'',
+				currentVehicleNo:''
 			}
 		},
 		onLoad(page) {
@@ -171,9 +172,11 @@
 			this.spaceName = page.spaceName;
 			this.roadNo = page.roadNo;
 			this.carImg = page.carImg;
+			this.vehicleImage= page.vehicleImage
 			this.vehicleNo = page.vehicleNo;
 			this.inTime = page.inTime;
 			this.placeStatus=page.placeStatus;
+			this.currentVehicleNo=page.currentVehicleNo
 		},
 		onShow() {
 			this.timeList[1].time = this.getTimer();
@@ -279,7 +282,7 @@
 					images:this.images,
 					inTime:this.time
 				};
-				if(this.placeStatus==1&&(this.vehicleNo=='')){
+				if(this.placeStatus==1&&(this.currentVehicleNo=='')){
 					this.$u.api.parkInConfirm(param)//有车但是车牌为空
 					.then(res=>{
 						this.$refs.uToast.show({

pages/parking/parking.vue

@@ -173,6 +173,7 @@
 				this.spaceName = roadspace.spaceName;
 				this.inTime = roadspace.inTime;
 				this.placeStatus=roadspace.placeStatus;
+				this.currentVehicleNo=roadspace.vehicleNo
 				console.log('roadspace',roadspace);
 				let that = this;
 				ocr.ocrVehicleNo((ret) => {
@@ -186,20 +187,21 @@
 						.then(res=>{
 								that.carImg =  res.data.url;
 								that.vehicleImage =  res.data.url;
+								this.$u.route({
+									url: 'pages/getin/getin',
+									params: {
+										spaceId: this.spaceId,
+										spaceName:this.spaceName,
+										roadNo:this.roadNo,
+										vehicleNo:this.vehicleNo,
+										carImg:that.carImg,
+										vehicleImage:that.vehicleImage,
+										inTime:this.inTime,
+										placeStatus:this.placeStatus,
+										currentVehicleNo:this.currentVehicleNo
+									}
+								});
 						}).catch(err=>{});
-						this.$u.route({
-							url: 'pages/getin/getin',
-							params: {
-								spaceId: this.spaceId,
-								spaceName:this.spaceName,
-								roadNo:this.roadNo,
-								vehicleNo:this.vehicleNo,
-								carImg:that.carImg,
-								vehicleImage:that.vehicleImage,
-								inTime:this.inTime,
-								placeStatus:this.placeStatus
-							}
-						});
 					}else {
 						plus.nativeUI.toast('识别失败');
 					}