diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index d85e86f..5ee3b99 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -23,9 +23,8 @@
 				<view class="Sendmessage" @click="location">位置</view>
 				<view class="Sendmessage" @click="handleSend">发送信息</view>
 			</view>
-			<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+			<mescroll-uni v-if="deviceList.length > 0" class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 				:down="downOption" :fixed="false">
-				<view v-if="deviceList.length > 0">
 					<uni-swipe-action ref="swipeAction">
 						<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
 							<uni-swipe-action-item :right-options="Options"
@@ -72,13 +71,13 @@
 						<text v-if="loading">加载中...</text>
 						<text v-if="finished">没有更多数据了</text>
 					</view>
-				</view>
-				<view v-else class="noDATA">
-					<view> <uni-icons type="image-filled" size="120" color="rgba(255, 255, 255, 0.9)"></uni-icons>
-					</view>
-					暂无数据
-				</view>
+				
 			</mescroll-uni>
+			<view v-else class="noDATA">
+				<view> <uni-icons type="image-filled" size="120" color="rgba(255, 255, 255, 0.9)"></uni-icons>
+				</view>
+				暂无数据
+			</view>
 		</view>
 		<!-- 删除弹框 -->
 		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')" catchtouchmove="true">