调整

pages/index/main/lockInfo.vue

@@ -1,5 +1,20 @@
 <template>
-	<view>
+	<view>
+		<u-popup v-model="showMessage" mode="bottom" border-radius="30" >
+			<view class="showMessage">
+				<view class="title">降锁成功</view>
+				<view class="body">
+					车位锁已经降锁，请尽快驶入车位充电！<br/>
+					
+					若超过3分钟未停车，车位锁将自动升起上锁，如需继续使用请重新扫码降锁。
+
+				</view>
+				<view class="botton">
+					<u-button @click="showMessage=false" type="primary"  shape="square" >知道了</u-button>
+				</view>
+			</view>
+		</u-popup>
+				
 		<view class="page-role" v-if="!loading">
 			<img class="img" src="@/assets/img/nonwhitelist/info.png" alt="">
 			<view class="text1">{{permission?'暂无权限':'加载中...'}}</view>
@@ -13,19 +28,19 @@
 				</view>
 			</view>
 			<view class="page-top" v-if="id">
-				<view class="name" v-if="floorlockInfo.status==0">
+				<view class="name" v-if="floorlockInfo.lockStatus==0">
 				<img class="img" src="@/assets/img/lockInfo/info1.png" alt="">
 			</view>
-				<view class="name" v-if="floorlockInfo.status==1">
+				<view class="name" v-if="floorlockInfo.lockStatus==1">
 					<img class="img img2" src="@/assets/img/lockInfo/info2.png" alt="">
 				</view>
-				<view class="name" v-if="floorlockInfo.status==2">
+				<view class="name" v-if="floorlockInfo.lockStatus==2">
 				<img class="img" src="@/assets/img/parkingDetails/item4.png" alt="">
 			</view>
 				<view class="value">
-					{{floorlockInfo.status==0?'未降锁':''}}
-					{{floorlockInfo.status==1?'使用中':''}}
-					{{floorlockInfo.status==2?'异常':''}}
+					{{floorlockInfo.lockStatus==0?'未降锁':''}}
+					{{floorlockInfo.lockStatus==1?'使用中':''}}
+					{{floorlockInfo.lockStatus==2?'异常':''}}
 				</view>
 			</view>
 			<view class="body">
@@ -39,14 +54,14 @@
 						</view>
 						<view class="value" @click="operateBtn">
 							<view class="jpbutton jpbutton1" 
-							 v-if="floorlockInfo.status==0" >
+							 v-if="floorlockInfo.lockStatus==0" >
 								<img class="img" src="@/assets/img/button/lock.png" alt="">
 								降锁
 							</view>
-							<view class="jpbutton jpbutton4" v-if="floorlockInfo.status==1">
+							<view class="jpbutton jpbutton4" v-if="floorlockInfo.lockStatus==1">
 								使用中
 							</view>
-							<view class="jpbutton jpbutton5" v-if="floorlockInfo.status==2">
+							<view class="jpbutton jpbutton5" v-if="floorlockInfo.lockStatus==2">
 								异常
 							</view>
 						</view>
@@ -85,7 +100,9 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view>
+			
+			
 		</view>
 	</view>
 </template>
@@ -100,7 +117,8 @@
 				loading:false,
 				permission:false,
 				floorlockInfo: {},
-				setIntervalId:"",
+				setIntervalId:"",
+				showMessage:0,
 			}
 		},
 		onLoad(op) {
@@ -143,6 +161,7 @@
 				API.operateFloorlock(obj).then((res) => {
 				
 					uni.hideLoading();
+					this.showMessage=true;
 					this.getFloorlockDetails()
 					
 				}).catch(error => {
@@ -171,7 +190,7 @@
 
 				API.floorlockDetails(obj).then((res) => {
 					this.floorlockInfo = res.data.floorlockInfo
-					if(this.floorlockInfo.type==1){
+					if(this.floorlockInfo.type==1&&0){
 						
 						uni.setNavigationBarTitle({
 							title: this.floorlockInfo.parkingName
@@ -183,6 +202,11 @@
 						
 					}else{
 						this.permission=true
+						// #ifdef MP-WEIXIN
+						uni.setBackgroundColor({
+							backgroundColor: '#ffffff',
+						})
+						// #endif
 					}
 					
 					
@@ -204,7 +228,7 @@
 </script>
 <style>
 	page {
-		/* //background-color: rgba(242, 244, 246, 1); */
+		background-color: rgba(242, 244, 246, 1);
 	}
 </style>
 <style scoped lang="scss">
@@ -418,5 +442,22 @@
 	}
 	.jpbutton5 {
 		background-color: red;
+	}
+	
+	.showMessage{
+		padding: 24rpx 56rpx;
+		.title{
+			color: rgba(16,16,16,1);
+			font-size: 36rpx;
+			margin-top: 32rpx;
+			text-align: center;
+			font-weight: bold;
+		}
+		.body{
+			color: rgba(16,16,16,1);
+			font-size: 32rpx;
+			padding-bottom: 66rpx;
+		}
+	
 	}
 </style>

pages/index/main/parkingDetails.vue

@@ -60,7 +60,7 @@
 					@click="gotoInfoLock(item)"
 					class="item" >
 						<view class="name">
-							<img class="img" v-if="item.status==0"
+							<img class="img" v-if="item.lockStatus==0"
 							 src="@/assets/img/parkingDetails/item3.png" alt="">
 							<img class="img"  v-else
 							src="@/assets/img/parkingDetails/item4.png" alt="">
@@ -68,14 +68,14 @@
 							{{item.name}}
 						</view>
 						<view class="value">
-							<view class="jpbutton jpbutton1" v-if="item.status==0" >
+							<view class="jpbutton jpbutton1" v-if="item.lockStatus==0" >
 								<img class="img" src="@/assets/img/button/lock.png" alt="">
 								降锁
 							</view>
-							<view class="jpbutton jpbutton4" v-if="item.status==1">
+							<view class="jpbutton jpbutton4" v-if="item.lockStatus==1">
 								使用中
 							</view>
-							<view class="jpbutton jpbutton5" v-if="item.status==2">
+							<view class="jpbutton jpbutton5" v-if="item.lockStatus==2">
 								异常
 							</view>
 						</view>
@@ -126,7 +126,7 @@
 			idleNum(){
 				var num=0;
 				this.floorlockInfoList.forEach(item=>{
-					if(item.status==0){
+					if(item.lockStatus==0){
 						num++
 					}
 				})
@@ -166,15 +166,15 @@
 				})
 			},
 			gotoInfoLock(item){
-				if(item.status==0){
+				if(item.lockStatus==0){
 					this.gotoUrl('pages/index/main/lockInfo?id='+item.id)
 					
-				}else if(item.status==1){
+				}else if(item.lockStatus==1){
 					uni.showToast({
 						title: "使用中",
 						icon: "none"
 					})	
-				}else if(item.status==2){
+				}else if(item.lockStatus==2){
 					uni.showToast({
 						title: "设备异常",
 						icon: "none"