Merge branch 'sqy_dev' into 'main'

解决设备样式没有合并问题

See merge request huang/thingskit-app!30

@@ -26,7 +26,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</u-sticky>
 		</u-sticky>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback">
 			<view class="device-list">
 			<view class="device-list">
 				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
 				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
 					<view
 					<view
@@ -87,7 +87,6 @@
 		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
 		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
 			<view>
 			<view>
 				<view style="text-align: center; margin-top: 28rpx"><text>筛选条件</text></view>
 				<view style="text-align: center; margin-top: 28rpx"><text>筛选条件</text></view>
-
 				<FilterItem :filterList="deviceStatus" title="设备状态" @clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></FilterItem>
 				<FilterItem :filterList="deviceStatus" title="设备状态" @clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></FilterItem>
 				<FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
 				<FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
 				<FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
 				<FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
@@ -311,18 +310,31 @@ export default {
 	min-height: 100vh;
 	min-height: 100vh;
 	background-color: #f8f9fa;
 	background-color: #f8f9fa;
 }
 }
-
-.org-sty {
-	width: 750rpx;
-	height: 150rpx;
-	margin-top: 1rpx;
+.device-top {
+	padding: 10rpx 30rpx;
 	background-color: #fff;
 	background-color: #fff;
-	display: flex;
-	justify-content: space-between;
-
-	.org-item {
-		width: 350rpx;
-		height: 200rpx;
+	.search {
+		display: flex;
+		justify-content: space-between;
+		padding-bottom: 10rpx;
+		border-bottom: 1px solid #f5f5f5;
+		.search-left {
+			width: 580rpx;
+			background-color: #f8f9fa;
+			border-radius: 200rpx;
+		}
+		.search-right {
+			display: flex;
+			align-items: center;
+			text {
+				color: #333;
+				font-size: 14px;
+			}
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
 	}
 	}
 }
 }
 
 
@@ -330,7 +342,6 @@ export default {
 	display: flex;
 	display: flex;
 	flex-direction: column;
 	flex-direction: column;
 	padding-left: 20rpx;
 	padding-left: 20rpx;
-
 	.list-item {
 	.list-item {
 		width: 713rpx;
 		width: 713rpx;
 		height: 200rpx;
 		height: 200rpx;
@@ -339,10 +350,9 @@ export default {
 		display: flex;
 		display: flex;
 		border-radius: 10px;
 		border-radius: 10px;
 		justify-content: space-between;
 		justify-content: space-between;
-
 		.item {
 		.item {
 			margin: 30rpx;
 			margin: 30rpx;
 		}
 		}
 	}
 	}
 }
 }
-</style>
+</style>