功能细节调整

pages/common/index/index.vue

@@ -61,7 +61,7 @@
 		</view>
 		<!-- 删除弹框 -->
 		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')">
-			<view class="agreement-popupC">
+			<view class="agreement-popupC" @click.stop>
 				<view class="popup-content">
 					<image src="/static/images/dell.png" mode="" class="svg"></image>
 					<uni-icon class="trash"></uni-icon>
@@ -77,12 +77,13 @@
 		</view>
 		<!-- =========重命名============== -->
 		<view class="agreement-mask" v-if="RenameModel" @click="closePopup('rename')">
-			<view class="agreement-popupD">
+			<view class="agreement-popupD" @click.stop>
 				<view class="popup-content">
 					<view>
 						<view class="popup-flex">
 							<text>设备名称</text>
-							<input type="text" v-model="deviceName" placeholder="请输入设备名称" class="popup-input" />
+							<input type="text" v-model="deviceName" placeholder="请输入设备名称" class="popup-input"
+								@click.stop />
 						</view>
 					</view>
 				</view>
@@ -166,8 +167,10 @@
 			closePopup(type) {
 				if (type === 'delete') {
 					this.deleteShow = false;
+					uni.showTabBar(); // 显示TabBar
 				} else if (type === 'rename') {
 					this.RenameModel = false;
+					uni.showTabBar(); // 显示TabBar
 				}
 			},
 			// tab导航切换栏
@@ -265,10 +268,11 @@
 			},
 			// 右滑点击事件处理
 			handleSwipeClick(e, item, index) {
+
 				const {
 					content
 				} = e
-				console.log(e, 'eeeee');
+				console.log(item, 'eeeee');
 				switch (e.content.text) {
 					case '删除':
 						this.handleDeleteDevice(item, index)
@@ -301,6 +305,8 @@
 							this.onIntall();
 						}, 500);
 						this.deleteShow = false
+						// 关闭所有滑动项
+						this.$refs.swipeAction.closeAll();
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -334,6 +340,8 @@
 						}, 500);
 						this.RenameModel = false
 						this.deviceName = ''
+						// 关闭所有滑动项
+						this.$refs.swipeAction.closeAll();
 					} else {
 						uni.showToast({
 							title: res.msg,