diff --git a/pages.json b/pages.json
index 16a4efc..b79a3a0 100644
--- a/pages.json
+++ b/pages.json
@@ -65,6 +65,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/210/deviceControl/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/common/operationVideo/index",
 			"style": {
diff --git a/pages/210/deviceControl/index.vue b/pages/210/deviceControl/index.vue
new file mode 100644
index 0000000..c212ba5
--- /dev/null
+++ b/pages/210/deviceControl/index.vue
@@ -0,0 +1,1222 @@
+<template>
+	<view>
+		<!-- 添加全局加载遮罩 -->
+		<view v-if="pageLoading" class="page-loading-mask">
+		</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" mode="aspectFit"></image>
+					</view>
+					<view>
+						<view class="battery-v1">
+							<image src="/static/images/dl.png" class="dlIMG"></image>
+							<view>
+								<view class="battery-v2">{{deviceInfo.batteryPercentage}}%</view>
+								<view class="battery-v3">电量</view>
+							</view>
+						</view>
+						<view class="battery-v1">
+							<image src="/static/images/nz.png" class="dlIMG" mode="aspectFit"></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">设备状态</text>
+						<text class="info-value status-running">运行中</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">联机状态</text>
+						<text class="info-value status-greend">联机</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">定位信息</text>
+						<view class="info-value status-running" @click="gpsPosition">
+							<view class="info-value status-running">114.72 30.28</view>
+							<view class="info-value status-running">
+								<uni-icons @click="toggleForm" type="location" size="17"
+									color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
+								深圳市龙华区富源晟
+							</view>
+						</view>
+					</view>
+				</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 class="mode-v1" v-if="hasPermission('2')">
+							<view class="mode-v2" @click="lasermode">
+								<image src="/static/images/jg.png" class="setIMG" mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">激光模式</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" mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">开机画面</view>
+									<view class="mode-v3">上传</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 人员信息登记 -->
+				<view class="form-section" v-if="hasPermission('4')">
+					<view class="mode-buttons">
+						<view class="section-title">人员信息登记</view>
+						<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 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="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 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" mode="aspectFit"></image>
+							<view class="">产品参数</view>
+						</view>
+						<view class="mode_1" @click="operatingInst">
+							<image src="/static/images/sm.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<view class="">操作说明</view>
+						</view>
+						<view class="mode_1" @click="operatingVideo">
+							<image src="/static/images/sp.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<view class="">操作视频</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 弹框 -->
+			<view class="agreement-mask" v-if="lightModeA" @click.stop="closePopup">
+				<!-- 灯光模式弹窗 -->
+				<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" @click.stop="closePopup">
+				<!-- 上传画面弹窗 -->
+				<view class="agreement-popupB" @click.stop>
+					<!-- 标题 -->
+					<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="icoContent" @click="checkImgUpload">
+								<!-- <image mode="aspectFit" class="img" src="/static/images/6155/DeviceDetail/add.png">
+								</image> -->
+								<image v-if="selectedImage" :src="selectedImage" mode="aspectFit" class="img"
+									style="width: 100%; height: 100%;"></image>
+								<image v-else mode="aspectFit" class="img"
+									src="/static/images/6155/DeviceDetail/add.png"></image>
+							</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleupload">确定</button>
+					</view>
+				</view>
+			</view>
+			<!--===================== 激光提示框================== -->
+			<view class="agreement-mask" v-if="lightModeC" @click.stop="closePopup">
+				<!-- 上传画面弹窗 -->
+				<view class="agreement-popupC" @click.stop>
+					<!-- 标题 -->
+					<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.stop="handleBtn">确定</button>
+					</view>
+				</view>
+			</view>
+			<!-- 人员信息成功提示弹框 -->
+			<CustomPopup :show="showPopupFlag" :message="popupMessage" icon="/static/images/sendSucc.png"
+				:confirm-text="popupConfirmText" :show-cancel="false" @confirm="onPopupConfirm" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import MqttClient from '@/utils/mqtt.js';
+	import {
+		deviceDetail,
+		registerPersonInfo,
+		deviceSendMessage,
+		deviceShareId,
+		lightModeSettings, //灯光模式设置
+		laserModeSettings, //激光模式设置
+		mapReverseGeocoding //地图逆解析
+	} from '@/api/6170/deviceControl.js'
+	import {
+		getDeviceId
+	} from '../../../store/BLETools';
+	import {
+		baseURL,
+		getToken,
+		clientid
+	} from '@/utils/request'
+	export default {
+		data() {
+			return {
+				pageLoading: true,
+				mainMode: 'string',
+				secondaryMode: 'string',
+				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
+				navTitle: "",
+			
+				lightModeA: false,
+				currentMainMode: '强光',
+				lightModeB: false,
+				lightModeC: false, //激光提示框
+				items: [],
+				isFormExpanded: true, // 默认展开
+				deviceID: '',
+				itemInfo: {},
+				mqttClient: null,
+				messageToSend: '',
+				personnelInfo: {
+					unitName: '',
+					name: '',
+					position: '',
+					code: '',
+				},
+				deviceInfo: {},
+
+				activePermissions: [], // 存储当前设备的权限数组
+				isSharedDevice: false, // 标记是否来自分享
+				isRightIconVisible: false,
+				showPopupFlag: false, //是否显示弹框
+				popupMessage: '！',
+				popupConfirmText: '确认',
+				showUploadPopup: false,
+				selectedImage: null, // 添加这个变量来存储选择的图片
+				file: '',
+				selectedItemIndex: 0
+			}
+		},
+		computed: {
+			popupTitle() {
+				return this.modeType === 'main' ? '灯光模式' : '激光模式';
+			}
+		},
+		methods: {
+			// 点击弹框外的区域关闭
+			closePopup() {
+				this.lightModeA = false;
+				this.lightModeB = false;
+				this.lightModeC = false;
+			},
+			// *******定位******
+			gpsPosition() {
+				uni.navigateTo({
+					url: '/pages/common/map/index'
+				})
+			},
+			selectMode(type) {
+				this.modeType = type;
+				this.lightModeA = true;
+				if (type === 'main') {
+					this.items = [{
+							text: '强光',
+							selected: this.currentMainMode === '强光', // 修正匹配条件
+							image: '/static/images/sett.png',
+							instructValue: '1'
+						},
+						{
+							text: '弱光',
+							selected: this.currentMainMode === '弱光',
+							image: '/static/images/rg.png',
+							instructValue: '2'
+						},
+						{
+							text: '爆闪',
+							selected: this.currentMainMode === '爆闪',
+							image: '/static/images/bs.png',
+							instructValue: '3'
+						},
+						{
+							text: '泛光',
+							selected: this.currentMainMode === '泛光',
+							image: '/static/images/settt.png',
+							instructValue: '4'
+						},
+						{
+							text: '关闭',
+							selected: this.currentMainMode === '关闭',
+							image: '/static/images/close.png',
+							instructValue: '0'
+						},
+					];
+				}
+			},
+			// 人员信息登录
+			toggleForm() {
+				this.isFormExpanded = !this.isFormExpanded;
+			},
+			onItemClick(index) {
+				const selectedItem = this.items[index];
+				if (selectedItem.text === '激光') {
+					this.lightModeC = true;
+				} else {
+					// 更新选中状态
+					this.items = this.items.map((item, i) => ({
+						...item,
+						selected: i === index
+					}));
+					this.currentMainMode = selectedItem.text;
+					this.selectedItemIndex = index;
+					// 强制更新视图（如果需要）
+					this.$forceUpdate();
+				}
+			},
+			// 灯光模式的确认
+			handleSumbit() {
+				if (this.selectedItemIndex === null) return;
+				const selectedItem = this.items[this.selectedItemIndex];
+				console.log(selectedItem, 'selectedItemselectedItem');
+				// 修正这里的赋值错误，应该保存索引而不是文本
+				this.selectedItemIndex = this.selectedItemIndex;
+				let data = {
+					deviceId: this.deviceID,
+					instructValue: selectedItem.instructValue
+				}
+				lightModeSettings(data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
+						this.lightModeA = false;
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
+					}
+				})
+			},
+			// 激光模式
+			lasermode() {
+				this.lightModeC = true
+			},
+			// 激光确认框提交
+			handleBtn() {
+				let data = {
+					deviceId: this.deviceID,
+					instructValue: 1
+				}
+				laserModeSettings(data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
+						this.lightModeC = false
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
+					}
+				})
+
+			},
+			//激光取消
+			handleDisagree() {
+				this.lightModeC = false
+			},
+			// 上传开机画面
+			uploadStartup() {
+				this.lightModeB = true
+			},
+			// 上传开机画面
+			checkImgUpload() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: (res) => {
+						// 将选择的图片赋值给selectedImage
+						const file = res.tempFiles[0];
+						const fileSize = file.size || 0;
+						if (fileSize > 2 * 1024 * 1024) {
+							console.log(`文件过大: ${fileSize} 字节`); // 调试日志
+							uni.showToast({
+								title: '图片大小不能超过2MB',
+								icon: 'none',
+								duration: 3000
+							});
+							return;
+						}
+						this.selectedImage = res.tempFilePaths[0];
+						console.log('选择的图片:', res);
+						//this.file = res.tempFiles[0].file
+					},
+					fail: (err) => {
+						console.error('选择图片失败:', err);
+						uni.showToast({
+							title: '选择图片失败',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			// 上传开机画面确认按键
+			handleupload() {
+				if (!this.selectedImage) {
+					uni.showToast({
+						title: '请上传一张图片',
+						icon: 'none'
+					});
+					return;
+				}
+				// 显示上传中加载提示
+				uni.showLoading({
+					title: '上传中...',
+					mask: true 
+				});
+
+				uni.uploadFile({
+					url: baseURL + '/app/device/uploadLogo',
+					filePath: this.selectedImage,
+					name: 'file',
+					formData: {
+						deviceId: this.deviceID,
+					},
+					header: {
+						'Authorization': 'Bearer ' + getToken(),
+						'clientid': clientid(),
+					},
+					complete: (res) => {
+						console.log(res, 'resss');
+						try {
+							const responseData = JSON.parse(res.data);
+							if (responseData.code === 200) {
+								uni.showToast({
+									title: responseData.msg,
+									icon: 'success'
+								});
+								this.selectedImage = '';
+								this.file = null;
+								this.lightModeB = false
+							} else {
+								uni.showToast({
+									title: responseData.msg,
+									icon: 'none'
+								});
+							}
+						} catch (e) {
+							uni.showToast({
+								title: '上传失败',
+								icon: 'none'
+							});
+						} finally {
+							uni.hideLoading();
+						}
+					}
+				})
+			},
+			// 分享
+			shareUp() {
+				uni.navigateTo({
+					url: '/pages/6170/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('share', {
+							data: this.itemInfo,
+						});
+					}
+				})
+			},
+
+			// 操作说明
+			operatingInst() {
+				uni.navigateTo({
+					url: `/pages/common/operatingInstruct/index?id=${this.deviceID}`
+				})
+			},
+			// 产品参数
+			productparams() {
+				uni.navigateTo({
+					url: `/pages/common/productDes/index?id=${this.deviceID}`
+				})
+			},
+			// 操作视频
+			operatingVideo() {
+				uni.navigateTo({
+					url: `/pages/common/operationVideo/index?id=${this.deviceID}`
+				})
+
+			},
+
+			// 发送人员信息
+			sendPersonnelInfo() {
+				if (!this.personnelInfo.unitName) {
+					uni.showToast({
+						title: '单位名称不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				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()
+						this.showPopupFlag = true
+						this.popupMessage = '人员信息发送成功'
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			onPopupConfirm() {
+				this.showPopupFlag = false
+				console.log('用户点击了确定')
+			},
+			// 发送文本消息
+			sendTextMessage() {
+				if (!this.messageToSend) {
+					uni.showToast({
+						title: '请输入要发送的文字',
+						icon: 'none'
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '发送中...',
+					mask: true
+				})
+				let data = {
+					sendMsg: this.messageToSend,
+					deviceIds: [this.deviceID]
+				}
+				deviceSendMessage(data).then((res) => {
+					if (res.code == 200) {
+						uni.hideLoading()
+						this.showPopupFlag = true
+						this.popupMessage = '发送信息成功'
+					} 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 || '',
+					}
+					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'
+					})
+				}
+			},
+		},
+		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;
+				this.apiType = data.apiType
+				// 根据 apiType 设置右图标的显示状态
+				this.isRightIconVisible = this.apiType === 'listA';
+				// 初始化并连接MQTT
+				this.mqttClient = new MqttClient();
+				this.mqttClient.connect(() => {
+					console.log('MQTT 连接成功，开始订阅主题');
+					// 订阅来自设备的状态更新
+					const statusTopic = `A/${this.itemInfo.nnnnnnnnnnnnnnnnnnn}`;
+					this.mqttClient.subscribe(statusTopic, (payload) => {
+						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
+						// uni.showModal({
+						// 	title: '收到设备消息',
+						// 	content: payload,
+						// 	showCancel: false
+						// });
+						// ✅ 发送全局事件通知主页面更新
+						uni.$emit('deviceStatusUpdate', {
+							message: JSON.stringify(payload), // 消息内容
+							timestamp: new Date().getTime() // 时间戳
+						});
+					});
+				});
+					this.fetchDeviceDetail(data.data.id)
+
+			});
+			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
+			eventChannel.emit('ack', {
+
+			})
+
+		},
+		onUnload() {
+			// 页面卸载时断开MQTT连接
+			if (this.mqttClient) {
+				this.mqttClient.disconnect();
+			}
+		},
+
+	}
+</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;
+		min-height: 100vh;
+	}
+
+	.status-bar {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 40rpx;
+	}
+
+	.time {
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+
+	.battery {
+		font-size: 36rpx;
+	}
+
+	.battery-section {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		align-items: center;
+	}
+
+	.battery-info,
+	.duration {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.bipImg {
+		width: 204rpx;
+		height: 144rpx;
+		margin-top: 30rpx;
+	}
+
+	.dlIMG {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.cpIMG {
+		width: 66rpx;
+		height: 66rpx;
+	}
+
+	.battery-sectionLeft {
+		width: 308rpx;
+		height: 220rpx;
+		background: rgba(42, 42, 42, 0.5);
+		border-radius: 16rpx;
+		text-align: center;
+		align-items: center;
+		line-height: 220rpx;
+	}
+
+	.percentage {
+		font-size: 48rpx;
+		font-weight: bold;
+		color: #007AFF;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #666;
+		margin-top: 10rpx;
+	}
+
+	.battery-v1 {
+		display: flex;
+		align-items: center;
+		margin-bottom: 10rpx;
+	}
+
+
+	.battery-v2 {
+		color: rgba(255, 255, 255, 0.87);
+		margin-left: 18rpx;
+		font-size: 32rpx;
+	}
+
+	.battery-v3 {
+		color: rgba(255, 255, 255, 0.6);
+		margin-left: 25rpx;
+		font-size: 26rpx;
+	}
+
+	.mode-v3 {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+		padding-top: 10rpx;
+	}
+
+	.info-card {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 10rpx 30rpx 5rpx 30rpx;
+		margin-bottom: 20rpx;
+
+	}
+
+	.info-row {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+	}
+
+	.info-label {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.info-value {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.status-running {
+		color: rgba(255, 255, 255, 0.6);
+		text-align: end;
+	}
+	.status-greend{
+		color: rgba(174, 214, 0, 1);
+		text-align: end;
+	}
+	.light {
+		position: absolute;
+		/* top:10rpx; */
+		color: rgba(74, 74, 74, 0.87);
+		top: 58rpx;
+		left: 108rpx
+	}
+
+	.section-title {
+		font-size: 32rpx;
+		margin-bottom: 20rpx;
+		display: block;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.slider-container {
+		display: flex;
+		align-items: center;
+	}
+
+	.slider {
+		flex: 1;
+		margin: 0 20rpx;
+	}
+
+	.mode-buttons {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+	}
+
+	.mode_1 {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 16rpx;
+		background: rgb(26, 26, 26);
+		align-items: center;
+		text-align: center;
+		color: rgba(255, 255, 255, 0.6);
+		padding-top: 37rpx;
+	}
+
+	.mode-v1 {
+		background: #1A1A1A;
+		border-radius: 18rpx;
+		height: 150rpx;
+		margin-bottom: 20rpx;
+		width: 47%;
+		display: flex;
+		text-align: center;
+	}
+
+	.mode-v2 {
+		display: flex;
+		align-items: center;
+		text-align: center;
+		margin-left: 40rpx;
+
+	}
+
+	.example-body {
+		position: absolute;
+		left: 50%;
+		top: 65%;
+		width: 100%;
+		transform: translate(-20%, -100%);
+	}
+
+	.icoContent {
+		width: 320rpx;
+		height: 160rpx;
+		border-radius: 8rpx;
+		background: rgba(58, 58, 58, 1);
+		text-align: center;
+		line-height: 200rpx;
+	}
+
+	.img {
+		width: 62rpx;
+		height: 62rpx;
+	}
+
+	.example_title {
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.mode-btn {
+		width: 48%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #f5f5f5;
+		color: #333;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		border: none;
+	}
+
+	.mode-btn.active {
+		background-color: #007AFF;
+		color: #fff;
+	}
+
+	.form-section {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+
+	}
+
+	.form-row {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		background: rgba(42, 42, 42, 1);
+		border-radius: 16rpx;
+		padding-left: 20rpx;
+	}
+
+	.form-label {
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.form-input {
+		height: 80rpx;
+		border: 1rpx solid transparent;
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.product-section {
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.product-tabs {
+		display: flex;
+		margin-top: 20rpx;
+	}
+
+	.tab {
+		padding: 15rpx 30rpx;
+		font-size: 28rpx;
+		color: #666;
+		border-bottom: 4rpx solid transparent;
+	}
+
+	.tab.active {
+		color: #007AFF;
+		border-bottom-color: #007AFF;
+	}
+
+	.action-buttons {
+		padding: 30rpx 0;
+	}
+
+	.send-btn {
+		background-color: rgb(187, 230, 0);
+		color: rgba(35, 35, 35, 0.87);
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		width: 112rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		right: 70rpx;
+
+	}
+
+	.send-btn1 {
+		background-color: rgb(187, 230, 0);
+		color: rgba(35, 35, 35, 0.87);
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		width: 112rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		right: 0rpx;
+		top: -70rpx
+	}
+
+
+	/* 遮罩层 */
+	.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;
+	}
+
+	/* 弹窗主体 */
+	.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-popupB {
+		width: 100%;
+		height: 32%;
+		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: 80%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 40rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		border: 1px solid rgba(255, 200, 78, 1);
+	}
+
+	.popup-Title {
+		color: rgba(255, 200, 78, 1);
+	}
+
+	/* 标题 */
+	.popup-title {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	/* 内容文本 */
+	.popup-content {
+		font-size: 30rpx;
+		line-height: 1.6;
+		color: rgba(255, 255, 255, 0.87);
+		margin-bottom: 50rpx;
+	}
+
+	.item {
+		padding: 10px;
+		margin: 5px 0;
+		display: flex;
+		align-items: center;
+		cursor: pointer;
+		transition: background-color 0.3s;
+	}
+
+	.setIMG {
+		width: 24px;
+		height: 24px;
+		margin-right: 10px;
+	}
+
+	.item.selected {
+		background-color: rgb(58, 58, 58);
+		color: rgba(255, 255, 255, 0.87);
+		border-radius: 8rpx;
+	}
+
+	/* 按钮容器 */
+	.popup-buttons {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	/*确定按钮 */
+	.agree {
+		background-color: rgb(187, 230, 0);
+		color: #232323;
+		border: none;
+		font-size: 24rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		font-size: 32rpx;
+		width: 100%;
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx
+	}
+
+	/* 通用按钮样式 */
+	.btn {
+		flex: 1;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+		font-size: 32rpx;
+		margin: 0 20rpx;
+	}
+
+	/* 不同意按钮 */
+	.disagree {
+		background-color: transparent;
+		color: rgba(255, 255, 255, 0.87);
+		border: 1px solid rgba(255, 200, 78, 0.7);
+		font-size: 24rpx;
+		color: rgba(255, 200, 78, 1);
+	}
+
+	/* 同意按钮 */
+	.agreeBtn {
+		background-color: rgba(255, 200, 78, 1);
+		color: #232323;
+		border: none;
+		font-size: 24rpx;
+	}
+
+	.right-icons {
+		/* display: flex; */
+		align-items: center;
+	}
+
+	.toggle-icon {
+		cursor: pointer;
+		font-size: 16px;
+		margin-top: -40rpx;
+	}
+
+	.icon {
+		font-size: 14px;
+		color: #fff;
+	}
+
+	.form-content {
+		transition: all 0.3s ease;
+		margin-top: 60rpx;
+		position: relative;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 7517bc3..8b1f1ba 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -18,14 +18,14 @@
 						<view class="battery-v1">
 							<image src="/static/images/dl.png" class="dlIMG"></image>
 							<view>
-								<view class="battery-v2">90%</view>
+								<view class="battery-v2">{{deviceInfo.batteryPercentage}}%</view>
 								<view class="battery-v3">电量</view>
 							</view>
 						</view>
 						<view class="battery-v1">
 							<image src="/static/images/nz.png" class="dlIMG" mode="aspectFit"></image>
 							<view>
-								<view class="battery-v2">1小时</view>
+								<view class="battery-v2">{{deviceInfo.batteryRemainingTime || '0分钟'}}</view>
 								<view class="battery-v3">续航时间</view>
 							</view>
 						</view>
@@ -42,7 +42,7 @@
 					</view>
 					<view class="info-row">
 						<text class="info-label">设备状态</text>
-						<text class="info-value status-running">运行中</text>
+						<text class="info-value status-running">{{deviceInfo.onlineStatus===0?'离线':'在线'}}</text>
 					</view>
 					<view class="info-row">
 						<text class="info-label">定位信息</text>
@@ -316,7 +316,7 @@
 				console.log('这是我滑动的吗');
 				this.sliderValue = e.detail.value;
 				let data = {
-					deviceld: this.deviceID,
+					deviceId: this.deviceID,
 					instructValue: this.sliderValue + '.00'
 				}
 				lightBrightnessSettings(data).then((res) => {
@@ -392,7 +392,7 @@
 				// 修正这里的赋值错误，应该保存索引而不是文本
 				this.selectedItemIndex = this.selectedItemIndex;
 				let data = {
-					deviceld: this.deviceID,
+					deviceId: this.deviceID,
 					instructValue: selectedItem.instructValue
 				}
 				lightModeSettings(data).then((res) => {
@@ -417,7 +417,7 @@
 			// 激光确认框提交
 			handleBtn() {
 				let data = {
-					deviceld: this.deviceID,
+					deviceId: this.deviceID,
 					instructValue: 1
 				}
 				laserModeSettings(data).then((res) => {
@@ -465,7 +465,7 @@
 						}
 						this.selectedImage = res.tempFilePaths[0];
 						console.log('选择的图片:', res);
-						this.file = res.tempFiles[0].file
+						//this.file = res.tempFiles[0].file
 					},
 					fail: (err) => {
 						console.error('选择图片失败:', err);
@@ -485,10 +485,16 @@
 					});
 					return;
 				}
+				// 显示上传中加载提示
+				uni.showLoading({
+					title: '上传中...',
+					mask: true 
+				});
+
 				uni.uploadFile({
 					url: baseURL + '/app/device/uploadLogo',
 					filePath: this.selectedImage,
-					name: this.file,
+					name: 'file',
 					formData: {
 						deviceId: this.deviceID,
 					},
@@ -524,7 +530,6 @@
 						}
 					}
 				})
-
 			},
 			// 分享
 			shareUp() {
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index 75ec93c..b33a3bd 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -41,8 +41,13 @@
 												<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
 												</view>
 												<view class="ID" v-else>ID:{{item.deviceMac}}</view>
-												<view class="onlines" v-if="item.communicationMode==0">在线</view>
-												<view>电量：90%</view>
+												<!-- 在线状态 -->
+												<view class="onlines"
+													v-if="item.communicationMode==0 && item.onlineStatus==1">在线</view>
+												<!-- 离线状态 -->
+												<view class="offlines"
+													v-if="item.communicationMode==0 && item.onlineStatus==0">离线</view>
+												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
 									</view>
@@ -423,7 +428,7 @@
 			handleFile(item) {
 				//console.log('item' + JSON.stringify(item));
 				// communicationMode 0是4G 1是蓝牙
-				if (item.communicationMode == 0) {
+				if (item.typeName == 'BJQ6170') {
 					uni.navigateTo({
 						url: "/pages/6170/deviceControl/index",
 						events: {
@@ -437,6 +442,19 @@
 							});
 						}
 					})
+				} else if (item.typeName == 'HBY210') {
+					uni.navigateTo({
+						url: "/pages/210/deviceControl/index",
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							// 页面跳转成功后的回调函数
+							res.eventChannel.emit('deviceControl', {
+								data: item,
+							});
+						}
+					})
 				}
 				if (item.typeName == '6155') {
 					uni.navigateTo({
@@ -460,7 +478,7 @@
 			updateDeviceStatus(data) {
 				// 只更新 communicationMode == 0 的设备
 				this.deviceList = this.deviceList.map(item => {
-					console.log(item,'item2222');
+					console.log(item, 'item2222');
 					if (item.communicationMode === 0) {
 						// 这里根据消息内容更新设备状态
 						// 示例：如果消息包含特定字段，则更新设备状态
@@ -703,6 +721,19 @@
 		top: 20rpx;
 		left: -20rpx
 	}
+	.offlines{
+		position: relative;
+	}
+	.offlines::before {
+		content: '';
+		position: absolute;
+		width: 15rpx;
+		height: 15rpx;
+		background: rgba(255, 255, 255, 0.4);
+		border-radius: 50%;
+		top: 20rpx;
+		left: -20rpx
+	}
 
 	.line {
 		width: 2rpx;
diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue
index e13a2f0..828101e 100644
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@@ -61,7 +61,7 @@
 		data() {
 			return {
 				showView: false,
-				phone: '13800138001', //手机号码
+				phone: '13800138002', //手机号码
 				code: "", //验证码
 				agreed: false,
 				isCounting: false,
diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue
index 3e85cb9..67e10cc 100644
--- a/pages/common/send/index.vue
+++ b/pages/common/send/index.vue
@@ -16,19 +16,16 @@
 						<view class="device-name">
 							<view>设备:{{item.deviceName}}</view>
 							<view class="ID">
-								<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
-								</view>
-								<view class="ID" v-else>ID:{{item.deviceMac}}</view>
-								<!-- <view class="onlines" v-if="item.communicationMode==0">在线</view> -->
-								<view class="unlines" v-if="item.communicationMode==0">离线</view>
-								<view>电量：90%</view>
+								<view class="ID">ID:{{item.deviceImei}}</view>
+								<view class="onlines"
+									v-if="item.onlineStatus==1">在线</view>
+								<!-- 离线状态 -->
+								<view class="unlines"
+									v-if="item.onlineStatus==0">离线</view>
+								<view>电量：{{item.battery || '0'}}%</view>
 							</view>
 						</view>
 					</view>
-					<view class="" v-if="item.communicationMode==1">
-						<view class="device-status online">已连接</view>
-						<view class="device-status unline">未连接</view>
-					</view>
 				</view>
 			</view>
 			<view class="editInfmation">