修改小程序中间图片， 修改绑定

pages.json

@@ -19,13 +19,7 @@
 				},
 				
 				
-				{
-					"path" : "pages/index/main/lockInfo",
-					"style" : 
-					{
-						 
-					}
-				},
+				
 				{
 					"path" : "pages/index/center",
 					"style" : 
@@ -39,10 +33,24 @@
 	"preloadRule": {
 			"pages/index/center": {
 				"network": "all",
-				"packages": ["pages/mylock","pages/information"]
+				"packages": ["pages/business","pages/mylock","pages/information"]
 			}
 	},
 	"subPackages": [
+		{
+			"root": "pages/business",
+			"pages": [ 
+				
+				{
+					"path" : "lockInfo",
+					"style" : 
+					{
+						 
+					}
+				}
+				
+			]
+		},
 		{
 			"root": "pages/information",
 			"pages": [ 

pages/index/main/lockInfo.vue → pages/business/lockInfo.vue

@@ -25,7 +25,7 @@
 				</view>
 			</view>
 			<view class="body" v-if="id" >
-				<view class="page">
+				<view class="page" v-if="floorlockInfo.id" >
 					<view class="page-main">
 				
 						<view class="name">
@@ -50,40 +50,45 @@
 			<view class="page-top" v-if="id">
 				<template v-if="floorlockInfo.status==0" >
 					<view class="name">
-						<img class="img " 
-					 src="@/assets/img/parkingDetails/item6.svg" alt="">
+						<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
+						
 					</view>
 				</template>
-				<template v-else>
-					<view class="name" v-if="floorlockInfo.lockStatus==1">
-						<img class="img" src="@/assets/img/lockInfo/info1.png" alt="">
+				<template v-else>
+					
+					<view class="name" v-if="floorlockInfo.parkingStatus==1&&floorlockInfo.radarStatus==0">
+						
+						<img class="img" src="@/assets/img/lockstatus/index3.png" alt="">
+					</view>
+					<view class="name" v-else-if="floorlockInfo.lockStatus==1">
+						<img class="img" src="@/assets/img/lockstatus/index1.png" alt="">
 					</view>
-					<view class="name" v-if="floorlockInfo.lockStatus==3">
-						<img  class="img img2" src="@/assets/img/lockInfo/info2.png" alt="">
+					<view class="name" v-else-if="floorlockInfo.lockStatus==3">
+						<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
 						
 					</view>
-					<view class="name" v-if="floorlockInfo.lockStatus==2">
-					
-						<img class="img" src="@/assets/img/parkingDetails/item4.svg" alt="">
+					<view class="name" v-else-if="floorlockInfo.lockStatus==2">
+						<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
 					</view>
-					<view class="name" v-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
+					<view class="name" v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
 						
-						<img class="img "
-						src="@/assets/img/parkingDetails/item6.svg" alt="">
+						<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
 					</view>
+					
 				</template>
 				<view class="value" v-if="floorlockInfo.status==0"  >
 					设备离线
 				</view>
-				<view class="value" v-else>
-					
-					
-					<template v-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
-						设备异常
-					</template>
-					<template v-else >
-						设备{{floorlockInfo.lockStatusN}}
-					</template>
+				<view class="value" style="text-align: center;" v-else>
+
+					{{floorlockInfo.lockStatusN}}
+					<view v-if="floorlockInfo.parkingStatus==1&&floorlockInfo.radarStatus==0">
+						
+					</view>
+					<view v-else-if="floorlockInfo.lockStatus==2" style="color:red;font-size: 28rpx;">
+						3分钟后自动抬锁，请尽快驶入车位
+
+					</view> 
 					
 				</view>
 				<view class="valuebutton" @click="operateBtn">
@@ -95,18 +100,26 @@
 						</view>
 					</template>
 					<template v-else >
-						<view class="jpbutton jpbutton1" v-if="floorlockInfo.lockStatus==1">
+						
+						<view class="jpbutton jpbutton6" v-if="floorlockInfo.parkingStatus==1&&floorlockInfo.radarStatus==0">
+							该车位已被占用
+						</view>
+						
+						<view class="jpbutton jpbutton1" v-else-if="floorlockInfo.lockStatus==1">
 							<img class="img" src="@/assets/img/button/lock.svg" alt="">
 							降锁
 						</view>
-						<view class="jpbutton jpbutton4" v-if="floorlockInfo.lockStatus==3">
-							3分钟后自动抬锁
+						
+						<!-- <view class="jpbutton jpbutton6" v-else-if="floorlockInfo.lockStatus==2">
+							地锁降
 
+						</view> -->
+						<view class="jpbutton jpbutton4" v-else-if="floorlockInfo.lockStatus==3">
+							降锁中
+						
 						</view>
-						<view class="jpbutton jpbutton6" v-if="floorlockInfo.lockStatus==2">
-							使用中
-						</view>
-						<view class="jpbutton jpbutton5" v-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
+						
+						<view class="jpbutton jpbutton5" v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
 							<u-icon name="phone-fill" label="电话报修"
 							 color="#fff" label-color="#fff" label-size="36"></u-icon>
 						</view>
@@ -175,7 +188,9 @@
 				loading: true,
 				usable:false,
 				permission: false,
-				floorlockInfo: {},
+				floorlockInfo: {
+					lockStatusN:""
+				},
 				setIntervalId: "",
 				showMessage: 0,
 				content: "400-8899-619",
@@ -214,7 +229,7 @@
 			if(this.id){
 				return {
 					title: '智泊e家-'+this.floorlockInfo.name,
-					path: '/pages/index/main/lockInfo?id='+this.id ,
+					path: '/pages/business/lockInfo?id='+this.id ,
 				}
 			}else{
 				return {
@@ -231,7 +246,7 @@
 			if(this.id){
 				return {
 					title: '智泊e家-'+this.floorlockInfo.name,
-					path: '/pages/index/main/lockInfo?id='+this.id ,
+					path: '/pages/business/lockInfo?id='+this.id ,
 				}
 			}else{
 				return {
@@ -516,7 +531,7 @@
 		}
 
 		.value {
-			margin-top: 24rpx;
+			//margin-top: 24rpx;
 			font-size: 40rpx;
 			font-weight: bold;
 			color: #333333;

pages/index/main/parkingDetails.vue

@@ -45,7 +45,7 @@
 					<view class="item-b">
 						空闲车位：<span>{{idleNum}}个</span>
 					</view>
-					<view class="item-c" @click="gotoUrl('pages/index/main/lockInfo')">
+					<view class="item-c" @click="gotoUrl('pages/business/lockInfo')">
 						
 						<u-icon name="question-circle" color="#1677FF" label-color="#1677FF" label-size	="32" size="32" :margin-left="8" label="降锁说明"></u-icon>
 						
@@ -81,10 +81,11 @@
 								
 							</template>
 							<template v-else >
-								<img class="img color3" v-if="item.lockStatus==1||item.lockStatus==3"
-								 src="@/assets/img/parkingDetails/item3.svg" alt="">
-								<img class="img color4"  v-if="item.lockStatus==2"
+								<img class="img color4"  v-if="item.parkingStatus==1&&item.radarStatus==0"
 								src="@/assets/img/parkingDetails/item4.svg" alt="">
+								<img class="img color3" v-else
+								 src="@/assets/img/parkingDetails/item3.svg" alt="">
+								
 							</template>
 							
 							<view class="name-text">
@@ -106,16 +107,25 @@
 								离线
 							</view>
 						</view>
-						<view class="value" v-else     >
+						<view class="value" v-else     >
+							
+							<view class="jpbutton jpbutton6" v-if="item.parkingStatus==1&&item.radarStatus==0">
+								使用中
+							</view>
 							<view class="jpbutton jpbutton1"
-							 v-if="item.lockStatus==1||item.lockStatus==3" >
+							 v-else-if="item.lockStatus==1" >
 								<img class="img" src="@/assets/img/button/lock.svg" alt="">
 								降锁
 							</view>
-							<view class="jpbutton jpbutton6" v-if="item.lockStatus==2">
-								使用中
+							
+							<view class="jpbutton jpbutton6" v-else-if="item.lockStatus==2">
+								地锁降
 							</view>
-							<view class="jpbutton jpbutton4" v-if="item.lockStatus==4||item.lockStatus==0">
+							<view class="jpbutton jpbutton6"
+							v-else-if="item.lockStatus==3" >
+								降锁中
+							</view>
+							<view class="jpbutton jpbutton4" v-else-if="item.lockStatus==4||item.lockStatus==0">
 								异常
 							</view>
 						</view>
@@ -204,10 +214,12 @@
 		},
 		computed:{
 			idleNum(){
-				var num=0;
+				var num=this.floorlockInfoList.length;
 				this.floorlockInfoList.forEach(item=>{
-					if(item.status==1&&item.lockStatus==1){
-						num++
+					if(item.parkingStatus==1){
+						num--
+					}else if(item.lockStatus==4||item.lockStatus==0||item.status==0){
+						num--
 					}
 				})
 				return num
@@ -283,21 +295,8 @@
 				})
 			},
 			gotoInfoLock(item){
-				this.gotoUrl('pages/index/main/lockInfo?id='+item.id)
+				this.gotoUrl('pages/business/lockInfo?id='+item.id)
 				
-				// if(item.lockStatus==0){
-					
-				// }else if(item.lockStatus==1){
-				// 	uni.showToast({
-				// 		title: "使用中",
-				// 		icon: "none"
-				// 	})	
-				// }else if(item.lockStatus==2){
-				// 	uni.showToast({
-				// 		title: "设备异常",
-				// 		icon: "none"
-				// 	})	
-				// }
 			},
 			getParkingFloorlockList(bl){
 				if(!bl){
@@ -314,8 +313,6 @@
 				API.parkingFloorlockList(obj).then((res) => {
 					this.floorlockInfoList=res.data.floorlockInfoList
 					
-					// this.floorlockInfoList[0].status=1
-					// this.floorlockInfoList[0].lockStatus=4
 					
 					if(!bl){
 						uni.hideLoading();

pages/mylock/bindLock.vue

@@ -44,7 +44,7 @@
 			</view>
 
 			<view class="list">
-				<view class="item" >
+				<view class="item" v-if="0" >
 					<view class="name">
 						所属停车场
 
@@ -229,7 +229,7 @@
 				API.add( this.bindInfo ).then((res) => {
 				
 					uni.redirectTo({
-						url:"/pages/mylock/bindLockStatus?id="+res.applicationRecord.id
+						url:"/pages/mylock/bindLockStatus?id="+res.data.applicationRecord.id
 					})
 						uni.hideLoading();
 					

pages/mylock/infoLock.vue

@@ -193,7 +193,7 @@
 			ref="uModal" title="删除白名单用户" content="是否删除当前白名单用户?" confirm-text="删除"></u-modal>
 
 		<view class="floating-button">
-			<view class="button" @click="gotoUrl('pages/index/main/lockInfo?id='+id)" >
+			<view class="button" @click="gotoUrl('pages/business/lockInfo?id='+id)" >
 
 				查看地锁
 			</view>

pages/mylock/myWhite.vue

@@ -11,7 +11,7 @@
 					
 					
 					<view class="item" v-for="(item,i) in list"
-					 @click="gotoUrl('pages/index/main/lockInfo?id='+item.id)">
+					 @click="gotoUrl('pages/business/lockInfo?id='+item.id)">
 						<view class="title">
 
 							<view class="name">