diff --git a/api/6170/deviceControl.js b/api/6170/deviceControl.js
new file mode 100644
index 0000000..44b4601
--- /dev/null
+++ b/api/6170/deviceControl.js
@@ -0,0 +1,31 @@
+// 获取设备详细信息
+import request from '@/utils/request'
+export function deviceDetail(id) {
+  return request({
+    url: `/app/device/${id}`,
+    method: 'get',
+  })
+}
+// 获取设备分享详细信息
+export function deviceShareId(id) {
+  return request({
+    url: `/app/deviceShare/${id}`,
+    method: 'get',
+  })
+}
+// 人员信息登记
+export function registerPersonInfo(data) {
+  return request({
+    url: `/app/device/registerPersonInfo`,
+    method: 'post',
+	data: data
+  })
+}
+// 发送信息
+export function deviceSendMessage(data) {
+  return request({
+    url: `/app/device/sendMessage`,
+    method: 'post',
+	data: data
+  })
+}
diff --git a/api/6170/share.js b/api/6170/share.js
index 79be8e9..a21eea6 100644
--- a/api/6170/share.js
+++ b/api/6170/share.js
@@ -7,13 +7,7 @@ export function deviceShareAdd(data) {
     data: data
   })
 }
-// 获取设备分享详细信息
-export function deviceShareId(id) {
-  return request({
-    url: `/app/deviceShare/${id}`,
-    method: 'get',
-  })
-}
+
 // 分享短信验证码
 export function deviceShareCode(params) {
   return request({
@@ -23,7 +17,7 @@ export function deviceShareCode(params) {
   })
 }
 
-//设备管理列表
+//设备管理列表 我的分享
 export function deviceShareList(params) {
   return request({
     url: '/app/deviceShare/deviceShareList',
@@ -31,6 +25,14 @@ export function deviceShareList(params) {
     data: params
   })
 }
+// 他人分享
+export function otherDeviceShareList(params) {
+  return request({
+    url: '/app/deviceShare/otherDeviceShareList',
+    method: 'get',
+    data: params
+  })
+}
 // 移除设备管理
 export function deviceShareDelete(ids) {
   return request({
diff --git a/pages.json b/pages.json
index 0cb085b..16a4efc 100644
--- a/pages.json
+++ b/pages.json
@@ -127,6 +127,19 @@
 				"navigationBarTitleText": "地图"
 			}
 		},
+		{
+			"path": "pages/common/allType/index",
+			"style": {
+				"navigationBarTitleText": "所有类型"
+			}
+		},
+		{
+			"path": "pages/6170/allShare/index",
+			"style": {
+				"navigationBarTitleText": "所有分享"
+			}
+		},
+		
 		{
 			"path": "pages/6170/share/index",
 			"style": {
diff --git a/pages/6170/allShare/index.vue b/pages/6170/allShare/index.vue
new file mode 100644
index 0000000..fe3ce26
--- /dev/null
+++ b/pages/6170/allShare/index.vue
@@ -0,0 +1,519 @@
+<template>
+	<view>
+		<view class="device-page">
+			<scroll-view class="tab-bar" scroll-x="true" scroll-with-animation>
+				<view class="tab-container">
+					<view v-for="(tab, index) in tabs" :key="index"
+						:class="['tab-item', activeTab === index ? 'active' : '']" @click="switchTab(tab,index)">
+						{{tab.name}}
+					</view>
+				</view>
+			</scroll-view>
+			<scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100"
+				style="height:80vh">
+				<view v-if="deviceList.length>0">
+					<view v-for="(group, groupIndex) in groupedDevices" :key="groupIndex">
+						<view class="share-header">
+							<text>分享给"{{group.sharedTo}}"的设备</text>
+							<text class="edit-btn"
+								@click="toggleEdit(groupIndex)">{{editingGroup === groupIndex ? '完成' : '编辑'}}</text>
+						</view>
+						<block>
+
+							<view class="device-card" v-for="(item, index) in group.devices" :key="index"
+								:ref="'swipeItem_' + index">
+								<view class="checkbox" v-if="editingGroup === groupIndex">
+									<uni-icons @click="handleDelete(item)" type="minus" size="20" color="#FF4D4F"></uni-icons>
+								</view>
+								<view class="device-content" @click.stop="handleFile(item)">
+									<view class="device-header">
+										<view class="deviceIMG">
+											<image :src="item.devicePic" class="IMG"></image>
+										</view>
+										<view class="device-name">
+											<view>设备:{{item.deviceName}}</view>
+											<view class="ID">
+												<view class="ID">
+													ID:{{item.deviceImei}}</view>
+												<view class="onlines">在线</view>
+												<view>电量：{{item.battery || '80'}}%</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+					</view>
+					<!-- 加载状态提示 -->
+					<!-- 	<view class="loading-status">
+						<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>
+			</scroll-view>
+		</view>
+		<!-- 删除弹框 -->
+		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')">
+			<view class="agreement-popupC" @click.stop>
+				<view class="popup-content">
+					<image src="/static/images/delel.png" mode="" class="svg"></image>
+					<uni-icon class="trash"></uni-icon>
+					<view>
+						<view class="popup-Title">确定停止分享该设备</view>
+					</view>
+				</view>
+				<!-- 按钮组 -->
+				<view class="popup-buttons">
+					<button class="btn agreeBtn" @click="handleBtn">确定</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		deviceShareList,
+		otherDeviceShareList,
+		deviceShareDelete
+	} from '@/api/6170/share.js'
+	export default {
+		data() {
+			return {
+				deviceList: [],
+				tabs: [{
+						name: '我的分享',
+					},
+					{
+						name: '他人分享',
+					},
+				],
+				activeTab: 0,
+				deleteShow: false,
+				page: 1, // 当前页码
+				size: 10, // 每页条数
+				total: 0, // 总数据量
+				loading: false,
+				finished: false,
+				deviceId: '',
+				editingGroup: null, // 编辑的分组索引
+				currentGroup: null // 当前操作的分组
+			}
+		},
+		computed: {
+			// 根据分享用户分组设备
+			groupedDevices() {
+				const groups = {};
+				this.deviceList.forEach(device => {
+					// 这里假设device.sharedTo是分享目标的手机号
+					const key = device.sharedTo || '未分享';
+					if (!groups[key]) {
+						groups[key] = {
+							sharedTo: key,
+							devices: []
+						};
+					}
+					groups[key].devices.push(device);
+				});
+				return Object.values(groups);
+			},
+
+		},
+		methods: {
+			// 点击弹框外的区域关闭
+			closePopup(type) {
+				if (type === 'delete') {
+					this.deleteShow = false;
+				}
+			},
+			// 跳转到详情页面
+			handleFile(item) {
+				uni.navigateTo({
+					url: "/pages/6170/deviceControl/index",
+					success: (res) => {
+						// 页面跳转成功后的回调函数
+						res.eventChannel.emit('deviceControl', {
+							data: item,
+							apiType: 'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
+						});
+					}
+				})
+
+			},
+
+			// 编辑
+			toggleEdit(groupIndex) {
+				if (this.editingGroup === groupIndex) {
+					this.editingGroup = null;
+				} else {
+					this.editingGroup = groupIndex;
+				}
+			},
+			// 停止分享
+			handleDelete(item) {
+				console.log(item, 'www');
+				this.deleteShow = true
+				this.delelteItemInfo = item
+			},
+			// 确认停止移除
+			handleBtn() {
+				let allId = this.delelteItemInfo.id
+				deviceShareDelete(allId).then((res) => {
+					if (res.code = 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.deleteShow = false
+						this.editingGroup = null;
+						this.onIntall()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+			
+				})
+				//
+			},
+			// tab切换页
+			switchTab(tab, index) {
+				console.log(tab, 'tabsss');
+				this.deviceList = [];
+				this.activeTab = index;
+				this.page = 1; // 重置页
+				this.getData(tab);
+			},
+			// 获取设备列表
+			getData(tab) {
+				console.log(tab.name, 'tab');
+				if (this.loading) return;
+				this.loading = true;
+				let data = {
+					pageNum: this.page,
+					pageSize: this.size,
+				}
+				// 根据当前tab决定调用哪个接口
+				const apiCall = tab.name === '我的分享' ? deviceShareList : otherDeviceShareList;
+				console.log('nihao');
+				apiCall(data).then((res) => {
+					if (res.code == 200) {
+						const newDevices = res.rows.map(device => ({
+							...device,
+							showConfirm: false,
+							sharedTo: device.phonenumber || '未分享'
+						}));
+						// 分页处理
+						if (this.page === 1) {
+							this.deviceList = newDevices;
+						} else {
+							this.deviceList = [...this.deviceList, ...newDevices];
+						}
+
+						this.total = res.total;
+						// 判断是否已加载全部数据
+						if (res.rows.length < this.size || this.deviceList.length >= this.total) {
+							this.finished = true;
+						} else {
+							this.page++;
+						}
+					}
+				}).finally(() => {
+					this.loading = false;
+				});
+
+
+			},
+			// 滚动触底事件处理
+			onScrollToLower() {
+				this.getData();
+			},
+			onIntall() {
+				this.page = 1;
+				const currentTab = this.tabs[this.activeTab];
+				this.getData(currentTab);
+			},
+		},
+		onLoad() {
+			this.onIntall()
+			// 绑定页面做了监听,新增成功,刷新页面
+			uni.$on('refreshDeviceList', () => {
+				this.onIntall()
+			});
+		},
+		beforeDestroy() {
+			// 组件销毁前移除监听器
+			uni.$off('refreshDeviceList');
+		},
+	}
+</script>
+
+<style>
+	/* 页面整体样式 */
+	.device-page {
+		display: flex;
+		flex-direction: column;
+		min-height: 100vh;
+		background-color: rgb(18, 18, 18);
+		padding: 30rpx;
+	}
+
+	.tab-bar {
+		width: 100%;
+		color: rgb(255, 255, 255);
+		white-space: nowrap;
+		/* 禁止换行 */
+		overflow: hidden;
+		position: relative;
+
+	}
+
+	.tab-container {
+		display: flex;
+		/* justify-content: space-around; */
+		cursor: pointer;
+		margin-bottom: 40rpx;
+		/* 	min-width: 100%; */
+		/* 最小宽度 */
+	}
+
+	.tab-item {
+		font-size: 28rpx;
+		/* 	min-width: 120rpx; */
+		padding: 0 30rpx;
+		/* 左右内边距 */
+		text-align: center;
+		/* 文字居中 */
+		/* 设置最小宽度 */
+	}
+
+	.active {
+		color: rgba(187, 230, 0, 1);
+		border-bottom: 6rpx solid rgba(187, 230, 0, 1);
+		height: 60rpx;
+	}
+
+	/* 设备卡片 */
+	.device-card {
+		position: relative;
+		display: flex;
+		align-items: center;
+		width: 100%;
+	}
+
+	.device-content {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+		padding: 20rpx;
+		width: 100%;
+
+	}
+
+	.device-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 15rpx;
+	}
+
+
+	.device-name {
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+		margin-left: 24rpx;
+		line-height: 50rpx;
+		width: 78%;
+		white-space: nowrap;
+	}
+
+	.ID {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+
+	}
+
+	.circle {
+		width: 8rpx;
+		height: 40rpx;
+		position: absolute;
+		right: 25rpx;
+		top: 60rpx;
+	}
+
+	.online {
+		color: rgb(187, 230, 0);
+	}
+
+	.deviceIMG {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 16rpx;
+		position: relative;
+		background-color: rgba(42, 42, 42, 0.6);
+		display: flex;
+		align-items: center;
+	}
+
+	.IMG {
+		width: 68rpx;
+		height: 50rpx;
+		margin-left: 17%;
+		object-fit: contain;
+	}
+
+	.onlines {
+		position: relative;
+	}
+
+	.onlines::before {
+		content: '';
+		position: absolute;
+		width: 15rpx;
+		height: 15rpx;
+		background: rgb(0, 171, 103);
+		border-radius: 50%;
+		top: 20rpx;
+		left: -20rpx
+	}
+
+	.line {
+		width: 2rpx;
+		height: 24rpx;
+		background: linear-gradient(90deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgb(255, 255, 255) 50%,
+				rgba(255, 255, 255, 0) 100%);
+		margin-top: 12rpx;
+	}
+
+	.loading-status {
+		text-align: center;
+		color: rgba(255, 255, 255, 0.6);
+		padding: 20rpx;
+		font-size: 22rpx;
+	}
+
+	.noDATA {
+		text-align: center;
+		color: rgba(255, 255, 255, 0.87);
+		transform: translate(-0%, 100%);
+	}
+
+	.share-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 28rpx;
+		margin-bottom: 20rpx;
+		margin-top: 20rpx;
+	}
+
+	.edit-btn {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+	}
+
+	/* 遮罩层 */
+	.agreement-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+
+	.popup-Title {
+		color: rgba(255, 255, 255, 0.86);
+		text-align: center;
+		padding: 30rpx 0rpx;
+	}
+
+	.popup-buttons {
+		display: flex;
+		text-align: center;
+	}
+
+	/* 弹窗主体 */
+	.agreement-popup {
+		width: 100%;
+		height: 50%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 60rpx 60rpx 0rpx 0rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0rpx;
+	}
+
+	.agreement-popupC {
+		width: 60%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 40rpx;
+		padding: 30rpx;
+		text-align: center;
+		border: 1px solid rgba(255, 200, 78, 0.3);
+	}
+
+	.popup-flex {
+		display: flex;
+		white-space: nowrap;
+		color: rgba(255, 255, 255, 0.87);
+		height: 50rpx;
+		padding: 30rpx;
+		align-items: center;
+	}
+
+	.popup-input {
+		border: 1px solid rgba(255, 255, 255, 0.4);
+		border-radius: 12rpx;
+		margin-left: 15rpx;
+		padding: 10rpx 0rpx;
+		font-size: 28rpx;
+	}
+
+	.svg {
+		width: 58rpx;
+		height: 62rpx;
+	}
+
+	/* 通用按钮样式 */
+	.btn {
+		height: 60rpx;
+		line-height: 60rpx;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		margin: 10rpx auto;
+		text-align: center;
+
+	}
+
+	/* 同意按钮 */
+	.agreeBtn {
+		background: rgba(224, 52, 52, 1);
+		color: #232323;
+		border: none;
+		width: 170rpx !important;
+	}
+
+	.closeBtn {
+		border: 1px solid rgba(255, 255, 255, 0.2);
+		background-color: rgba(35, 35, 35, 0.87);
+		color: rgba(255, 255, 255, 1);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 9db8c79..cdf0b3f 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -1,214 +1,221 @@
 <template>
 	<view>
+		<!-- 添加全局加载遮罩 -->
+		<view v-if="pageLoading" class="page-loading-mask">
+		</view>
 		<!-- 使用自定义导航栏 -->
-		<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF" rightIcon="/static/images/shape.png"
-			@right-click="shareUp"></custom-navbar>
-		<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
-			<!-- 设备电量信息 -->
-			<view class="battery-section">
-				<view class="battery-sectionLeft">
-					<image :src="itemInfo.devicePic" class="bipImg"></image>
-				</view>
-				<view>
-					<view class="battery-v1">
-						<image src="/static/images/dl.png" class="dlIMG"></image>
-						<view>
-							<view class="battery-v2">90%</view>
-							<view class="battery-v3">电量</view>
-						</view>
+		<view v-show="!pageLoading">
+			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF"
+				:rightIcon="isRightIconVisible ? '/static/images/shape.png' : ''"
+				@right-click="shareUp"></custom-navbar>
+			<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
+				<!-- 设备电量信息 -->
+				<view class="battery-section">
+					<view class="battery-sectionLeft">
+						<image :src="deviceInfo.devicePic" class="bipImg"></image>
 					</view>
-					<view class="battery-v1">
-						<image src="/static/images/nz.png" class="dlIMG"></image>
-						<view>
-							<view class="battery-v2">1小时</view>
-							<view class="battery-v3">续航时间</view>
-						</view>
-					</view>
-				</view>
-				<view>
-
-				</view>
-			</view>
-
-			<!-- 设备基本信息 -->
-			<view class="info-card">
-				<view class="info-row">
-					<text class="info-label">IMEI号</text>
-					<text class="info-value">123456</text>
-				</view>
-				<view class="info-row">
-					<text class="info-label">设备状态</text>
-					<text class="info-value status-running">运行中</text>
-				</view>
-				<view class="info-row">
-					<text class="info-label">定位信息</text>
-					<view class="info-value status-running">
-						<view class="info-value status-running">114.72 30.28</view>
-						<view class="info-value status-running">深圳市龙华区富源晟</view>
-					</view>
-
-				</view>
-
-			</view>
-			<view class="info-row">
-				<text class="info-label">灯光亮度</text>
-				<text class="info-value status-running">{{ sliderValue }}%</text>
-			</view>
-
-			<!-- 灯光亮度控制 -->
-			<view class="control-card">
-				<slider :value="sliderValue" min="0" max="100" activeColor="rgb(187, 230, 0)"
-					backgroundColor="rgb(26, 26, 26)" :show-value="false" @changing="onSliderChanging"
-					@change="onSliderChanging" />
-			</view>
-
-			<!-- 灯光模式选择 -->
-			<view class="mode-section">
-				<view class="mode-buttons">
-					<view class="mode-v1">
-						<view class="mode-v2" @click="selectMode('main')">
-							<image src="/static/images/set.png" class="setIMG"></image>
+					<view>
+						<view class="battery-v1">
+							<image src="/static/images/dl.png" class="dlIMG"></image>
 							<view>
-								<view class="battery-v2">灯光模式</view>
-								<view class="mode-v3">{{ currentMainMode }}</view>
+								<view class="battery-v2">90%</view>
+								<view class="battery-v3">电量</view>
+							</view>
+						</view>
+						<view class="battery-v1">
+							<image src="/static/images/nz.png" class="dlIMG"></image>
+							<view>
+								<view class="battery-v2">1小时</view>
+								<view class="battery-v3">续航时间</view>
 							</view>
 						</view>
 					</view>
-					<view class="mode-v1">
-						<view class="mode-v2" @click="lasermode">
-							<image src="/static/images/jg.png" class="setIMG"></image>
-							<view>
-								<view class="battery-v2">激光模式</view>
-								<!--<view class="mode-v3">{{currentSecondaryMode}}</view> -->
+					<view>
+					</view>
+				</view>
+
+				<!-- 设备基本信息 -->
+				<view class="info-card">
+					<view class="info-row">
+						<text class="info-label">IMEI号</text>
+						<text class="info-value">{{deviceInfo.deviceImei}}</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">设备状态</text>
+						<text class="info-value status-running">运行中</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">定位信息</text>
+						<view class="info-value status-running">
+							<view class="info-value status-running">114.72 30.28</view>
+							<view class="info-value status-running">深圳市龙华区富源晟</view>
+						</view>
+
+					</view>
+
+				</view>
+				<view class="info-row">
+					<text class="info-label">灯光亮度</text>
+					<text class="info-value status-running">{{ sliderValue }}%</text>
+				</view>
+
+				<!-- 灯光亮度控制 -->
+				<view class="control-card">
+					<slider :value="sliderValue" min="0" max="100" activeColor="rgb(187, 230, 0)"
+						backgroundColor="rgb(26, 26, 26)" :show-value="false" @changing="onSliderChanging"
+						@change="onSliderChanging" />
+				</view>
+
+				<!-- 灯光模式选择 -->
+				<view class="mode-section">
+					<view class="mode-buttons">
+						<view class="mode-v1" v-if="hasPermission('1')">
+							<view class="mode-v2" @click="selectMode('main')">
+								<image src="/static/images/set.png" class="setIMG"></image>
+								<view>
+									<view class="battery-v2">灯光模式</view>
+									<view class="mode-v3">{{ currentMainMode }}</view>
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="mode-v1">
-						<view class="mode-v2" @click="uploadStartup">
-							<image src="/static/images/path7.png" class="setIMG"></image>
-							<view>
-								<view class="battery-v2">开机画面</view>
-								<view class="mode-v3">上传</view>
+						<view class="mode-v1" v-if="hasPermission('2')">
+							<view class="mode-v2" @click="lasermode">
+								<image src="/static/images/jg.png" class="setIMG"></image>
+								<view>
+									<view class="battery-v2">激光模式</view>
+									<!--<view class="mode-v3">{{currentSecondaryMode}}</view> -->
+								</view>
+							</view>
+						</view>
+						<view class="mode-v1" v-if="hasPermission('3')">
+							<view class="mode-v2" @click="uploadStartup">
+								<image src="/static/images/path7.png" class="setIMG"></image>
+								<view>
+									<view class="battery-v2">开机画面</view>
+									<view class="mode-v3">上传</view>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
 
-			<!-- 人员信息登记 -->
-			<view class="form-section">
-				<view class="mode-buttons">
-					<view class="section-title">人员信息登记</view>
-					<!-- <button class="send-btn">发送</button> -->
-					<view class="right-icons">
-						<uni-icons @click="toggleForm" :type="isFormExpanded ? 'arrowup' : 'down'" size="20"
-							color="rgba(255, 255, 255, 0.87" class="toggle-icon" />
+				<!-- 人员信息登记 -->
+				<view class="form-section" v-if="hasPermission('4')">
+					<view class="mode-buttons">
+						<view class="section-title">人员信息登记</view>
+						<!-- <button class="send-btn">发送</button> -->
+						<view class="right-icons">
+							<uni-icons @click="toggleForm" :type="isFormExpanded ? 'arrowup' : 'down'" size="20"
+								color="rgba(255, 255, 255, 0.87" class="toggle-icon" />
+						</view>
 					</view>
-				</view>
-				<view class="form-content" v-if="isFormExpanded">
-					<button class="send-btn1" @click="sendPersonnelInfo">发送</button>
-					<view class="form-row">
-						<text class="form-label">单位：</text>
-						<input class="form-input" placeholder="请输入单位" v-model="personnelInfo.unit" />
-					</view>
-					<view class="form-row">
-						<text class="form-label">姓名：</text>
-						<input class="form-input" placeholder="请输入姓名" v-model="personnelInfo.name" />
-					</view>
-					<view class="form-row">
-						<text class="form-label">职位：</text>
-						<input class="form-input" placeholder="请输入职位" v-model="personnelInfo.position" />
-					</view>
-					<view class="form-row">
-						<text class="form-label">ID：</text>
-						<input class="form-input" placeholder="请输入ID号" v-model="personnelInfo.id" />
-					</view>
-				</view>
-			</view>
-			<!-- 人员信息登记 -->
-			<view class="form-section">
-				<view class="mode-buttons">
-					<view class="section-title">发送信息</view>
-					<button class="send-btn" @click="sendTextMessage">发送</button>
-				</view>
-
-				<view class="form-row">
-					<input class="form-input" placeholder="请输入文字" v-model="messageToSend" />
-				</view>
-			</view>
-			<!-- 产品信息 -->
-			<view class="section-title">产品信息</view>
-			<view class="mode-buttons">
-				<view class="mode_1" @click="productparams">
-					<image src="/static/images/cp.png" mode="" class="cpIMG"></image>
-					<view class="">产品参数</view>
-				</view>
-				<view class="mode_1" @click="operatingInst">
-					<image src="/static/images/sm.png" mode="" class="cpIMG"></image>
-					<view class="">操作说明</view>
-				</view>
-				<view class="mode_1" @click="operatingVideo">
-					<image src="/static/images/sp.png" mode="" class="cpIMG"></image>
-					<view class="">操作视频</view>
-				</view>
-			</view>
-		</view>
-		<!-- 弹框 -->
-		<view class="agreement-mask" v-if="lightModeA">
-			<!-- 协议弹窗 -->
-			<view class="agreement-popup" @click.stop>
-				<!-- 标题 -->
-				<view class="popup-title"> {{ popupTitle }}</view>
-				<view class="popup-content">
-					<view v-for="(item, index) in items" :key="index">
-						<view class="item" :class="{'selected': item.selected}" @click="onItemClick(index)">
-							<image :src="item.image" class="setIMG"></image>
-							{{item.text}}
+					<view class="form-content" v-if="isFormExpanded">
+						<button class="send-btn1" @click="sendPersonnelInfo">发送</button>
+						<view class="form-row">
+							<text class="form-label">单位：</text>
+							<input class="form-input" placeholder="请输入单位" v-model="personnelInfo.unitName" />
+						</view>
+						<view class="form-row">
+							<text class="form-label">姓名：</text>
+							<input class="form-input" placeholder="请输入姓名" v-model="personnelInfo.name" />
+						</view>
+						<view class="form-row">
+							<text class="form-label">职位：</text>
+							<input class="form-input" placeholder="请输入职位" v-model="personnelInfo.position" />
+						</view>
+						<view class="form-row">
+							<text class="form-label">ID：</text>
+							<input class="form-input" placeholder="请输入ID号" v-model="personnelInfo.code" />
 						</view>
 					</view>
 				</view>
-				<!-- 按钮组 -->
-				<view class="popup-buttons">
-					<button class="agree" @click="handleSumbit">确定</button>
-				</view>
-			</view>
-		</view>
-		<!-- 上传开机画面弹框 -->
-		<view class="agreement-mask" v-if="lightModeB">
-			<!-- 上传画面弹窗 -->
-			<view class="agreement-popupB">
-				<!-- 标题 -->
-				<view class="popup-title">上传开机画面</view>
-				<view class="popup-content">
-					<view class="example-body">
-						<uni-file-picker limit="1" class="custom-file-picker"></uni-file-picker>
-						<view class="example_title">点击上传图片</view>
+				<!-- 人员信息登记 -->
+				<view class="form-section" v-if="hasPermission('5')">
+					<view class="mode-buttons">
+						<view class="section-title">发送信息</view>
+						<button class="send-btn" @click="sendTextMessage">发送</button>
+					</view>
+
+					<view class="form-row">
+						<input class="form-input" placeholder="请输入文字" v-model="messageToSend" />
 					</view>
 				</view>
-				<!-- 按钮组 -->
-				<view class="popup-buttons">
-					<button class="agree" @click="handleupload">确定</button>
-				</view>
-			</view>
-		</view>
-		<!--===================== 激光提示框================== -->
-		<view class="agreement-mask" v-if="lightModeC">
-			<!-- 上传画面弹窗 -->
-			<view class="agreement-popupC">
-				<!-- 标题 -->
-				<view class="popup-title">确认开启激光模式？</view>
-				<view class="popup-content">
-					<view class="popup-Title">
-						<view>注意事项</view>
-						<view>1.禁止直视光源或反射面！</view>
-						<view>2.避免直射人或易燃物！</view>
-						<view>3.需佩戴相应专业防护眼镜！</view>
+				<!-- 产品信息 -->
+				<view v-if="hasPermission('6')">
+					<view class="section-title">产品信息</view>
+					<view class="mode-buttons">
+						<view class="mode_1" @click="productparams">
+							<image src="/static/images/cp.png" mode="" class="cpIMG"></image>
+							<view class="">产品参数</view>
+						</view>
+						<view class="mode_1" @click="operatingInst">
+							<image src="/static/images/sm.png" mode="" class="cpIMG"></image>
+							<view class="">操作说明</view>
+						</view>
+						<view class="mode_1" @click="operatingVideo">
+							<image src="/static/images/sp.png" mode="" class="cpIMG"></image>
+							<view class="">操作视频</view>
+						</view>
 					</view>
 				</view>
-				<!-- 按钮组 -->
-				<view class="popup-buttons">
-					<button class="btn disagree" @click="handleDisagree">取消</button>
-					<button class="btn agreeBtn" @click="handleBtn">确定</button>
+			</view>
+			<!-- 弹框 -->
+			<view class="agreement-mask" v-if="lightModeA">
+				<!-- 协议弹窗 -->
+				<view class="agreement-popup" @click.stop>
+					<!-- 标题 -->
+					<view class="popup-title"> {{ popupTitle }}</view>
+					<view class="popup-content">
+						<view v-for="(item, index) in items" :key="index">
+							<view class="item" :class="{'selected': item.selected}" @click="onItemClick(index)">
+								<image :src="item.image" class="setIMG"></image>
+								{{item.text}}
+							</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleSumbit">确定</button>
+					</view>
+				</view>
+			</view>
+			<!-- 上传开机画面弹框 -->
+			<view class="agreement-mask" v-if="lightModeB">
+				<!-- 上传画面弹窗 -->
+				<view class="agreement-popupB">
+					<!-- 标题 -->
+					<view class="popup-title">上传开机画面</view>
+					<view class="popup-content">
+						<view class="example-body">
+							<uni-file-picker limit="1" class="custom-file-picker"></uni-file-picker>
+							<view class="example_title">点击上传图片</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleupload">确定</button>
+					</view>
+				</view>
+			</view>
+			<!--===================== 激光提示框================== -->
+			<view class="agreement-mask" v-if="lightModeC">
+				<!-- 上传画面弹窗 -->
+				<view class="agreement-popupC">
+					<!-- 标题 -->
+					<view class="popup-title">确认开启激光模式？</view>
+					<view class="popup-content">
+						<view class="popup-Title">
+							<view>注意事项</view>
+							<view>1.禁止直视光源或反射面！</view>
+							<view>2.避免直射人或易燃物！</view>
+							<view>3.需佩戴相应专业防护眼镜！</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="btn disagree" @click="handleDisagree">取消</button>
+						<button class="btn agreeBtn" @click="handleBtn">确定</button>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -217,10 +224,20 @@
 
 <script>
 	import MqttClient from '@/utils/mqtt.js';
+	import {
+		deviceDetail,
+		registerPersonInfo,
+		deviceSendMessage,
+		deviceShareId
+	} from '@/api/6170/deviceControl.js'
+	import {
+		getDeviceId
+	} from '../../../store/BLETools';
 
 	export default {
 		data() {
 			return {
+				pageLoading: true,
 				mainMode: 'string',
 				secondaryMode: 'string',
 				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
@@ -238,11 +255,22 @@
 				mqttClient: null,
 				messageToSend: '',
 				personnelInfo: {
-					unit: '',
+					unitName: '',
 					name: '',
 					position: '',
-					id: ''
-				}
+					code: '',
+				},
+				deviceInfo: {},
+				modeInstructions: {
+					'关灯': [1, 0, 0, 0, 0],
+					'强光': [1, 1, 0, 0, 0],
+					'弱光': [1, 2, 0, 0, 0],
+					'爆闪': [1, 3, 0, 0, 0],
+					'泛光': [1, 4, 0, 0, 0]
+				},
+				activePermissions: [], // 存储当前设备的权限数组
+				isSharedDevice: false, // 标记是否来自分享
+				isRightIconVisible: false
 			}
 		},
 		computed: {
@@ -292,29 +320,32 @@
 
 			onItemClick(index) {
 				const selectedItem = this.items[index];
-				console.log(selectedItem.text, 'selectedItem.text');
 				if (selectedItem.text === '激光') {
 					this.lightModeC = true
 					this.selectedItemIndex = index; // 记录当前选择的索引
 				} else {
-					this.updateSelectedItem(index);
+					this.items = this.items.map((item, i) => ({
+						...item,
+						selected: i === index
+					}));
+					// 记录当前选中的 index，但不发送
+					this.selectedItemIndex = index;
+					console.log(selectedItem.text, 'selectedItem.text');
 				}
 			},
-			updateSelectedItem(index) {
-				this.items = this.items.map((item, i) => ({
-					...item,
-					selected: i === index
-				}));
-				if (this.modeType === 'main') {
-					this.currentMainMode = this.items[index].text + '模式';
-				} else {
-					this.currentSecondaryMode = this.items[index].text + '模式';
-				}
-				this.showPopup = false; // 关闭弹窗
-			},
-			// 确认
+			// 灯光模式的确认
 			handleSumbit() {
-				this.lightModeA = false
+				if (this.selectedItemIndex === null) return;
+				const selectedItem = this.items[this.selectedItemIndex];
+				const instruction = this.modeInstructions[selectedItem.text];
+				if (instruction) {
+					const topic = `B/${this.itemInfo.deviceImei}`;
+					const message = JSON.stringify(instruction);
+					this.mqttClient.publish(topic, message);
+					console.log('已发送指令:', instruction);
+				}
+				this.lightModeA = false;
+				// this.lightModeA = false
 			},
 			// 上传开机画面
 			uploadStartup() {
@@ -358,42 +389,87 @@
 				})
 
 			},
-			// 同意
+			// 激光确认框
 			handleBtn() {
 				this.lightModeC = false
-				this.updateSelectedItem(this.selectedItemIndex); // 使用记录的索引来更新选择项
-				this.lightModeA = false //关闭大弹框
 			},
-			// 不同意
+			//取消
 			handleDisagree() {
 				this.lightModeC = false
 			},
 			// 发送人员信息
 			sendPersonnelInfo() {
-				if (!this.mqttClient || !this.mqttClient.client.isConnected()) {
+				// if (!this.mqttClient || !this.mqttClient.client.isConnected()) {
+				// 	uni.showToast({
+				// 		title: 'MQTT未连接',
+				// 		icon: 'none'
+				// 	});
+				// 	return;
+				// }
+				// const topic = `device/command/${this.deviceID}/personnel`;
+				// const message = JSON.stringify(this.personnelInfo);
+				// this.mqttClient.publish(topic, message);
+				// uni.showToast({
+				// 	title: '人员信息已发送',
+				// 	icon: 'success'
+				// });
+
+				if (!this.personnelInfo.unitName) {
 					uni.showToast({
-						title: 'MQTT未连接',
+						title: '单位名称不能为空',
 						icon: 'none'
 					});
 					return;
 				}
-				const topic = `device/command/${this.deviceID}/personnel`;
-				const message = JSON.stringify(this.personnelInfo);
-				this.mqttClient.publish(topic, message);
-				uni.showToast({
-					title: '人员信息已发送',
-					icon: 'success'
-				});
+				if (!this.personnelInfo.name) {
+					uni.showToast({
+						title: '姓名不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.personnelInfo.position) {
+					uni.showToast({
+						title: '职位不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.personnelInfo.code) {
+					uni.showToast({
+						title: 'ID不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '发送中...',
+					mask: true
+				})
+				let data = {
+					code: this.personnelInfo.code,
+					name: this.personnelInfo.name,
+					position: this.personnelInfo.position,
+					unitName: this.personnelInfo.unitName,
+					deviceId: this.deviceID
+				}
+				registerPersonInfo(data).then((res) => {
+					if (res.code == 200) {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
 			},
 			// 发送文本消息
 			sendTextMessage() {
-				if (!this.mqttClient || !this.mqttClient.client.isConnected()) {
-					uni.showToast({
-						title: 'MQTT未连接',
-						icon: 'none'
-					});
-					return;
-				}
 				if (!this.messageToSend) {
 					uni.showToast({
 						title: '请输入要发送的文字',
@@ -401,29 +477,113 @@
 					});
 					return;
 				}
-				const topic = `device/command/${this.deviceID}/message`;
-				this.mqttClient.publish(topic, this.messageToSend);
-				uni.showToast({
-					title: '消息已发送',
-					icon: 'success'
-				});
+				uni.showLoading({
+					title: '发送中...',
+					mask: true
+				})
+				let data = {
+					sendMsg: this.messageToSend,
+					deviceIds: [this.deviceID]
+				}
+				deviceSendMessage(data).then((res) => {
+					if (res.code == 200) {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+				// const topic = `device/command/${this.deviceID}/message`;
+				// this.mqttClient.publish(topic, this.messageToSend);
+				// uni.showToast({
+				// 	title: '消息已发送',
+				// 	icon: 'success'
+				// });
+			},
+			// 统一处理返回方法
+			handleDeviceData(res, isFromShared = false) {
+				if (res.code == 200) {
+					// 最后关闭加载状态
+					this.pageLoading = false
+					this.deviceInfo = res.data
+					this.personnelInfo = {
+						unitName: res.data.personnelInfo?.unitName || '',
+						name: res.data.personnelInfo?.name || '',
+						code: res.data.personnelInfo?.code || '',
+						position: res.data.personnelInfo?.position || '',
+					}
+					// 将权限字符串转换为数组 ["1", "2"]
+					if (isFromShared) {
+						this.isSharedDevice = true
+						this.activePermissions = res.data.permission ?
+							res.data.permission.split(',') : []
+					} else {
+						this.isSharedDevice = false
+						this.activePermissions = [] // 非分享设备清空权限
+					}
+					this.messageToSend = res.data.sendMsg || ''
+					// 关闭加载中
+                  	uni.hideLoading()
+				}
+			},
+			// 检查权限的方法
+			hasPermission(permissionCode) {
+				// 如果还在加载中，直接返回false
+				if (this.pageLoading) return false
+				// 如果不是分享设备，默认有全部权限
+				if (!this.isSharedDevice) return true
+				return this.activePermissions.includes(permissionCode)
+			},
+			// 获取设备详情（普通详情）
+			async fetchDeviceDetail(id) {
+				try {
+					const res = await deviceDetail(id)
+					this.handleDeviceData(res, false)
+				} catch (error) {
+					uni.showToast({
+						title: '获取详情失败',
+						icon: 'none'
+					})
+				}
+			},
+			// 获取分享设备详情
+			async fetchSharedDeviceDetail(id) {
+				try {
+					const res = await deviceShareId(id)
+					this.handleDeviceData(res, true)
+				} catch (error) {
+					uni.showToast({
+						title: '获取分享详情失败',
+						icon: 'none'
+					})
+				}
 			}
 		},
 		onLoad(options) {
 			const eventChannel = this.getOpenerEventChannel();
 			// 监听 'detailData' 事件，获取传过来的数据
+			uni.showLoading({
+				title: '加载中...'
+			})
 			eventChannel.on('deviceControl', (data) => {
 				this.itemInfo = data.data;
 				this.deviceID = data.data.id;
 				this.navTitle = data.data.deviceName;
-				console.log('Received detail data:', this.navTitle);
-
+				this.apiType = data.apiType
+				// 根据 apiType 设置右图标的显示状态
+				this.isRightIconVisible = this.apiType === 'listA';
 				// 初始化并连接MQTT
 				this.mqttClient = new MqttClient();
 				this.mqttClient.connect(() => {
 					console.log('MQTT 连接成功，开始订阅主题');
 					// 订阅来自设备的状态更新
-					const statusTopic = `device/status/${this.deviceID}`;
+					const statusTopic = `A/${this.itemInfo.deviceImei}`;
 					this.mqttClient.subscribe(statusTopic, (payload) => {
 						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
 						uni.showModal({
@@ -433,9 +593,16 @@
 						});
 					});
 				});
+				if (this.apiType === 'listA') {
+					this.fetchDeviceDetail(data.data.id)
+				} else {
+					this.fetchSharedDeviceDetail(data.data.deviceId)
+				}
+
 			});
 			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 			eventChannel.emit('ack', {})
+
 		},
 		onUnload() {
 			// 页面卸载时断开MQTT连接
@@ -448,6 +615,24 @@
 </script>
 
 <style scoped>
+	.page-loading-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #121212;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+	/* 优化权限控制区域的显示 */
+	.mode-section,
+	.form-section {
+		transition: opacity 0.3s ease;
+	}
+
 	.device-detail-container {
 		padding: 30rpx;
 		background: #121212;
diff --git a/pages/6170/share/index.vue b/pages/6170/share/index.vue
index 2cbee2c..f3ff6ca 100644
--- a/pages/6170/share/index.vue
+++ b/pages/6170/share/index.vue
@@ -39,7 +39,15 @@
 			// 分享管理
 			shareManagement(){
 				uni.navigateTo({
-					url: '/pages/6170/shareManagement/index'
+					url: '/pages/6170/shareManagement/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('shareManagement', {
+							data: this.itemInfo,
+						});
+					}
 				});
 			}
 		},
diff --git a/pages/6170/shareDevices/index.vue b/pages/6170/shareDevices/index.vue
index 534d3d9..664f6ca 100644
--- a/pages/6170/shareDevices/index.vue
+++ b/pages/6170/shareDevices/index.vue
@@ -109,8 +109,8 @@
 					}
 				],
 				deviceInfo: {},
-				phone: '13058067817',
-				code: '123456',
+				phone: '',
+				code: '',
 				itemInfo: ''
 			};
 		},
@@ -227,7 +227,7 @@
 			handleBtn() {
 				this.shareShow = false
 				uni.navigateTo({
-					url: '/pages/6170/shareManagement/index'
+					url: '/pages/6170/allShare/index'
 				})
 			},
 		},
diff --git a/pages/6170/shareManagement/index.vue b/pages/6170/shareManagement/index.vue
index 8529589..d2d9bf4 100644
--- a/pages/6170/shareManagement/index.vue
+++ b/pages/6170/shareManagement/index.vue
@@ -2,7 +2,7 @@
 	<view class="share">
 		<view class="device-title">已分享用户</view>
 		<view class="device-info" v-for="(item, index) in deviceList" :key="index">
-			<view class="device-header">
+			<view class="device-header" @click.stop="handleFile(item)">
 				<view class="deviceIMG">
 					<image :src="item.devicePic" mode="" class="IMG"></image>
 				</view>
@@ -13,8 +13,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="device-delete" >
-					<text class="delete" @click="handleDelete(item)">移除</text>
+				<view class="device-delete">
+					<text class="delete" @click.stop="handleDelete(item)">移除</text>
 				</view>
 			</view>
 		</view>
@@ -38,55 +38,85 @@
 </template>
 
 <script>
-	import {deviceShareList,deviceShareDelete} from '@/api/6170/share.js'
+	import {
+		deviceShareList,
+		deviceShareDelete
+	} from '@/api/6170/share.js'
 	export default {
 		data() {
 			return {
 				deviceList: [],
-				deleteShow:false,
-				delelteItemInfo:''
+				deleteShow: false,
+				delelteItemInfo: '',
+				itemInfo: ''
 			}
 		},
 		methods: {
+			// 点击弹框外的区域关闭
+			closePopup(type) {
+				if (type === 'delete') {
+					this.deleteShow = false;
+				}
+			},
 			// 删除
 			handleDelete(item) {
-				console.log(item,'www');
-              this.deleteShow=true
-			  this.delelteItemInfo=item
+				console.log(item, 'www');
+				this.deleteShow = true
+				this.delelteItemInfo = item
 			},
-			handleBtn(){
-				let allId=this.delelteItemInfo.id
-				deviceShareDelete(allId).then((res)=>{
-					if (res.code=200) {
+			handleBtn() {
+				let allId = this.delelteItemInfo.id
+				deviceShareDelete(allId).then((res) => {
+					if (res.code = 200) {
 						uni.showToast({
-							title:res.msg,
-							icon:'none'
+							title: res.msg,
+							icon: 'none'
 						})
-						this.deleteShow=false
+						this.deleteShow = false
 						this.getData()
-					} else{
+					} else {
 						uni.showToast({
-							title:res.msg,
-							icon:'none'
+							title: res.msg,
+							icon: 'none'
 						})
 					}
-					
+
 				})
 				//
 			},
-			getData(){
-				let data ={
+			getData(val) {
+				let data = {
+					deviceid: val
 				}
-				deviceShareList(data).then((res)=>{
-					if (res.code==200) {
-						this.deviceList=res.rows
+				deviceShareList(data).then((res) => {
+					if (res.code == 200) {
+						this.deviceList = res.rows
+					}
+				})
+			},
+			// 跳转分享详情
+			handleFile(item) {
+				uni.navigateTo({
+					url: "/pages/6170/deviceControl/index",
+					success: (res) => {
+						// 页面跳转成功后的回调函数
+						res.eventChannel.emit('deviceControl', {
+							data: item,
+							apiType: 'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
+						});
 					}
 				})
 			}
 
 		},
 		onLoad() {
-			this.getData()
+			const eventChannel = this.getOpenerEventChannel();
+			// 监听 'shareDevice' 事件，获取传过来的数据
+			eventChannel.on('shareManagement', (data) => {
+				console.log(data, 'data1t111');
+				this.itemInfo = data.data;
+				this.getData(this.itemInfo.id)
+			})
 		}
 	}
 </script>
@@ -97,6 +127,7 @@
 		background: #121212;
 		min-height: 100vh;
 	}
+
 	.device-title {
 		color: rgba(255, 255, 255, 0.87);
 		padding: 30rpx 0;
@@ -173,6 +204,7 @@
 		background: rgba(26, 26, 26, 1);
 		border-radius: 16rpx;
 	}
+
 	/* 遮罩层 */
 	.agreement-mask {
 		position: fixed;
@@ -186,16 +218,18 @@
 		align-items: center;
 		z-index: 9999;
 	}
+
 	.popup-Title {
 		color: rgba(255, 255, 255, 0.86);
 		text-align: center;
 		padding: 30rpx 0rpx;
 	}
+
 	.popup-buttons {
 		display: flex;
 		text-align: center;
 	}
-	
+
 	/* 弹窗主体 */
 	.agreement-popup {
 		width: 60%;
@@ -205,11 +239,12 @@
 		text-align: center;
 		border: 1px solid rgba(255, 200, 78, 0.3);
 	}
+
 	.svg {
 		width: 58rpx;
 		height: 62rpx;
 	}
-	
+
 	/* 通用按钮样式 */
 	.btn {
 		height: 60rpx;
@@ -218,9 +253,9 @@
 		font-size: 24rpx;
 		margin: 10rpx auto;
 		text-align: center;
-	
+
 	}
-	
+
 	/* 同意按钮 */
 	.agreeBtn {
 		background: #FFC84E;
diff --git a/pages/common/allType/index.vue b/pages/common/allType/index.vue
new file mode 100644
index 0000000..57187c1
--- /dev/null
+++ b/pages/common/allType/index.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="alltype">
+		<!-- 车辆列表 -->
+		<view class="vehicle-list">
+			<view v-for="(item, index) in vehicles" :key="index">
+				<view class="vehicle-item" @click="alltypeInfo(item)">
+					<image src="/static/images/bip.6.png" mode="" class="IMG"></image>
+				</view>
+				<view class="plate-number">{{ item.typeName }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		deviceTypeList,
+	} from '@/api/common/index.js'
+	export default {
+		data() {
+			return {
+				vehicles: [],
+			}
+		},
+		methods: {
+			getTab() {
+				deviceTypeList({}).then((res) => {
+					if (res.code == 200) {
+						this.vehicles = res.data
+					}
+				})
+			},
+			alltypeInfo(item){
+				uni.switchTab({
+					url: '/pages/common/index/index',
+					success: (res) => {
+						res.eventChannel.emit('index', {
+							data: item
+						});
+					}
+				})
+			}
+			
+		},
+		onLoad() {
+			this.getTab()
+		}
+	}
+</script>
+
+<style scoped>
+	.alltype {
+		padding: 30rpx;
+		background: rgba(18, 18, 18, 1);
+		min-height: 100vh;
+		color: #FFFFFF;
+		font-family: PingFang SC, sans-serif;
+	}
+
+	.vehicle-list {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		text-align: center;
+
+	}
+
+	.list-header {
+		display: flex;
+		align-items: baseline;
+		margin-bottom: 32rpx;
+	}
+
+	.vehicle-item {
+		padding: 24rpx 0;
+		background: rgba(26, 26, 26, 1);
+		border-radius: 16rpx;
+		width: 156rpx;
+		height: 156rpx;
+		margin-right: 16rpx;
+		margin-bottom: 16rpx;
+		line-height: 156rpx;
+
+	}
+
+	.IMG {
+		width: 100rpx;
+		height: 72rpx;
+		cursor: pointer;
+	}
+
+	.plate-number {
+		color: rgba(255, 255, 255, 0.87);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index d998a5c..fbd3477 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -12,8 +12,11 @@
 						{{tab.typeName}}
 					</view>
 				</view>
+				<view class="uniui-more" >
+					<image @click="allMore" src="/static/images/more.png" mode="" class="more"></image>
+				</view>
 			</scroll-view>
-			<view class="sendFlex" v-if="activeTab && activeTab.id !== ''">
+			<view class="sendFlex" v-if="activeTab && activeTab.id !== '' ||activeTab.communicationMode==0">
 				<view class="callpolice">报警</view>
 				<view class="Sendmessage" @click="location">位置</view>
 				<view class="Sendmessage" @click="handleSend">发送信息</view>
@@ -109,6 +112,17 @@
 				</view>
 			</view>
 		</view>
+		<!-- ====分享，类型提示框==== -->
+		<view class="tooltip-share" v-if="showshare">
+			<view class="tooltip-arrow"></view>
+			<view class="tooltip-content">
+				<view class="tooltip-item" v-for="(item, index) in shareItems" :key="index"
+					@click="handleshareClick(item)">
+					<image :src="item.icon" class="item-icon" />
+					<text>{{ item.text }}</text>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -127,6 +141,7 @@
 				tabs: [],
 				activeTab: 0,
 				showTooltip: false,
+				showshare: false,
 				Options: [{
 						text: '重命名',
 						style: {
@@ -158,6 +173,17 @@
 						action: 'bluetooth'
 					}
 				],
+				shareItems: [{
+						text: '所有类型',
+						icon: '/static/images/type.png',
+						action: 'type'
+					},
+					{
+						text: '所有分享',
+						icon: '/static/images/share.png',
+						action: 'share'
+					}
+				],
 				page: 1, // 当前页码
 				size: 10, // 每页条数
 				total: 0, // 总数据量
@@ -168,6 +194,26 @@
 			}
 		},
 		methods: {
+			// 更多
+			allMore(){
+				this.showshare = !this.showshare;
+			},
+			// 所有分享,所有类型
+			handleshareClick(item){
+				this.showshare = false; // 关闭弹窗
+				switch (item.action) {
+					case 'type':
+						uni.navigateTo({
+							url: '/pages/common/allType/index'
+						});
+						break;
+					case 'share':
+						uni.navigateTo({
+							url: "/pages/6170/allShare/index"
+						})
+						break;
+				}
+			},
 			// 点击弹框外的区域关闭
 			closePopup(type) {
 				if (type === 'delete') {
@@ -208,7 +254,6 @@
 				const deviceType = tab.id === '' ? undefined : tab.id;
 				this.getData(deviceType);
 			},
-
 			// 获取设备列表
 			getData(deviceType = '') {
 				if (this.loading || this.finished) return;
@@ -243,10 +288,11 @@
 			onScrollToLower() {
 				this.getData();
 			},
+			// 添加扫一三图标
 			scan() {
 				this.showTooltip = !this.showTooltip;
 			},
-
+            // 添加设备,扫一扫,蓝牙
 			handleMenuClick(item) {
 				this.showTooltip = false; // 关闭弹窗
 				switch (item.action) {
@@ -256,15 +302,6 @@
 						});
 						break;
 					case 'bluetooth':
-						// uni.navigateTo({
-						// 	url: 'pages/common/addBLE/AddDevice',
-						// 	success:(res)=>{
-						// 		 res.eventChannel.emit('key', { data: 'data from starter page' })
-						// 	},fail: (ex) => {
-						// 		console.log("跳转失败了",JSON.stringify(ex));
-						// 	}
-						// });
-
 						uni.navigateTo({
 							url: "/pages/common/addBLE/addEquip"
 						})
@@ -391,7 +428,8 @@
 						success: (res) => {
 							// 页面跳转成功后的回调函数
 							res.eventChannel.emit('deviceControl', {
-								data: item
+								data: item,
+								apiType: 'listA' // 自定义标识，详情哪里根据这个参数不同信息
 							});
 						}
 					})
@@ -454,6 +492,7 @@
 		white-space: nowrap;
 		/* 禁止换行 */
 		overflow: hidden;
+		position: relative;
 
 	}
 
@@ -491,6 +530,21 @@
 		font-size: 28rpx;
 	}
 
+	.uniui-more {
+		position: relative;
+		width: 100%;
+	}
+
+	.more {
+		width: 40rpx;
+		height: 8rpx;
+		/* position: absolute; */
+		/* right: 0rpx;
+	 z-index: 100; */
+		float: right;
+		top: -95rpx
+	}
+
 	.gprs {
 		width: 28rpx;
 		height: 35rpx;
@@ -634,10 +688,11 @@
 		padding: 20rpx;
 		font-size: 22rpx;
 	}
-	.noDATA{
+
+	.noDATA {
 		text-align: center;
 		color: rgba(255, 255, 255, 0.87);
-		transform: translate(-0%,100%);
+		transform: translate(-0%, 100%);
 	}
 
 	/* 遮罩层 */
@@ -757,6 +812,13 @@
 		/* 根据导航栏高度调整 */
 		z-index: 9999;
 	}
+	.tooltip-share{
+		position: fixed;
+		right: 18rpx;
+		top: 230rpx;
+		/* 根据导航栏高度调整 */
+		z-index: 9999;
+	}
 
 	.tooltip-arrow {
 		width: 0;
diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue
index 01e9ad1..ada8c38 100644
--- a/pages/common/send/index.vue
+++ b/pages/common/send/index.vue
@@ -34,12 +34,29 @@
 			<view style="padding:20rpx;">
 				<view class="ql-editor">编辑信息</view>
 				<view class="ql-input">
-					<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea" />
+					<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea"
+						v-model="messageToSend" />
 				</view>
-				<button class="login-btn">发送</button>
+				<button class="login-btn" @click="sendTextMessage">发送</button>
 			</view>
 
 		</scroll-view>
+		<!-- 成功提示弹框 -->
+		<view class="agreement-mask" v-if="personalShow" @click="closePopup('delete')">
+			<view class="agreement-popup" @click.stop>
+				<view class="popup-content">
+					<image src="/static/images/sendSucc.png" mode="" class="svg"></image>
+					<uni-icon class="trash"></uni-icon>
+					<view>
+						<view class="popup-Title">信息发送成功</view>
+					</view>
+				</view>
+				<!-- 按钮组 -->
+				<view class="popup-buttons">
+					<button class="btn agreeBtn" @click="handleBtn">确定</button>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -47,10 +64,15 @@
 	import {
 		deviceInfo,
 	} from '@/api/common/index.js'
+	import {
+		deviceSendMessage
+	} from '@/api/6170/deviceControl.js'
 	export default {
 		data() {
 			return {
 				deviceList: [],
+				messageToSend: '', //发送信息
+				personalShow: false
 			}
 		},
 		methods: {
@@ -58,14 +80,6 @@
 				this.deviceList[index].checked = !this.deviceList[index].checked
 				this.$forceUpdate()
 			},
-			sendMessage() {
-				const selectedDevices = this.deviceList.filter(item => item.checked)
-				console.log('选中的设备:', selectedDevices)
-				uni.showToast({
-					title: `已发送到${selectedDevices.length}台设备`,
-					icon: 'success'
-				})
-			},
 			// 获取设备列表
 			getData(deviceType) {
 				this.loading = true;
@@ -88,6 +102,36 @@
 					this.loading = false;
 				});
 			},
+			// 发送文本消息
+			sendTextMessage() {
+				const selectedDevices = this.deviceList.filter(item => item.checked)
+				const deviceIds = selectedDevices.map(item => item.id);
+				if (!this.messageToSend) {
+					uni.showToast({
+						title: '请输入要发送的内容',
+						icon: 'none'
+					});
+					return;
+				}
+				let data = {
+					sendMsg: this.messageToSend,
+					deviceIds: deviceIds
+				}
+				deviceSendMessage(data).then((res) => {
+					if (res.code == 200) {
+						this.personalShow = true
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			handleBtn(){
+					this.personalShow = false
+					uni.navigateBack()
+			}
 		},
 		onLoad(options) {
 			const eventChannel = this.getOpenerEventChannel();
@@ -296,4 +340,63 @@
 		width: 90%;
 		margin-left: 10rpx;
 	}
+
+	/* 遮罩层 */
+	.agreement-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+
+	.popup-Title {
+		color: rgba(255, 255, 255, 0.86);
+		text-align: center;
+		padding: 30rpx 0rpx;
+	}
+
+	.popup-buttons {
+		display: flex;
+		text-align: center;
+	}
+
+	/* 弹窗主体 */
+	.agreement-popup {
+		width: 60%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 40rpx;
+		padding: 30rpx;
+		text-align: center;
+		border: 1px solid rgba(255, 200, 78, 0.3);
+	}
+
+	.svg {
+		width: 58rpx;
+		height: 62rpx;
+	}
+
+	/* 通用按钮样式 */
+	.btn {
+		height: 60rpx;
+		line-height: 60rpx;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		margin: 10rpx auto;
+		text-align: center;
+
+	}
+
+	/* 同意按钮 */
+	.agreeBtn {
+		background: rgba(187, 230, 0, 1);
+		color: #232323;
+		border: none;
+		width: 170rpx !important;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/delel.png b/static/images/delel.png
new file mode 100644
index 0000000..d93d845
Binary files /dev/null and b/static/images/delel.png differ
diff --git a/static/images/more.png b/static/images/more.png
new file mode 100644
index 0000000..8c11ae0
Binary files /dev/null and b/static/images/more.png differ
diff --git a/static/images/sendSucc.png b/static/images/sendSucc.png
new file mode 100644
index 0000000..a9cba80
Binary files /dev/null and b/static/images/sendSucc.png differ
diff --git a/static/images/share.png b/static/images/share.png
new file mode 100644
index 0000000..508adef
Binary files /dev/null and b/static/images/share.png differ
diff --git a/static/images/type.png b/static/images/type.png
new file mode 100644
index 0000000..8f5b8c9
Binary files /dev/null and b/static/images/type.png differ
diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js
index 147a0c5..a23b0f2 100644
--- a/unpackage/dist/dev/app-plus/app-config-service.js
+++ b/unpackage/dist/dev/app-plus/app-config-service.js
@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/common/login/index","pages/common/index/index","pages/common/user/index","pages/common/scan/scan","pages/common/qrcode/qrcode","pages/common/send/index","pages/common/userAgreement/index","pages/common/privacyAgreement/index","pages/common/aboutUs/index","pages/6170/deviceControl/index","pages/common/operationVideo/index","pages/common/addvideo/index","pages/common/operatingInstruct/index","pages/common/productDes/index","pages/common/addBLE/addEquip","pages/common/addBLE/LinkBle","pages/6155/deviceDetail","pages/6155/ImgCrop","pages/common/map/index"],"window":{"navigationBarTextStyle":"white","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#121212","backgroundColor":"#121212"},"tabBar":{"color":"#fff","selectedColor":"#BBE600","backgroundColor":"#202020","list":[{"pagePath":"pages/common/index/index","text":"我的设备","iconPath":"/static/tabs/device.png","selectedIconPath":"/static/tabs/device-HL.png"},{"pagePath":"pages/common/user/index","text":"我的","iconPath":"/static/tabs/my.png","selectedIconPath":"/static/tabs/my-HL.png"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"JingQuan","compilerVersion":"4.66","entryPagePath":"pages/common/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/common/login/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的"}},{"path":"/pages/common/scan/scan","meta":{},"window":{"navigationBarTitleText":"扫描"}},{"path":"/pages/common/qrcode/qrcode","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/common/send/index","meta":{},"window":{"navigationBarTitleText":"发送信息"}},{"path":"/pages/common/userAgreement/index","meta":{},"window":{"navigationBarTitleText":"用户协议"}},{"path":"/pages/common/privacyAgreement/index","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/common/aboutUs/index","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/6170/deviceControl/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/operationVideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addvideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/operatingInstruct/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/productDes/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addBLE/addEquip","meta":{},"window":{"navigationBarTitleText":"添加设备"}},{"path":"/pages/common/addBLE/LinkBle","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/6155/deviceDetail","meta":{},"window":{"navigationBarTitleText":"HBY 6155"}},{"path":"/pages/6155/ImgCrop","meta":{},"window":{"navigationBarTitleText":"图像裁剪","navigationStyle":"custom","fullscreen":true}},{"path":"/pages/common/map/index","meta":{},"window":{"navigationBarTitleText":"地图"}}];
+var __uniConfig = {"pages":["pages/common/login/index","pages/common/index/index","pages/common/user/index","pages/common/scan/scan","pages/common/qrcode/qrcode","pages/common/send/index","pages/common/userAgreement/index","pages/common/privacyAgreement/index","pages/common/aboutUs/index","pages/6170/deviceControl/index","pages/common/operationVideo/index","pages/common/addvideo/index","pages/common/operatingInstruct/index","pages/common/productDes/index","pages/common/addBLE/addEquip","pages/common/addBLE/LinkBle","pages/6155/deviceDetail","pages/6155/ImgCrop","pages/common/map/index","pages/common/allType/index","pages/6170/allShare/index","pages/6170/share/index","pages/6170/shareDevices/index","pages/6170/shareManagement/index"],"window":{"navigationBarTextStyle":"white","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#121212","backgroundColor":"#121212"},"tabBar":{"color":"#fff","selectedColor":"#BBE600","backgroundColor":"#202020","list":[{"pagePath":"pages/common/index/index","text":"我的设备","iconPath":"/static/tabs/device.png","selectedIconPath":"/static/tabs/device-HL.png"},{"pagePath":"pages/common/user/index","text":"我的","iconPath":"/static/tabs/my.png","selectedIconPath":"/static/tabs/my-HL.png"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"JingQuan","compilerVersion":"4.64","entryPagePath":"pages/common/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/common/login/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的"}},{"path":"/pages/common/scan/scan","meta":{},"window":{"navigationBarTitleText":"扫描"}},{"path":"/pages/common/qrcode/qrcode","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/common/send/index","meta":{},"window":{"navigationBarTitleText":"发送信息"}},{"path":"/pages/common/userAgreement/index","meta":{},"window":{"navigationBarTitleText":"用户协议"}},{"path":"/pages/common/privacyAgreement/index","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/common/aboutUs/index","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/6170/deviceControl/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/operationVideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addvideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/operatingInstruct/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/productDes/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addBLE/addEquip","meta":{},"window":{"navigationBarTitleText":"添加设备"}},{"path":"/pages/common/addBLE/LinkBle","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/6155/deviceDetail","meta":{},"window":{"navigationBarTitleText":"HBY 6155"}},{"path":"/pages/6155/ImgCrop","meta":{},"window":{"navigationBarTitleText":"图像裁剪","navigationStyle":"custom","fullscreen":true}},{"path":"/pages/common/map/index","meta":{},"window":{"navigationBarTitleText":"地图"}},{"path":"/pages/common/allType/index","meta":{},"window":{"navigationBarTitleText":"所有类型"}},{"path":"/pages/6170/allShare/index","meta":{},"window":{"navigationBarTitleText":"所有分享"}},{"path":"/pages/6170/share/index","meta":{},"window":{"navigationBarTitleText":"分享"}},{"path":"/pages/6170/shareDevices/index","meta":{},"window":{"navigationBarTitleText":"分享设备"}},{"path":"/pages/6170/shareManagement/index","meta":{},"window":{"navigationBarTitleText":"分享管理"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index 3231a5c..009a045 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__A21EF43","name":"JingQuan","version":{"name":"1.0.0","code":"100"},"description":"设备管控","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"Barcode":{},"Camera":{},"Maps":{"coordType":"gcj02"},"OAuth":{},"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#121212"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"splashscreen":{"useOriginalMsgbox":true,"androidStyle":"common","iosStyle":"common","android":{"hdpi":"static/images/biao.png","xhdpi":"static/images/biao.png","xxhdpi":"static/images/biao.png"}},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.a\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"minSdkVersion":21},"apple":{"appid":"uni.app.UNIA21EF43","privacyDescription":{"NSBluetoothPeripheralUsageDescription":"需要蓝牙访问权限，用于设备通信","NSBluetoothAlwaysUsageDescription":"需要蓝牙访问权限，用于设备通信"},"dSYMs":false},"plugins":{"geolocation":{"amap":{"name":"amapHG8nIFW5","__platform__":["ios","android"],"appkey_ios":"065c43f02c7b627a74ad7dd23b16bb4f","appkey_android":"d7d852dbda2b95f6f796fb9a711a9fee"}},"maps":{"amap":{"name":"amapHG8nIFW5","appkey_ios":"065c43f02c7b627a74ad7dd23b16bb4f","appkey_android":"d7d852dbda2b95f6f796fb9a711a9fee"}},"oauth":{},"push":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#202020","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.66","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#fff","selectedColor":"#BBE600","backgroundColor":"#202020","list":[{"pagePath":"pages/common/index/index","text":"我的设备","iconPath":"/static/tabs/device.png","selectedIconPath":"/static/tabs/device-HL.png"},{"pagePath":"pages/common/user/index","text":"我的","iconPath":"/static/tabs/my.png","selectedIconPath":"/static/tabs/my-HL.png"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html"},"locale":"auto"}
\ No newline at end of file
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__A21EF43","name":"JingQuan","version":{"name":"1.0.0","code":"100"},"description":"设备管控","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"Barcode":{},"Camera":{},"Maps":{"coordType":"gcj02"},"OAuth":{},"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#121212"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"splashscreen":{"useOriginalMsgbox":true,"androidStyle":"common","iosStyle":"common","android":{"hdpi":"static/images/biao.png","xhdpi":"static/images/biao.png","xxhdpi":"static/images/biao.png"}},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.a\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"minSdkVersion":21},"apple":{"appid":"uni.app.UNIA21EF43","privacyDescription":{"NSBluetoothPeripheralUsageDescription":"需要蓝牙访问权限，用于设备通信","NSBluetoothAlwaysUsageDescription":"需要蓝牙访问权限，用于设备通信"},"dSYMs":false},"plugins":{"geolocation":{"amap":{"name":"amapHG8nIFW5","__platform__":["ios","android"],"appkey_ios":"065c43f02c7b627a74ad7dd23b16bb4f","appkey_android":"d7d852dbda2b95f6f796fb9a711a9fee"}},"maps":{"amap":{"name":"amapHG8nIFW5","appkey_ios":"065c43f02c7b627a74ad7dd23b16bb4f","appkey_android":"d7d852dbda2b95f6f796fb9a711a9fee"}},"oauth":{},"push":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#202020","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.64","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#fff","selectedColor":"#BBE600","backgroundColor":"#202020","list":[{"pagePath":"pages/common/index/index","text":"我的设备","iconPath":"/static/tabs/device.png","selectedIconPath":"/static/tabs/device-HL.png"},{"pagePath":"pages/common/user/index","text":"我的","iconPath":"/static/tabs/my.png","selectedIconPath":"/static/tabs/my-HL.png"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html"},"locale":"auto"}
\ No newline at end of file
diff --git a/utils/mqtt.js b/utils/mqtt.js
index 9e13d87..a95a486 100644
--- a/utils/mqtt.js
+++ b/utils/mqtt.js
@@ -149,7 +149,7 @@ class MqttClient {
 				}
 			};
 
-			this.client.onMessageArrived = (message) => {
+			this.client.onMessageArrived = (message) => {   
 				const topic = message.destinationName;
 				const payload = message.payloadString;
 				console.log(`收到消息, 主题: ${topic}, 内容: ${payload}`);