电压显示

README.md

@@ -9,4 +9,7 @@ parkingRecordList
 parkingRecordDetails
 
 lockDetails
-operateFloorlock 地锁操作
+operateFloorlock 地锁操作
+
+mobile/sysUser/regUserList
+/mobile/sysUser/regUserDetails

config/.env.dev.js

@@ -13,7 +13,7 @@ const UNI_APP = {
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 
 
-	openId:"1234568",
+	openId:"oRGjz7GpSbld27nUK9Q6V6jvXMJo",
 	
 	//appid
 	VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",

pages/deviceTab/dataLock.vue

@@ -25,13 +25,13 @@
 									{{info.typeN}}
 							
 								</view>
-								<view class="tag" :class="'statusN statusN'+info.status">
+								<!-- <view class="tag" :class="'statusN statusN'+info.status">
 									{{info.statusN}}
 							
 								</view>
 								<view class="tag" :class="'lockStatusN lockStatusN'+info.lockStatus">
 									{{info.lockStatusN}}
-								</view>
+								</view> -->
 							</view>
 						</view>
 						<view class="line">
@@ -44,6 +44,34 @@
 							降锁
 						</u-button>
 					</view>
+				</view>
+				
+				<view class="top-span">
+					<!-- <view class="item-span">
+						<img src="@/assets/img/topspan/span1.png">
+						<span>车位</span>
+						<span>空闲</span>
+					</view> -->
+					<view class="item-span">
+						<img src="@/assets/img/topspan/span2.png">
+						<span>地锁</span>
+						<span  style="color: red;"
+						v-if="info.lockStatus==4||info.lockStatus==0">
+						错误</span>
+						<span v-else :class="info.lockStatus==1?'lockStatusX1':'lockStatusX2'" >{{info.lockStatus==1?'升起':'降落'}}</span>
+					</view>
+					
+					<view class="item-span">
+						<img src="@/assets/img/topspan/span3.png">
+						<span>电压</span>
+						<span v-if="info.batteryLevel">{{info.batteryLevel}}V</span>
+						<span v-else>未知</span>
+					</view>
+					<view class="item-span">
+						<img src="@/assets/img/topspan/span4.png">
+						<span>网络</span>
+						<span  :class="info.status==1?'statusX1':'statusX2'" >{{info.status==0?'离线':'在线'}}</span>
+					</view>
 				</view>
 			</view>
 			<view class=" no_statistics">
@@ -1697,5 +1725,43 @@
 				font-size: 32rpx;
 			}
 		}
+	}
+	
+	.top-span{
+		border-top: 1px solid rgba(245, 245, 245, 1);
+		display: flex;
+		flex-wrap: wrap;
+		    justify-content: space-between;
+		padding-top: 16rpx;
+		margin-top: 16rpx;
+		.item-span{
+			    display: flex;
+			    align-items: center;
+				   
+				width: 30%;
+				 font-size: 28rpx;
+				 span{
+					 margin: 0 8rpx;
+				 }
+
+			img{
+				width: 28rpx;
+				height: 28rpx;
+			}
+		}
+		
+		.lockStatusX1{
+			color: #00B962;
+		}
+		.lockStatusX2{
+			color: #1677FF;
+		}
+		
+		.statusX1{
+			color: #00B962;
+		}
+		.statusX2{
+			color: #1677FF;
+		}
 	}
 </style>

pages/index/index.vue

@@ -179,7 +179,7 @@
 										</view>
 									</view>
 									<view class="item-body">
-										编号：{{item.lockNo}}
+										<span>编号：{{item.lockNo}}</span> <span v-if="item.batteryLevel" style="    margin-left: 16rpx;">电压：{{item.batteryLevel}}V</span>
 									</view>
 			
 								</view>
@@ -630,7 +630,11 @@
 				if (this.companyId) {
 					this.gotoUrl('/pages/deviceTab/deviceList?companyId=' + this.companyId)
 				} else {
-					this.gotoUrl('/pages/deviceTab/index')
+					
+					uni.switchTab({
+							url: '/pages/deviceTab/index'
+						})
+					
 				}
 			},
 			getfloorStatus() {

pages/login/login.vue

@@ -144,6 +144,7 @@
 						uni.switchTab({
 							url: '/pages/index/index'
 						})
+						
 					}
 				
 				}).catch(error => {

pages/myTab/index.vue

@@ -109,7 +109,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/index.js'
+	import * as API from '@/apis/pagejs/user.js'
 	
 	import Tabbar from '@/components/Tabbar.vue'
 	export default {
@@ -141,7 +141,7 @@
 					title: "加载中",
 					mask: true,
 				})
-				userApi.logout().then((res) => {
+				API.logout().then((res) => {
 					uni.hideLoading();
 					this.show1 = false;
 					this.jphelp.logoff()