出场入场搜索框添加

pages/getout/getout.scss

@@ -82,6 +82,9 @@
 	color: #FFF;
 	letter-spacing: 1px
 }
+.search{
+	margin: 10rpx 28rpx;
+}
 .bt1{
 	float: left;
 	width: 80rpx;

pages/getout/getout.vue

@@ -8,6 +8,7 @@
 		 back-icon-color="#CCE8FF" 
 		 :background="{background: 'linear-gradient(145deg, #41AFF9 0%, #2D8CFB 100%)' }"></u-navbar>
 		<u-empty class="u-m-t-80" text="暂无停车" mode="data" v-if="roadspaceList.length == 0"></u-empty>
+		<view class="search"><u-search placeholder="请输入车位名称" v-model="roadspaceList.spaceName" shape="round" @search="spaceSearch()" @custom="spaceSearch()"></u-search></view>
 		<view class="roadspace-list wrap">
 			<view class="roadspace-list-item" :class="{used:item.placeStatus==1}" @click="roadspaceClick(item)" v-for="item in roadspaceList" :key="item.id">
 				<view class="block">
@@ -29,7 +30,7 @@
 			<u-button class="bt2" @click="next(list.pageNum)">></u-button>
 		</view>
 		<u-action-sheet :list="actionList" @click="actionClick" v-model="actionShow"></u-action-sheet>
-		<u-popup class="confirm-pop" v-model="confirmPop" mode="center" border-radius="20" width="90%">
+		<u-popup class="confirm-pop" v-model="confirmPop" mode="center" border-radius="20" width="90%" duration="300">
 			<view class="confirm-pop-til">入场确认</view>
 			<view class="confirm-pop-con car-info u-flex">
 				<view class="car-info-img" @click="getPic">
@@ -98,7 +99,10 @@
 					{text: '入场确认'},
 				],
 				actionShow:false,
-				roadspaceList:[],
+				roadspaceList:{
+					spaceName:'',
+				},
+				searchList:[],
 				orderInfo:null,
 				spaceId:null,
 				currentTime: new Date(), // 获取当前时间
@@ -129,9 +133,17 @@
 			setInterval(function () {
 				that.currentTime = new Date()//修改数据让他可以实时更新
 			}, 1000);
-			
 		},
 		methods:{
+			spaceSearch(){
+				console.log(this.roadspaceList.spaceName)
+				this.$u.api.getRoadspace({roadNo:this.roadNo,placeStatus:1,spaceName:this.roadspaceList.spaceName})
+				.then(res => {
+					this.pages=res.data.pages;
+					this.list.pageNum=res.data.page;
+					this.roadspaceList = res.data.rows;
+				})
+			},
 			last(i){
 				if(i>1){
 					setTimeout(	this.handleGetRoadspace(this.roadNo,i-1),500)
@@ -397,8 +409,7 @@
 					num = num.toString()
 					return num[1] ? num : '0' + num
 				};
-				
-				var i_total_secs = Math.round(currentTime.getTime() - clock_start);
+				var i_total_secs = Math.round(currentTime.getTime() - time_start);
 				//计算出相差天数
 				var days = Math.floor(i_total_secs / (24 * 3600 * 1000))
 					 

pages/parking/parking.scss

@@ -1,5 +1,5 @@
 .roadspace-list{
-	float: left;
+	overflow: hidden;
 	margin-top: 30rpx;
 	margin-left: 22rpx;
 	.roadspace-list-item{
@@ -57,7 +57,9 @@
 	}
 }
 
-
+.search{
+	margin: 10rpx 28rpx;
+}
 .bottom-btn{
 	position: fixed;
 	left: 40rpx;

pages/parking/parking.vue

@@ -8,6 +8,7 @@
 		 back-icon-color="#CCE8FF" 
 		 :background="{background: 'linear-gradient(145deg, #41AFF9 0%, #2D8CFB 100%)' }"></u-navbar>
 		<u-empty class="u-m-t-80" text="暂无车位" mode="data" v-if="roadspaceList.length == 0"></u-empty>
+		<view class="search"><u-search placeholder="请输入车位名称" v-model="roadspaceList.spaceName" shape="round" @search="spaceSearch()" @custom="spaceSearch()"></u-search></view>
 		<view class="roadspace-list wrap">
 			<view class="roadspace-list-item" @click="roadspaceClick(item)" v-for="(item,index) in roadspaceList" :key="index + item.id">
 				<view class="block">
@@ -68,6 +69,15 @@
 			// 	console.log(e)
 			// 	// {type: "next", current: 2}
 			// },
+			spaceSearch(){
+				console.log(this.roadspaceList.spaceName)
+				this.$u.api.getRoadspace({roadNo:this.roadNo,placeStatus:0,spaceName:this.roadspaceList.spaceName})
+				.then(res => {
+					this.pages=res.data.pages;
+					this.list.pageNum=res.data.page;
+					this.roadspaceList = res.data.rows;
+				})
+			},
 			last(i){
 				if(i>1){
 					setTimeout(	this.handleGetRoadspace(this.roadNo,i-1),500)