From 90204bcd92cb5d23c7f1b654871bb45f57b89b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E7=BB=A7=E7=BB=AD=E5=90=B9?= <17611323298@163.com>
Date: Mon, 19 Jun 2023 11:51:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/warningList/warningList.vue |  4 +++-
 pages/login/Verification.vue             |  2 +-
 pages/mine/equipmentLog.vue              | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pages/center/warningList/warningList.vue b/pages/center/warningList/warningList.vue
index 1bf6879..33ae69b 100644
--- a/pages/center/warningList/warningList.vue
+++ b/pages/center/warningList/warningList.vue
@@ -8,7 +8,7 @@
 						{{ data.houseName || '' }}
 					</text>
 
-					<text :style="{color: item.showStatus == 0 ? 'blue' : 'black'}" @click="updateShowStatus(data)">已了解</text>
+					<text :style="{color: 'blue'}" @click="updateShowStatus(data)">已了解</text>
 				</view>
 				<u-checkbox-group @change="checkboxGroupChange" shape="circle">
 					<block v-for="item in data.list" :key="item.id">
@@ -58,6 +58,8 @@
 						icon: "none",
 						duration: 2000,
 					})
+					this.list = []
+					this.$forceUpdate()
 					setTimeout(() => {
 						this.getWarningList()
 					}, 1000)
diff --git a/pages/login/Verification.vue b/pages/login/Verification.vue
index 8fdabed..2a8b5e6 100644
--- a/pages/login/Verification.vue
+++ b/pages/login/Verification.vue
@@ -204,7 +204,7 @@
 								}
 							}, 1000);
 						} else {
-							util.showNone(data.data.message);
+							util.showNone(data.data.msg);
 							return false;
 						}
 					},
diff --git a/pages/mine/equipmentLog.vue b/pages/mine/equipmentLog.vue
index 8b3222d..9a2a17a 100644
--- a/pages/mine/equipmentLog.vue
+++ b/pages/mine/equipmentLog.vue
@@ -62,6 +62,14 @@
 							</text>
 						</view>
 					</view>
+					<view class="recordingBoxItem">
+						<text class="left">设备电量：</text>
+						<view class="right" style="font-weight: bold;font-size: 28rpx;">
+							<text :style="{color: info.electricityStart <= 20 ?'red':'#333'}">
+								{{info.electricityStart || ''}}
+							</text>
+						</view>
+					</view>
 				</view>
 				<view class="recordingBox" style="margin-top: 40rpx;">
 					<text class="recordingBoxItem-title">录音关闭</text>
@@ -81,6 +89,15 @@
 							</text>
 						</view>
 					</view>
+					
+					<view class="recordingBoxItem">
+						<text class="left">设备电量：</text>
+						<view class="right" style="font-weight: bold;font-size: 28rpx;">
+							<text :style="{color: info.electricityEnd <= 20 ?'red':'#333'}">
+								{{info.electricityEnd || ''}}
+							</text>
+						</view>
+					</view>
 				</view>
 			</view>
 			<view class="offlineRec">