diff --git a/pages.json b/pages.json
index 9289587..4dc811d 100644
--- a/pages.json
+++ b/pages.json
@@ -339,6 +339,14 @@
 				"navigationBarTitleText" : "HBY102"
 			}
 		},
+		{
+			"path" : "pages/102J/HBY102J",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"navigationBarTitleText" : "HBY102"
+			}
+		},
 		{
 			"path" : "pages/common/user/logOff",
 			"style" : 
diff --git a/pages/102J/HBY102J.vue b/pages/102J/HBY102J.vue
new file mode 100644
index 0000000..294b6ca
--- /dev/null
+++ b/pages/102J/HBY102J.vue
@@ -0,0 +1,2282 @@
+<template>
+	<view class="content contentBg">
+		<uni-nav-bar class="nvbar" leftIcon="left" @clickLeft="navigatorBack">
+			<view slot="left">
+				<uni-icons type="back" size="23" color="#FFFFFF"></uni-icons>
+			</view>
+			<view slot="default" class="center uninavebartext">
+				{{Status.navbar.title}}
+			</view>
+			<view slot="right">
+				<view class="navbarRight center">
+					<view class="imgContent" @click.stop="handleRightClick(item,index)"
+						  v-for="item,index in Status.navbar.icons">
+						<image class="img" :src="item.src" mode="aspectFit"></image>
+						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
+					</view>
+
+				</view>
+
+			</view>
+
+		</uni-nav-bar>
+
+		<view class="eq">
+			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
+				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
+
+			</view>
+			<view class="rightTxt">
+				<view class="row">
+					<image class="img" src="/static/images/common/battry.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.sta_PowerPercent}}%</view>
+						<view class="smallTxt">电量</view>
+					</view>
+				</view>
+				<view class="row">
+					<image class="img" src="/static/images/common/time.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">
+							{{formData.sta_charge?dic.sta_charge[formData.sta_charge+'']:"未充电" }}
+						</view>
+						<view class="smallTxt">设备状态</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="eqinfo">
+
+			<view class="item">
+				<text class="lbl">设备名称</text>
+				<text class="value">{{device.deviceName}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">Mac地址</text>
+				<text class="value">{{device.deviceMac}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">蓝牙名称</text>
+				<text class="value">{{device.bluetoothName}}</text>
+			</view>
+			<view class="item" @click.top="bleStatuToggle">
+				<text class="lbl">蓝牙状态</text>
+				<text class="value" :class="(!formData.bleStatu || formData.bleStatu==='err')?'red':'green'">{{getbleStatu}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">信道:{{formData.sta_Channel}}</text>
+				<text class="value green" @click.stop="ShowChannelEdit()">修改</text>
+			</view>
+		</view>
+
+		<view class="warnnig" v-for="item,index in warnDevices">
+			<view>闯入报警！</view>
+			<view>
+				{{item.name}}
+
+			</view>
+		</view>
+
+		<view class="lampMode">
+			<view class="sosContent">
+				<view class="btnSos openSos center" :class="{active:formData.sta_LedType==='led_alarm'}"
+					  @click="sosSetting(dic.sta_LightType[6],6)">
+					{{formData.sta_LedType==='led_alarm'?'报警中':'强制报警'}}
+				</view>
+				<view class="btnSos closeSos center" @click="sosSetting(dic.sta_LightType[5],5)">解除</view>
+
+			</view>
+
+		</view>
+
+		<view class="lamp">
+			<view class="title">
+				<text>警示灯</text>
+
+			</view>
+		</view>
+
+		<view class="lampMode">
+			<view class="mode fleft " v-for="item,index in dic.sta_LightType.filter(v=>{return v.group=='sta_LedType'})"
+				  :class="{'active':formData[item.group]===item.key,
+				'marginLeft':index%2===1,
+				'displayNone':!item.show
+				}" v-on:click.stop="actionSett(item,index)">
+				<view class="leftImg">
+					<image class="img" :src="formData[item.group]===item.key?item.activeImg:item.img" mode="aspectFit">
+					</image>
+
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">{{item.name}}</text>
+
+				</view>
+			</view>
+
+
+
+			<view class="clear"></view>
+		</view>
+
+		<view class="lamp">
+			<view class="title">
+				<text>功能模式</text>
+
+			</view>
+		</view>
+		<view class="lampMode">
+			<view class="mode fleft "
+				  v-for="item,index in dic.sta_LightType.filter(v=>{return v.group!=='sta_LedType'})" :class="{'active':formData[item.group]===item.key,
+				'marginLeft':index%2===1,
+				'displayNone':!item.show
+				}" v-on:click.stop="actionSett(item,index)">
+				<view class="leftImg">
+					<image class="img" :src="formData[item.group]===item.key?item.activeImg:item.img" mode="aspectFit">
+					</image>
+
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">{{item.name}}</text>
+					<text class="smallTxt" v-if="item.group==='sta_RadarType'">{{Distance}}</text>
+
+				</view>
+			</view>
+
+
+
+			<view class="clear"></view>
+		</view>
+
+
+		<ProParams :id="device.id"></ProParams>
+		<!-- 弹窗通知 -->
+		<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
+					  :borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
+					  :buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
+					  :iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
+					  @buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
+					  v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
+					  :showCancel="Status.Pop.showCancel" @cancelPop="closePop" :showSlot="Status.Pop.showSlot">
+			<view v-if="Status.ShowEditChannel" class="popup-prompt">
+				<text class="popup-prompt-title">修改信道</text>
+				<input class="popup-prompt-input" type="number" placeholder="1-125的整数"
+					   placeholder-class="popup-prompt-input-placeHolder" v-model="formData.ins_Channel" />
+
+			</view>
+		</MessagePopup>
+
+		<!-- 下方菜单 -->
+
+
+		<global-loading ref="loading" />
+
+		<BottomSlideMenuPlus :config="Status.BottomMenu" @itemClick="btnClick" @close="closeActionSheet">
+
+		</BottomSlideMenuPlus>
+		<MsgBox ref="msgPop" />
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js'
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	import request, {
+		baseURL
+	} from '@/utils/request.js'
+
+	import Common from '@/utils/Common.js'
+    import {
+        MsgSuccess,
+        MsgError,
+        MsgClose,
+        MsgWarning,
+        showPop,
+        MsgInfo
+    } from '@/utils/MsgPops.js'
+	const pagePath = "/pages/102/HBY102";
+
+	var ble = null;
+	var these = null;
+	var recei = null;
+
+	var instrusionTime = null;
+
+
+
+	export default {
+		data() {
+			return {
+				Status: {
+					curr: 0,
+					total: 0,
+					pageHide: false,
+					ShowEditChannel: false,
+					Pop: {
+						showPop: false, //是否显示弹窗
+						popType: 'custom',
+						bgColor: '#383934bd',
+						borderColor: '#BBE600',
+						textColor: '#ffffffde',
+						buttonBgColor: '#BBE600',
+						buttonTextColor: '#232323DE',
+						iconUrl: '',
+						message: '您确定要这样做吗？',
+						buttonText: '确定',
+						clickEvt: '',
+						visiblePrompt: false,
+						promptTitle: '设备名称',
+						modelValue: '',
+						visibleClose: false,
+						okCallback: null,
+						buttonCancelText: '',
+						showCancel: false,
+					},
+					BottomMenu: {
+						show: false,
+						showHeader: true,
+						menuItems: [{
+								text: '2M',
+								value: 'status_2M',
+								icon: ''
+							},
+							{
+								text: '4M',
+								value: 'status_4M',
+								icon: ''
+							},
+							{
+								text: '7M',
+								value: 'status_7M',
+								icon: ''
+							},
+							{
+								text: '10M',
+								value: 'status_10M',
+								icon: ''
+							},
+							{
+								text: '关闭',
+								value: 'status_off',
+								icon: ''
+							}
+						],
+						activeIndex: -1,
+						bgColor: '#2a2a2a',
+						itemBgColor: '#3a3a3a',
+						textColor: '#ffffffde',
+						textAlign: 'flex-start',
+						title: '主灯模式',
+						showDivider: false,
+						dividerColor: '#00000000',
+						dividerThickness: '0rpx',
+						dividerMargin: '10rpx',
+						itemHeight: '80rpx',
+						type: '',
+						showBtn: true,
+						btnBgColor: "#bbe600",
+						btnText: "确定",
+						btnTextColor: "#232323de",
+						showMask: true,
+						maskBgColor: '#00000066',
+						showClose: false
+					},
+					usrToggle: false,
+					navbar: {
+						icons: [{
+								src: '/static/images/common/history.png',
+								callback: this.gotoHistory,
+								math: 0
+							},
+							{
+								src: '/static/images/common/shape.png',
+								callback: this.gotoShare
+							}
+						],
+						title: 'HBY102'
+
+					},
+					apiType: ''
+				},
+				formData: {
+					img: '/static/images/common/HBY102.png',
+					sta_PowerPercent: '',
+					xuhang: '',
+					blename: '',
+					deviceId: '',
+					deviceName: '',
+					RSSI: '',
+					statu: '',
+					sta_address: '',
+					bleStatu: false,
+					sta_charge: '',
+					sta_LedType: '',
+					sta_RadarType: '',
+					sta_Online: '',
+					warnTime: '',
+					sta_sosadd: "",
+					sta_sosName: '',
+					sta_IntrusTime: '',
+					ins_Channel:23
+				},
+				dic: {
+					sta_LightType: [
+
+						{
+							key: 'led_flash',
+							name: '红色爆闪',
+							show: true,
+							img: '/static/images/100/light.png',
+							activeImg: '/static/images/100/lightActive.png',
+							group: 'sta_LedType',
+							permission: '1'
+						},
+						{
+							key: 'led_low_flash',
+							name: '红色慢闪',
+							show: true,
+							img: '/static/images/102/lowFlash.png',
+							activeImg: '/static/images/102/lowFlashActive.png',
+							group: 'sta_LedType',
+							permission: '1'
+						},
+						{
+							key: 'led_steady',
+							name: '红色常亮',
+							show: true,
+							img: '/static/images/102/liting.png',
+							activeImg: '/static/images/102/litingActive.png',
+							group: 'sta_LedType',
+							permission: '1'
+						},
+						{
+							key: 'status_on',
+							name: '物体感应',
+							show: true,
+							img: '/static/images/102/redar.png',
+							activeImg: '/static/images/102/redarActive.png',
+							group: 'sta_RadarType',
+							permission: '48'
+						},
+						{
+							key: 'E49_on',
+							name: '联机模式',
+							show: true,
+							img: '/static/images/102/line.png',
+							activeImg: '/static/images/102/lineActive.png',
+							group: 'sta_Online',
+							permission: '49'
+						},
+						{
+							key: 'led_off',
+							name: '关闭',
+							show: false,
+							img: '/static/images/100/light.png',
+							activeImg: '/static/images/100/lightActive.png',
+							group: 'sta_LedType'
+						},
+						{
+							key: 'led_alarm',
+							name: '爆闪+喇叭',
+							show: false,
+							img: '/static/images/100/light.png',
+							activeImg: '/static/images/100/lightActive.png',
+							group: 'sta_LedType'
+						}
+					],
+					sta_charge: {
+						"0": '未充电',
+						"1": '充电中'
+					}
+
+				},
+				device: {
+					id: "",
+					deviceName: "",
+					deviceImei: "",
+					deviceMac: "",
+					communicationMode: 0,
+					devicePic: "",
+					typeName: "",
+					bluetoothName: null,
+					deviceStatus: null,
+					bindingTime: "",
+					onlineStatus: 0,
+					battery: "0",
+					latitude: null,
+					longitude: null,
+					alarmStatus: null,
+					detailPageUrl: "/pages/650/HBY650",
+					showConfirm: false
+				},
+				groupDevices: [],
+				warnDevices: [],
+				permissions: []
+			}
+		},
+
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			ble.removeAllCallback(pagePath);
+			clearInterval(instrusionTime);
+			instrusionTime = 0;
+		},
+		onLoad: function() {
+			these = this;
+			recei = BleReceive.getBleReceive();
+			ble = BleTool.getBleTool();
+
+
+			ble.addReceiveCallback(this.bleValueNotify, pagePath);
+			ble.addStateBreakCallback(this.bleStateBreak, pagePath);
+			ble.addStateRecoveryCallback(this.bleStateRecovry, pagePath);
+			ble.addDisposeCallback(this.deviceDispose, pagePath);
+			ble.addRecoveryCallback(this.deviceRecovry, pagePath);
+
+
+			let eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('detailData', function(data) {
+
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+				these.Status.apiType = data.apiType;
+				if (data.apiType !== 'listA') {
+					Common.getdeviceShareId(data.data.id).then(res => {
+						if (res.code == 200) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
+				these.device = device;
+				these.getWarns();
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == device.deviceMac) {
+						// console.log("找到设备了", v);
+						these.formData.deviceId = v.deviceId;
+						return true;
+					}
+					return false;
+				});
+				if (!f) {
+
+
+					these.showBleUnConnect();
+
+					return;
+				}
+				let form = f.formData;
+				if (form) {
+					let keys = Object.keys(form);
+					for (var i = keys.length; i >= 0; i--) {
+						let key = keys[i];
+						these.formData[key] = form[key];
+					}
+				}
+				these.formData.blename = f.name ? f.name : "Unname";
+				these.formData.deviceName = device.deviceName;
+
+				these.formData.bleStatu = false;
+				these.formData.deviceId = f.deviceId;
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					these.formData.bleStatu = true;
+				}).catch(ex => {
+					these.formData.bleStatu = 'err';
+                    MsgError("连接错误:" + ex.msg, "确定", these);
+				});
+				these.formData.sta_IntrusTime = 0;
+				these.formData.sta_sosadd = "";
+				these.setBleFormData();
+
+
+
+			});
+
+		},
+		onHide: function() {
+			this.Status.pageHide = true;
+		},
+		onShow() {
+			this.Status.pageHide = false;
+
+			let f = this.getDevice();
+			if (f) {
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					console.log("连接成功")
+					these.formData.bleStatu = true;
+                }).catch(ex => {
+                    these.formData.bleStatu = 'err';
+                    MsgError("连接错误:" + ex.msg, "确定", these);
+                });;
+			}
+			this.getWarns();
+			// this.getLinkedCnt();
+		},
+		computed: {
+			Distance: function() {
+				let f = this.Status.BottomMenu.menuItems.find((item, index) => {
+
+					return item.value === this.formData.sta_RadarType;
+
+
+				});
+				if (f) {
+					return f.text;
+				}
+				return '关闭';
+			},
+			activeIndex: function() {
+				let active = 4;
+				let f = this.Status.BottomMenu.menuItems.find((item, index) => {
+
+					if (item.value === this.formData.sta_RadarType) {
+						active = index;
+					}
+				});
+				return active;
+			},
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
+			}
+		},
+		methods: {
+			onChannelChanging() {
+
+				let f = this.getDevice();
+				// #ifdef  APP-PLUS
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				// #endif
+
+				let regex = /^([1-9]|[1-7][0-9]|80)$/;
+				if (!regex.test(this.formData.ins_Channel)) {
+					uni.showModal({
+						title: '提示',
+						content: '只能输入1-80整数'
+					});
+					return;
+				}
+				var buffer = {
+					ins_Channel: this.formData.ins_Channel
+				}
+				ble.sendString(f.deviceId, buffer);
+			},
+			ShowChannelEdit() {
+
+				if (!this.permissions.includes('55') && this.Status.apiType !== 'listA') {
+
+					showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/common/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					},these)
+					return;
+				}
+
+				this.Status.ShowEditChannel = true;
+				this.showPop({
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: () => {
+						this.onChannelChanging();
+						this.Status.ShowEditChannel = false;
+					},
+					showSlot: true,
+					buttonCancelText: '取消',
+					showCancel: true,
+					cancelCallback: () => {
+						this.Status.ShowEditChannel = false;
+					}
+				});
+			},
+			getLinkedCnt() { //获取在线设备的数量
+
+				let f = this.getDevice();
+				// #ifdef  APP-PLUS
+				if (!f) {
+					return;
+				}
+				// #endif
+				// #ifdef  H5
+				f = {
+					deviceId: '12345'
+				}
+				// #endif
+
+
+				if (ble) {
+					let buffer = {
+						ins_Quantity: "query"
+					};
+					ble.sendString(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(res => {
+						setTimeout(() => {
+							this.getWarns();
+						}, 1500);
+					}).catch(() => {
+						this.getWarns();
+					})
+				}
+
+
+			},
+			getWarns() {
+				return new Promise((resolve, reject) => {
+					if (!these.device.id) {
+						return;
+					}
+
+					let warnKey = "102_" + these.device.id + "_warning";
+					// let linkKey = "102_" + these.device.id + "_linked";
+					let p1 = new Promise((succ, err) => {
+						uni.getStorage({
+							key: warnKey,
+							success(res) {
+								let data = res.data;
+								let fs = data.filter(v => {
+									return !v.read
+								});
+								succ(fs);
+							},
+							fail(ex) {
+								err(null);
+							}
+						});
+					});
+
+					// let p2 = new Promise((succ, err) => {
+					// 	uni.getStorage({
+					// 		key: linkKey,
+					// 		success(res) {
+					// 			console.error("获取到联机数据", res);
+					// 			let data = res.data;
+					// 			let fs = data.filter(v => {
+					// 				return !v.read
+					// 			});
+					// 			console.error("未读联机数据", fs);
+					// 			succ(fs);
+					// 		},
+					// 		fail(ex) {
+					// 			err(null);
+					// 		}
+					// 	});
+					// });
+
+					Promise.allSettled([p1]).then(results => {
+						let fs = [];
+
+						if (results[0].status == 'fulfilled') {
+							fs = fs.concat(results[0].value);
+						}
+						// if (results[1].status == 'fulfilled') {
+						// 	fs = fs.concat(results[1].value);
+						// }
+						console.error("获取到未读消息", fs);
+						these.$set(these.Status.navbar.icons[0], "math", fs.length);
+					});
+
+
+				});
+
+			},
+
+			gotoHistory(item, s) {
+
+				uni.navigateTo({
+					url: '/pages/102/HBY102_History',
+					success: (res) => {
+						res.eventChannel.emit('detailData', {
+							data: these.device
+						});
+					}
+				});
+
+			},
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '102'
+						};
+						Object.assign(json, this.device);
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			actionSett(item, index) {
+
+				if (!this.permissions.includes(item.permission) && this.Status.apiType !== 'listA') {
+
+					showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/common/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					},these)
+					return;
+				}
+
+
+				if (item.group == 'sta_LedType') {
+					this.sosSetting(item, index);
+					return;
+				}
+
+
+				if (item.group == 'sta_RadarType') {
+					// this.toggleRedar(item, index);
+					this.showRedarSetting(item, index);
+					return;
+				}
+
+				if (item.group == 'sta_Online') {
+					this.toggleOnline(item, index);
+					return;
+				}
+
+			},
+			toggleOnline(item, index) { //联机启停
+
+				let f = this.getDevice();
+				// #ifdef  APP-PLUS
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				// #endif
+				// #ifdef  H5
+				f = {
+					deviceId: '12345'
+				}
+				// #endif
+				let val = item.key;
+				if (this.formData.sta_Online === val) {
+					val = 'E49_off';
+				}
+				let task = () => {
+					let json = {
+						ins_Online: val
+					}
+
+					ble.sendString(f.deviceId, json, f.writeServiceId, f.wirteCharactId, 30)
+						.then(res => {
+							this.formData.sta_Online = val;
+							these.setBleFormData();
+						})
+						.catch(ex => {
+							uni.showModal({
+								title: '错误',
+								content: ex.msg
+							})
+						});
+				}
+
+
+				if (val === 'E49_on') {
+					showPop({
+						message: '确定开启联机模式?',
+						iconUrl: "/static/images/common/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: () => {
+							task();
+						},
+						buttonText: "开启",
+						showCancel: true,
+						buttonCancelText: '取消'
+
+					},these);
+				} else {
+					task();
+				}
+
+
+			},
+			showRedarSetting() {
+				this.Status.BottomMenu.show = true;
+				this.Status.BottomMenu.showBtn = false;
+
+				this.Status.BottomMenu.title = "感应距离设置";
+
+				this.Status.BottomMenu.textAlign = "center";
+
+				this.Status.BottomMenu.showMask = true;
+				this.Status.BottomMenu.activeIndex = this.activeIndex;
+			},
+			btnClick(item, index) {
+				this.Status.BottomMenu.show = false;
+				console.log("选中的项:" + index + ",值:" + JSON.stringify(item));
+				this.toggleRedar(item, index);
+			},
+			closeActionSheet() {
+				this.Status.BottomMenu.show = false;
+			},
+			toggleRedar(item, index) { //雷达启停
+				let f = this.getDevice();
+				// #ifdef  APP-PLUS
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				// #endif
+				// #ifdef  H5
+				f = {
+					deviceId: '12345'
+				}
+				// #endif
+				let val = item.value;
+				if (this.formData.sta_RadarType === val) {
+					val = 'status_off';
+				}
+				let task = () => {
+					let promise = new Promise((resolve, reject) => {
+						let json = {
+							ins_RadarType: val
+						}
+
+						ble.sendString(f.deviceId, json, f.writeServiceId, f.wirteCharactId, 30)
+							.then(res => {
+								debugger;
+								this.formData.sta_RadarType = val;
+								this.Status.BottomMenu.activeIndex = index;
+								these.setBleFormData();
+								resolve();
+							})
+							.catch(ex => {
+								uni.showModal({
+									title: '错误',
+									content: ex.msg
+								});
+								reject();
+							});
+					});
+					return promise;
+
+				}
+
+				if (val == 'status_off') {
+					showPop({
+						message: '确定关闭物体感应功能?',
+						iconUrl: "/static/images/common/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: () => {
+							task();
+						},
+						buttonText: "关闭",
+						showCancel: true,
+						buttonCancelText: '取消'
+
+					},these);
+				} else {
+					task();
+				}
+
+
+			},
+
+
+
+			sosSetting(item, isOk) {
+				if (!this.permissions.includes('46') && this.Status.apiType !== 'listA') {
+
+					showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/common/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					},these)
+					return;
+				}
+
+				if (item.key == 'led_alarm' && this.formData.sta_LedType == 'led_alarm') {
+					return;
+				}
+
+				if (item.key == 'led_off' && this.formData.sta_LedType !== 'led_alarm') {
+					return;
+				}
+
+
+				let f = this.getDevice();
+
+				// #ifdef  APP-PLUS											
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				// #endif
+				// #ifdef  H5
+				f = {
+					deviceId: '12345'
+				}
+				// #endif
+				debugger;
+				let task = (val) => {
+					let promise = new Promise((resolve, reject) => {
+						let json = {
+							ins_LedType: val
+						}
+						json = JSON.stringify(json);
+						ble.sendString(f.deviceId, json, f.writeServiceId, f.wirteCharactId, 30).then(res => {
+							this.formData.sta_LedType = val;
+							these.setBleFormData();
+							resolve();
+						}).catch(ex => {
+							MsgError(ex.msg,null,these);
+							reject(ex);
+						});
+					});
+					return promise;
+
+				}
+				if (item.key == 'led_alarm') {
+					showPop({
+						message: '确定开启强制报警?',
+						iconUrl: "/static/images/common/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: () => {
+							task("led_alarm");
+						},
+						buttonText: "开启",
+						showCancel: true,
+						buttonCancelText: '取消'
+					},these);
+				} else {
+					if (this.formData.sta_LedType == 'led_alarm') {
+						showPop({
+							message: '确定解除声光报警模式?',
+							iconUrl: "/static/images/common/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+							okCallback: () => {
+								task(item.key).then(r => {
+
+
+								}).catch(ex => {
+
+								});
+							},
+							buttonText: "解除",
+							showCancel: true,
+							buttonCancelText: '取消'
+
+						},these);
+					} else {
+						let newval=this.formData.sta_LedType===item.key?'led_off':item.key;
+						task(newval);
+					}
+
+				}
+
+
+
+
+			},
+			deviceRecovry(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					this.formData.bleStatu = true;
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'success',
+						title: '蓝牙连接成功'
+					});
+				}
+
+			},
+			deviceDispose(res) {
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
+				if (res.deviceId == these.formData.deviceId) {
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'fail',
+						title: '蓝牙连接已断开'
+					});
+				}
+
+			},
+			bleStateBreak() {
+				if (this.Status.pageHide) {
+					return;
+				}
+				//蓝牙适配器不可用
+				this.formData.bleStatu = false;
+				uni.showToast({
+					icon: 'fail',
+					title: '蓝牙已不可用'
+				})
+				hideLoading(this);
+			},
+			bleStateRecovry() {
+				console.log("蓝牙可用");
+				if (this.Status.pageHide) {
+					return;
+				}
+				console.log("蓝牙可用");
+				//蓝牙适配器再次可用,尝试恢复连接
+				showLoading(this, {
+					text: "蓝牙恢复可用,正在连接设备"
+				});
+				this.formData.bleStatu = 'connecting';
+				ble.LinkBlue(these.formData.deviceId).then(() => {
+					these.formData.bleStatu = true;
+					updateLoading(these, {
+						text: '连接成功'
+					});
+				}).catch(ex => {
+					these.formData.bleStatu = 'err';
+					updateLoading(these, {
+						text: ex.msg
+					})
+				}).finally(() => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 1000);
+
+				});
+			},
+			previewImg(img) {
+				if (!img) {
+					return;
+				}
+
+				uni.previewImage({
+					urls: [img]
+				})
+			},
+
+			bleValueNotify(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				if (this.Status.pageHide) {
+					return;
+				}
+
+				let json = recei.ReceiveData(receive, device, pagePath, recArr);
+
+				console.log("json=", json)
+				setTimeout(() => {
+					this.getWarns();
+				}, 500);
+
+
+				let active = -1;
+				let f = this.Status.BottomMenu.menuItems.find((item, index) => {
+
+					if (item.value === json.sta_RadarType) {
+						active = index;
+					}
+				});
+				this.Status.BottomMenu.activeIndex = active;
+
+				let msg = [];
+				if (json.sta_PowerPercent <= 20 && json.sta_PowerPercent!=this.formData.sta_PowerPercent && (json.sta_charge === 0 || json.sta_charge === '0')) {
+					msg.push("设备电量低");
+				}
+
+				if (json.sta_sosadd_off) { //某个设备解除报警
+					this.warnDevices.filter((d, index) => {
+						if (d.mac === json.sta_sosadd_off) {
+							this.warnDevices.splice(index, 1);
+						}
+					});
+				}
+
+
+				let keys = Object.keys(json);
+
+				keys.forEach(key => {
+					if (key in this.formData) {
+						// console.log("key=",key+",value=",json[key]);
+						this.formData[key] = json[key];
+					}
+				});
+
+
+				if (json.sta_sosadd) { //某个设备闯入报警
+					console.log("查询设备中", json.sta_sosadd);
+					this.searchDevice(json.sta_sosadd).catch(ex => {}).then(dev => {
+						console.log("dev=", dev);
+						let d = this.warnDevices.find(v => {
+							return v.mac === json.sta_sosadd
+						});
+						let deviceName = "";
+						if (dev) {
+							// this.formData.sta_sosName=dev.deviceName;
+							msg.push('"' + dev.deviceName + '"闯入报警中');
+							deviceName = dev.deviceName;
+
+						} else {
+							msg.push('闯入报警中');
+							// this.formData.sta_sosName="";
+						}
+						if (!d) {
+							this.warnDevices.push({
+								mac: json.sta_sosadd,
+								name: deviceName
+							});
+						}
+						MsgError(msg.join(','),'',these);
+					});
+					return;
+					// clearInterval(instrusionTime);
+					// instrusionTime = 0;
+					// setInterval(() => {
+					// 	instrusionTime++;
+					// 	if(instrusionTime>60){
+					// 		this.formData.sta_sosadd="";
+					// 		clearInterval(instrusionTime);
+					// 		return;
+					// 	}
+					// 	this.formData.sta_IntrusTime=instrusionTime;
+					// }, 1000);
+				} else {
+					// clearInterval(instrusionTime);
+					// instrusionTime = 0;
+					// this.formData.sta_IntrusTime = 0;
+				}
+				if (msg.length > 0) {
+					MsgError(msg.join(','),'',these);
+				}
+
+
+			},
+
+			getWarDevice(macStr) {
+				console.log("macStr=", macStr);
+				if (macStr) {
+
+					if (!macStr.includes(':')) {
+						macStr = macStr.replace(/(.{2})/g, '$1:').slice(0, -1)
+					}
+
+					let f = this.groupDevices.find(v => {
+						return v.deviceMac === macStr;
+					});
+
+					if (f) {
+						return f.deviceName;
+					}
+				}
+
+				return "";
+			},
+
+			searchDevice(macStr) {
+				return new Promise((resolve, reject) => {
+					if (macStr.includes(':')) {
+						macStr = macStr;
+					} else {
+						macStr = macStr.replace(/(.{2})/g, '$1:').slice(0, -1)
+					}
+
+					let f = this.groupDevices.find(v => {
+						return v.deviceMac === macStr;
+					});
+					// console.log("111111111");
+					if (f) {
+						console.log("找到设备", f);
+						resolve(f);
+						return;
+					}
+					// console.log("111111111");
+					if (macStr == this.device.deviceMac) {
+						console.log("当前设备", this.device);
+						resolve(this.device);
+						return;
+					}
+					console.log("111111111");
+					try {
+
+
+						request({
+							url: '/app/device/getDeviceInfoByDeviceMac',
+							method: 'GET',
+							data: {
+								deviceMac: macStr
+							}
+						}).then(res => {
+
+							console.log("获取设备信息", res);
+							if (res && res.code == 200) {
+								console.log("res=", res);
+								let data = res.data;
+								if (data) {
+									this.groupDevices.push({
+										deviceMac: data.deviceMac,
+										deviceName: data.deviceName
+									})
+									resolve(data);
+									return;
+								}
+							} else {
+								console.log("222222222");
+							}
+
+							resolve(null);
+
+						}).catch(ex => {
+							console.error("查询设备出现异常:", ex);
+							resolve(null);
+
+						}).finally(com => {
+							console.log("complete")
+						});
+					} catch (err) {
+						console.error("err=", err);
+						resolve(null);
+					}
+
+				});
+			},
+			getDevice: function() {
+
+				// console.log("LinkedList=", ble.data.LinkedList);
+				// console.log("formData=", these.formData);
+				let f = ble.data.LinkedList.find((v) => {
+					return v.macAddress == these.device.deviceMac;
+				});
+
+				return f;
+			},
+
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					this.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+                        MsgError("连接错误:" + ex.msg, "确定", these);
+					});
+					return;
+				}
+
+
+			},
+
+			setBleFormData() {
+				ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+
+				uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
+			},
+			showBleUnConnect() {
+
+				showPop({
+					message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+					iconUrl: "/static/images/common/uploadErr.png",
+					borderColor: "#e034344d",
+					buttonBgColor: "#E03434",
+					buttonText: '去连接',
+					buttonTextColor: '#232323de',
+					okCallback: function() {
+
+						uni.navigateTo({
+							url: "/pages/common/addBLE/addEquip",
+							events: {
+								BindOver: function(data) {
+									console.log(data)
+									these.formData.bleStatu = true;
+								}
+							},
+							success: function(res) {
+								// 通过eventChannel向被打开页面传送数据
+								res.eventChannel.emit('detailData', {
+									data: these.device
+								})
+							},
+							fail(ex) {
+								console.log("跳转失败", ex);
+							}
+						})
+					}
+				},these);
+			},
+
+	
+			closePop: function() {
+	this.Status.Pop.showPop = false;
+
+	if (this.Status.Pop.cancelCallback) {
+		this.Status.Pop.cancelCallback();
+	}
+},
+HidePop: function() {
+	if (this.Status.Pop.clickEvt == 'SendUsr') {
+
+	}
+
+
+	this.Status.Pop.showPop = false;
+	if (this.Status.Pop.okCallback) {
+		this.Status.Pop.okCallback();
+	}
+},
+showPop: function(option) {
+	hideLoading(this);
+	let def = {
+		showPop: true, //是否显示弹窗
+		popType: 'custom',
+		bgColor: '#383934bd',
+		borderColor: '#BBE600',
+		textColor: '#ffffffde',
+		buttonBgColor: '#BBE600',
+		buttonTextColor: '#232323DE',
+		iconUrl: '',
+		message: '',
+		buttonText: '确定',
+		clickEvt: '',
+		visiblePrompt: false,
+		promptTitle: '',
+		modelValue: '',
+		visibleClose: false,
+		okCallback: null,
+		showSlot: false,
+		buttonCancelText: '',
+		showCancel: false,
+	}
+
+	let keys = Object.keys(def);
+
+	for (let i = 0; i < keys.length; i++) {
+		let key = keys[i];
+		if (key in option) {
+			continue;
+		}
+		this.Status.Pop[key] = def[key];
+	}
+	if (option) {
+		keys = Object.keys(option);
+		for (let i = 0; i < keys.length; i++) {
+			let key = keys[i];
+
+			this.Status.Pop[key] = option[key];
+		}
+	}
+
+	if (!option.borderColor) {
+		option.borderColor = '#BBE600';
+		option.buttonBgColor = '#BBE600';
+	}
+	these.Status.Pop.showPop = true;
+}
+
+
+
+		
+		}
+	}
+</script>
+
+<style>
+	.uninavebartext {
+		width: 100%;
+		font-size: 32rpx;
+	}
+
+	.content {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.eq {
+		width: 100%;
+		height: 250rpx;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 0.5);
+	}
+
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
+	}
+
+	.eq .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
+	}
+
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.eq .rightTxt .img {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.eq .rightTxt .row {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+		box-sizing: border-box;
+		padding-left: 50rpx;
+	}
+
+	.eq .rightTxt .row .txt {
+		padding-left: 20rpx;
+	}
+
+	.eq .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+
+
+	.eqinfo {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 14rpx 0rpx;
+	}
+
+	.eqinfo .item {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.lamp {
+		margin-top: 24rpx;
+	}
+
+	.lamp .title {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 28rpx;
+	}
+
+	.lamp.noPadding .title,
+	.lamp.noPadding .smlltitle {
+		padding: 0rpx 0rpx !important;
+	}
+
+	.lamp .smlltitle {
+		width: 100%;
+
+		line-height: 15rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.6);
+
+
+	}
+
+
+	.lamp .title .img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-top: 20rpx;
+	}
+
+	.lampMode {
+
+		width: 100%;
+		box-sizing: border-box;
+
+	}
+
+	.lampMode .mode {
+		width: calc(calc(100% - 34rpx) / 2);
+		border-radius: 8px;
+		margin-top: 20rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 30rpx;
+		box-sizing: border-box;
+		border-width: 1px;
+		border-style: solid;
+		border-color: #00000000;
+	}
+
+	.lampMode .mode.active {
+
+		border-color: #aed600 !important;
+	}
+
+	.lampMode .mode.active .bigTxt {
+
+		color: #aed600 !important;
+	}
+
+	.mode.marginLeft {
+		margin-left: 34rpx !important;
+	}
+
+	.mode .leftImg {
+		width: 70rpx;
+		height: 70rpx;
+		border-radius: 4px;
+		background: rgba(255, 255, 255, 0.06);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mode.active .leftImg {
+		background: rgba(255, 255, 255, 0.06);
+	}
+
+	.mode .leftImg .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.mode .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: center;
+		align-items: flex-start;
+		padding-left: 20rpx;
+	}
+
+	.mode .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
+	}
+
+	.usrtitle {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		height: 40rpx;
+		line-height: 40rpx;
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .btnSend {
+		line-height: 65rpx;
+		border-radius: 8px;
+		width: 120rpx;
+		height: 65rpx;
+		color: rgba(35, 35, 35, 0.87);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 0.15rpx;
+		text-align: center;
+		background-color: #BBE600;
+	}
+
+	.usrinfo .item {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		line-height: 90rpx;
+		height: 90rpx;
+		background: rgba(42, 42, 42, 1);
+		margin-top: 24rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.usrinfo .lbl {
+		width: 120rpx;
+		height: 100%;
+		padding-left: 24rpx;
+		box-sizing: border-box;
+
+		text-align: right;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .value {
+		width: calc(100% - 120rpx);
+		height: 100%;
+
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+
+	}
+
+	.usrinfo .value .uni-input-input {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+
+	}
+
+
+	.usrplace {
+		color: rgba(255, 255, 255, 0.4);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	
+
+	.slider-container {
+		padding: 0px;
+	}
+
+
+
+
+	.addIco {
+		width: 100%;
+		height: 360rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.icoContent {
+		width: 240rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+
+
+		background: rgba(58, 58, 58, 1);
+	}
+
+	.icoContent .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.arrowContent {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		width: 100%;
+		padding: 30rpx 0rpx;
+	}
+
+	.modeSetting {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+
+	}
+
+	.modeSetting .arrow {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		width: calc(100% / 3);
+		margin-bottom: 25rpx;
+	}
+
+	.modeSetting .arrow .text {
+
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14rpx;
+
+	}
+
+	.modeSetting .arrow.active .text {
+		color: rgba(35, 35, 35, 0.87);
+
+	}
+
+	.modeSetting .arrow .outCircle {
+		width: 130rpx;
+		height: 130rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		border: 4rpx solid #00000000;
+		border-radius: 50%;
+		background: rgba(42, 42, 42, 1);
+	}
+
+	.modeSetting .arrow .item {
+		width: 100%;
+		height: 100%;
+
+		border-radius: 50%;
+
+
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.modeSetting .arrow.active .outCircle {
+		border: 4rpx solid rgba(174, 214, 0, 1);
+		padding: 4rpx;
+	}
+
+	.modeSetting .item.active .p100 {
+		background: rgba(174, 214, 0, 1);
+		border-radius: 50%;
+
+	}
+
+	.modeSetting .item .img {
+		width: 52rpx;
+		height: 56rpx;
+	}
+
+	.modeSetting .item .img.translate {
+		transform: rotate(180deg);
+	}
+
+	.modeSetting .arrow .activity {
+		display: none;
+	}
+
+	.modeSetting .arrow.active .nomal {
+		display: none;
+	}
+
+	.modeSetting .arrow.active .item {
+		background: rgba(174, 214, 0, 1);
+	}
+
+	.modeSetting .arrow.active .activity {
+		display: block !important;
+	}
+
+	.usrinfo .image {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.usrinfo .img {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.content {
+
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+	}
+
+	.contentBg {
+		background-color: #121212;
+		color: #ffffffde;
+	}
+
+	.fleft {
+		float: left;
+	}
+
+	.fright {
+		float: right;
+	}
+
+	.clear {
+		clear: both;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.p100 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.center {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.centerLeft {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.netContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: flex-end;
+		justify-content: space-around;
+		align-items: flex-end;
+		width: 50rpx;
+	}
+
+
+	.marginTop10 {
+		margin-top: 20rpx;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.sosContent {
+		width: 100%;
+		height: 110rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding-top: 24rpx;
+	}
+
+	.btnSos {
+		border-radius: 92rpx;
+		height: 100%;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 110rpx;
+		letter-spacing: 0.014rpx;
+		text-align: center;
+
+	}
+
+	.openSos {
+		width: 62%;
+		background: #1a1a1a;
+		color: #e03434;
+		box-sizing: border-box;
+		border: 1rpx solid #e03434;
+	}
+
+	.openSos.active {
+		background: #e03434 !important;
+		color: rgba(255, 255, 255, 0.87) !important;
+	}
+
+
+	.closeSos {
+		width: 32%;
+		background: #1a1a1a;
+	}
+
+	.warn {
+		border-radius: 16rpx;
+		background: #1a1a1a;
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 25rpx;
+	}
+
+	.warn .header {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 20rpx 25rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+
+	}
+
+	.paddingTop0 {
+		padding: 0rpx 25rpx !important;
+	}
+
+	.line {
+		width: calc(100% - 50rpx);
+		height: 0rpx;
+		border-bottom: 1rpx solid rgba(255, 255, 255, 0.06);
+		margin: 30rpx 25rpx
+	}
+
+	.sliderTxt {
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.sliderVal {
+		color: rgba(174, 214, 0, 1);
+
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.navbarRight {
+		width: 60px;
+		height: 100%;
+
+	}
+
+	.navbarRight .imgContent {
+		width: 36rpx;
+		height: 36rpx;
+		position: relative;
+	}
+
+	.navbarRight .imgContent:first-child {
+		margin-right: 36rpx;
+		width: 38rpx !important;
+		height: 38rpx !important;
+		margin-top: -2rpx;
+	}
+
+	.navbarRight .imgContent .baber {
+		position: absolute;
+		z-index: 100;
+		width: 30rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		right: -15rpx;
+		top: -15rpx;
+		border-radius: 50%;
+		background: #f12828;
+		color: #ffffff;
+		font-family: 'PingFang SC';
+		font-style: Regular;
+		font-size: 20rpx;
+		font-weight: 400;
+
+		text-align: center;
+		overflow: hidden;
+		white-space: nowrap;
+
+	}
+
+	.navbarRight .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.navbarRight .imgContent .img:last-child {
+		padding: 1rpx;
+	}
+
+	.nvbar {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+	
+	.popup-prompt-input {
+	
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		color: rgba(255, 255, 255, 0.87);
+		box-sizing: border-box;
+		border-bottom: 2rpx solid rgba(255, 255, 255, 0.4);
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14px;
+	}
+	
+	.popup-prompt-input-placeHolder {
+		color: rgba(255, 255, 255, 0.4);
+	
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	
+		letter-spacing: 0.14px;
+		text-align: center;
+	
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/6075J/BJQ6075J.vue b/pages/6075J/BJQ6075J.vue
index 23e169c..15af337 100644
--- a/pages/6075J/BJQ6075J.vue
+++ b/pages/6075J/BJQ6075J.vue
@@ -263,7 +263,7 @@
 		baseURL
 	} from '@/utils/request.js';
 	import {
-		showLoading,
+		showLoading, 
 		hideLoading,
 		updateLoading
 	} from '@/utils/loading.js';
@@ -293,7 +293,7 @@
 		},
 		data() {
 			return {
-				Status: {
+				Status: {       
 
 
 					pageHide: false,