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

pages/getin/getin.scss

@@ -82,7 +82,9 @@
 		}
 	}
 }
-
+.note{
+	margin: 40rpx 40rpx  0rpx 40rpx;
+}
 .upload-wrap{
 	margin: 42rpx 40rpx;
 }

pages/getin/getin.vue

@@ -47,11 +47,14 @@
 			</view> -->
 			
 		</view>
+		<view class="note">备注：请按顺序依次拍摄车牌，车头，车尾，发动机号，以作为取证照片！</view>
 		<view class="upload-wrap">
 			<u-upload 
 			ref="uUpload"
 			:action="uploadAction" 
 			:show-progress="false" 
+			max-count="4"
+			@on-oversize
 			upload-text="拍照取证" ></u-upload>
 		</view>
 		
@@ -183,11 +186,18 @@
 			}
 		},
 		onShow() {
+			
 			this.timeList[1].time = this.getTimer();
 			// this.timeList[1].time=this.currentTime.getFullYear()+ '-' +(this.currentTime.getMonth()+1)+ '-' +this.currentTime.getDate()+ ' ' +this.finialtime+ ':'+"00";
 			setTimeout( () => {
 				this.timeList[0].time = this.inTime;
 			}, 1000);
+			if(this.timeList[0].time!==null){
+				this.timevalue=this.timeList[1].time
+				this.timeList[0].disabled=true
+			}else{
+				this.timevalue=this.timeList[0].time
+			}
 		},
 		methods:{
 			// upset(){