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

common/config.js

@@ -1,5 +1,5 @@
-// const host = 'http://wx.hw.hongweisoft.com/parking';//本地
-const host = 'http://parking.pdzhtc.com';//正式
+const host = 'http://wx.hw.hongweisoft.com/parking';//本地
+// const host = 'http://parking.pdzhtc.com';//正式
 // const host = 'http://172.16.90.64:7000';
 const config = {
 	wxAppid:'wxbe90cc7c5233dd84',// wxAppid 

pages/getout/getout.scss

@@ -65,4 +65,32 @@
 		text-align: center;
 		font-size: 35rpx;
 	}
+}
+.bottom-btn{
+	position: fixed;
+	left: 40rpx;
+	right: 40rpx;
+	bottom: 47rpx;
+	height: 85rpx;
+	line-height: 85rpx;
+	background: #3397FA;
+	box-shadow: 0px 9rpx 9rpx 0px rgba(0, 0, 0, 0.03);
+	border-radius: 10rpx;
+	text-align: center;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #FFF;
+	letter-spacing: 1px
+}
+.bt1{
+	float: left;
+	width: 80rpx;
+	margin-top: 40rpx;
+	margin-left: 40rpx;
+}
+.bt2{
+	float: right;
+	width: 80rpx;
+	margin-top: 40rpx;
+	margin-right: 40rpx;
 }

pages/getout/getout.vue

@@ -21,14 +21,13 @@
 					</view>
 				</view>
 				<view class="text">{{item.spaceName}}</view>
-			</view>			
-			<view class="bottom-btn-wrap">
-				<!-- <view class="bottom-btn" @click="jumpToMain()">返回主页</view> -->
-				<u-button class="bt1" v-if="list.pageNum==0" @click="last(list.pageNum)"><</u-button>
-				<u-button class="bt2" v-if="list.pageNum==0"@click="next(list.pageNum)">></u-button>
-			</view>
+			</view>	
+		</view>
+		<view class="bottom-btn-wrap">
+			<!-- <view class="bottom-btn" @click="jumpToMain()">返回主页</view> -->
+			<u-button class="bt1"  @click="last(list.pageNum)"><</u-button>
+			<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%">
 			<view class="confirm-pop-til">入场确认</view>

pages/getout/getoutpage/getoutpage.vue

@@ -164,7 +164,12 @@
 			this.handleEntranceOutDetail();
 		},
 		methods:{
-
+			openPage(path) {
+				console.log('path',path);
+				this.$u.route({ 
+					url: path
+				})
+			},
 			onPayCancel(){
 				this.$u.route({
 					type: 'redirectTo',

pages/parking/parking.scss

@@ -1,4 +1,5 @@
 .roadspace-list{
+	float: left;
 	margin-top: 30rpx;
 	margin-left: 22rpx;
 	.roadspace-list-item{

pages/setting/setting.vue

@@ -76,7 +76,6 @@
 							  this.$u.api.loginOut({})
 							  .then(res=>{
 								  uni.clearStorage();
-								  alert("58575");
 								  this.$u.vuex('vuex_token', null);
 								  this.$u.vuex('vuex_user', null);
 								  this.$u.vuex('vuex_hasLogin', false);