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

pages.json

@@ -30,7 +30,7 @@
 		{
 			"path": "pages/parking/parking",
 			"style": {
-				// "navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationStyle":"custom",// 隐藏系统导航栏
 				"navigationBarTitleText": "车辆入场"
 			}
 		},

pages/getin/getin.vue

@@ -143,7 +143,7 @@
 					this.$refs.uToast.show({
 						title: res.msg,
 						type: 'success',
-						// url:'pages/getout/getout'
+						url:'pages/getout/getout'
 					});
 					console.log('entrance',res)
 				}).catch(err=>{

pages/parking/parking.vue

@@ -1,5 +1,12 @@
 <template>
 	<view>
+		<u-navbar
+		 title="车辆入场" 
+		 title-color="#fff" 
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: '#008CFF' }"></u-navbar>
 		<u-empty class="u-m-t-80" text="暂无车位" mode="data" v-if="roadspaceList.length == 0"></u-empty>
 		<view class="roadspace-list wrap">
 			<view class="roadspace-list-item" @click="roadspaceClick(item)" v-for="(item,index) in roadspaceList" :key="index + item.id">
@@ -40,6 +47,12 @@
 			
 		},
 		methods:{
+			customBack(){
+				this.$u.route({
+					// type:'switchTab',
+					url: 'pages/index/index'
+				});
+			},
 			openPage(path) {
 				console.log('path',path);
 				this.$u.route({