From b1eab86ba692b2e6886da1943870ce7f96f4f16c Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Tue, 3 Feb 2026 13:08:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E8=93=9D=E7=89=99=E6=9C=AA=E5=BC=80=E5=90=AF=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    |  2 +-
 pages/common/addBLE/addEquip.vue | 38 +++++++++-----------------------
 utils/BleHelper.js               | 16 +++++++++-----
 utils/request.js                 | 11 ++++++++-
 utils/update.js                  | 33 +++++++++++++++++----------
 5 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/manifest.json b/manifest.json
index 489e44b..d9ccd8e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "星汉物联",
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
-    "versionName" : "1.0.14",
+    "versionName" : "1.0.15",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index 24adcab..9d89df0 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -481,9 +481,9 @@
 					}
 
 					plus.android.requestPermissions(
-						['android.permission.ACCESS_FINE_LOCATION'],
+						['android.permission.BLUETOOTH','android.permission.BLUETOOTH_ADMIN','android.permission.ACCESS_FINE_LOCATION','android.permission.ACCESS_COARSE_LOCATION'],
 						(result) => {
-							if (result.granted.length > 0) {
+							if (result.granted && result.granted.length > 0) {
 								console.log('定位权限已授予');
 								resolve(true);
 							} else {
@@ -537,7 +537,7 @@
 				let time = null;
 				let startSearch = () => {
 					
-					if(time){
+					if(time!==null){
 						clearTimeout(time);	
 					}
 					
@@ -546,43 +546,27 @@
 						these.PairEquip = [];
 
 						ble.StartSearch().then(result => {
-							console.log("Fresh scan started successfully.");
-						}).catch(err => {
-							console.error("Failed to start fresh scan:", err);
+							console.log("开始搜索成功",result);
+							
+						}).catch(err => {							
+							console.error("开始搜索失败:", err);
 							if (err.code === 10001) {
 								these.showOpenSetting();
 							} else {
 								uni.showModal({
 									title: '提示',
-									content: '开始搜索失败:' + err.msg
+									content: '出现错误:' + err.msg
 								});
+								
 							}
 						}).finally(()=>{
 							hideLoading(these);
 						});
-					}, 500);
+					}, 200);
 
 				}
 
-				ble.StopSearch().finally(() => {
-
-					let disconnectPromises = [];
-					if (ble.data && ble.data.LinkedList) {
-						ble.data.LinkedList.forEach(device => {
-							if (device.Linked) {
-								disconnectPromises.push(ble.disconnectDevice(device.deviceId));
-							}
-						});
-					}
-
-					if (disconnectPromises.length > 0) {
-						Promise.allSettled(disconnectPromises).finally(() => {
-							startSearch();
-						});
-					} else {
-						startSearch();
-					}
-				});
+				ble.StopSearch().finally(startSearch);
 
 
 
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index 18ae9e1..49fcec1 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -76,12 +76,12 @@ class BleHelper {
 		// 	recei.ReceiveData(receive, f, path, recArr);
 		// }, "BleReceiveData");
 
-		setTimeout(() => {
-			this.OpenBlue().then(() => {
-				this.linkAllDevices();
-			});
+		// setTimeout(() => {
+		// 	this.OpenBlue().then(() => {
+		// 		this.linkAllDevices();
+		// 	});
 
-		}, 10);
+		// }, 10);
 
 		this.dic = {
 			errRemarks: [{
@@ -139,6 +139,10 @@ class BleHelper {
 				{
 					key: '10013',
 					remark: '连接 deviceId 为空或者是格式不正确'
+				},				
+				{
+					key: '10016',
+					remark: '定位服务已关闭'
 				}
 			]
 		}
@@ -445,7 +449,7 @@ class BleHelper {
 
 	getError(ex) {
 		let code = ex.code;
-		ex.msg = "未知的异常"
+		ex.msg = code
 		let f = this.dic.errRemarks.find((v) => {
 			return v.key == code;
 		});
diff --git a/utils/request.js b/utils/request.js
index 1b50db0..1ac57fc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,7 +5,16 @@ const request = (options) => {
 	console.log("options" + JSON.stringify(options), BASE.BASE_URL)
 	return new Promise((resolve, reject) => {
 		// 处理GET请求参数
-		let url = BASE.BASE_URL + options.url;
+		let url ="";
+		 if(options.url.indexOf('http://')===0 || options.url.indexOf('https://')===0){
+			 url=options.url;
+			 if(options.url.indexOf(BASE.BASE_UR)===-1){
+				 options.isAuthen=false;
+			 }
+		 }else{
+			url=BASE.BASE_URL + options.url;	 
+		 }
+		 
 		console.log("url" + url)
 		if (options.method === 'GET' && options.data) {
 			// 使用qs序列化参数
diff --git a/utils/update.js b/utils/update.js
index 100ac32..880e9de 100644
--- a/utils/update.js
+++ b/utils/update.js
@@ -12,7 +12,7 @@ function checkAndUpdateWgt(updateUrl) {
 	}
 	// 显示加载提示
 
-	let urls = ['https://dmsapp.skf.com.cn/HummerService/app/CheckUpdate'];
+	let urls = ['https://dmsapp.skf.com.cn/HummerService/app/CheckUpdate'];//
 
 	// 1. 获取当前应用版本信息
 	plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
@@ -130,7 +130,8 @@ function checkAndUpdateWgt(updateUrl) {
 		let Update1 = () => {
 			return request({
 				url: '/app/auth/version',
-				method: 'get'
+				method: 'get',
+				isAuthen:false
 			});
 		}
 
@@ -212,16 +213,24 @@ function downloadAndInstallWgt(wgtUrl) {
 							console.log("无法删除临时文件");
 						},
 						complete() {
-							wating.close();
-							uni.showModal({
-								title: '更新完成',
-								content: '应用已更新，是否重启应用？',
-								showCancel: false,
-								success: () => {
-									// 3. 重启应用
-									plus.runtime.restart();
-								}
-							});
+							wating.setTitle("应用已更新，正在重启");
+							setTimeout(()=>{
+								wating.close();
+								plus.runtime.restart();
+								
+							},1000);
+							
+							
+							// uni.showModal({
+							// 	title: '更新完成',
+							// 	content: '应用已更新，点击确定重启应用',
+							// 	showCancel: false,
+							// 	success() {
+									
+							// 			plus.runtime.restart();
+									
+							// 	}
+							// });
 						}
 					});
 

From 6e83056687e2e8921d8eb10498b473ec9d518a6f Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Tue, 3 Feb 2026 18:55:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?100J=E8=AF=AD=E9=9F=B3=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/100J/HBY100-J.js                  |   29 +-
 config/index.js                       |    2 +-
 pages.json                            |   18 +
 pages/100J/HBY100-J.vue               | 2579 +++++++++++++------------
 pages/100J/audioManager/AudioList.vue |  840 ++++++++
 pages/100J/audioManager/Recording.vue | 1458 ++++++++++++++
 utils/request.js                      |    2 +-
 7 files changed, 3649 insertions(+), 1279 deletions(-)
 create mode 100644 pages/100J/audioManager/AudioList.vue
 create mode 100644 pages/100J/audioManager/Recording.vue

diff --git a/api/100J/HBY100-J.js b/api/100J/HBY100-J.js
index 95141de..7a3ca1d 100644
--- a/api/100J/HBY100-J.js
+++ b/api/100J/HBY100-J.js
@@ -1,8 +1,33 @@
 import request from '@/utils/request'
-// 获取设备详细信息
+// 获取语音管理列表
+export function deviceVoliceList(params) {
+  return request({
+    url: `/app/video/queryAudioFileList`,
+    method: 'get',
+	data:params
+  })
+}
+// 重命名
+export function videRenameAudioFile(data) {
+  return request({
+    url: `/app/video/renameAudioFile`,
+    method: 'post',
+	data:data
+  })
+}
+// 删除语音文件列表
+export function deviceDeleteAudioFile(params) {
+  return request({
+    url: `/app/video/deleteAudioFile`,
+    method: 'get',
+	data:params
+  })
+}
+
+// 100J信息
 export function deviceDetail(id) {
   return request({
-    url: `/app/bjq/device/${id}`,
+    url: `/app/hby100/device/${id}`,
     method: 'get',
   })
 }
\ No newline at end of file
diff --git a/config/index.js b/config/index.js
index 6ec3377..3776862 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,7 +2,7 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.110.57:8000',//http://139.224.253.23:8000
+		BASE_URL: 'http://192.168.2.34:8000',//http://139.224.253.23:8000
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: 'www.cnxhyc.com',
diff --git a/pages.json b/pages.json
index 0a945d7..8ee4097 100644
--- a/pages.json
+++ b/pages.json
@@ -397,7 +397,25 @@
 			{
 				"navigationStyle": "custom"	
 			}
+		},
+		{
+			"path": "pages/100J/audioManager/AudioList",
+			"style": {
+				"navigationBarTitleText": "语音管理",
+				"disableScroll":true,
+				"app-plus": {
+					"bounce":"none"
+				}
+			}
+		},
+		{
+			"path" : "pages/100J/audioManager/Recording",
+			"style" : 
+			{
+				"navigationBarTitleText" : "录制语音"
+			}
 		}
+		
 
 
 	],
diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue
index 4cd5e64..8731117 100644
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@@ -13,16 +13,18 @@
 					<view class="row">
 						<image class="img" src="/static/images/6155/DeviceDetail/battry.png" mode="aspectFit"></image>
 						<view class="txt">
-							<view class="bigTxt">{{ formData.sta_battery }}%</view>
+							<view class="bigTxt" :style="{ color: deviceInfo.batteryPercentage < 20 ? '#FF0000' : '' }">
+								{{ deviceInfo.batteryPercentage }}%
+							</view>
 							<view class="smallTxt">电量</view>
 						</view>
 					</view>
 					<view class="row">
 						<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
 						<view class="txt">
-							<view class="bigTxt">{{ formData.sta_system ? dic.sta_system[formData.sta_system] : "" }}
+							<view class="bigTxt">{{ deviceInfo.batteryRemainingTime || '0' }}分钟
 							</view>
-							<view class="smallTxt">设备状态</view>
+							<view class="smallTxt">续航时间</view>
 						</view>
 					</view>
 				</view>
@@ -30,19 +32,30 @@
 			<view class="eqinfo">
 				<view class="item">
 					<text class="lbl">设备名称</text>
-					<text class="value">{{ device.deviceName }}</text>
+					<text class="value">{{ deviceInfo.deviceName }}</text>
 				</view>
 				<view class="item">
 					<text class="lbl">IMEI</text>
-					<text class="value">{{ device.deviceImei }}</text>
+					<text class="value">{{ deviceInfo.deviceImei }}</text>
 				</view>
 				<view class="item">
 					<text class="lbl">设备状态</text>
-					<text class="value">{{ formData.sta_system ? dic.sta_system[formData.sta_system] : "" }}</text>
+					<text
+						class="value status-running">{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus === 2 ? '故障' : '在线' }}</text>
 				</view>
 				<view class="item">
 					<text class="lbl">定位信息</text>
-					<text class="value">{{ device.deviceMac }}</text>
+					<view class="info-value status-running">
+						<view class="info-value status-running">
+							{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
+							{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
+						</view>
+						<view class="info-value status-running locationGPS">
+							<!-- <uni-icons @click="toggleForm" type="location" size="17" color="rgba(255, 255, 255, 0.8)"
+								style="vertical-align: bottom;" /> -->
+							{{ deviceInfo.address }}
+						</view>
+					</view>
 				</view>
 			</view>
 			<view class="lampMode">
@@ -97,7 +110,7 @@
 					</view>
 				</view>
 
-				<view class="mode fleft marginLeft" v-on:click.stop="audioManager()">
+				<view class="mode fleft marginLeft" v-on:click.stop="audioManager(deviceInfo)">
 					<view class="leftImg">
 						<image class="img" src="/static/images/common/uploadCloud.png" mode="aspectFit"></image>
 					</view>
@@ -205,31 +218,440 @@
 </template>
 
 <script>
-import gbk from '@/utils/gbk.js'
-import {
-	showLoading,
-	hideLoading,
-	updateLoading
-} from '@/utils/loading.js'
-import request, {
-	baseURL
-} from '@/utils/request.js';
-var these = null;
-import Common from '@/utils/Common.js'
-const pagePath = "/pages/100/HBY100";
-export default {
-	data() {
-		return {
-			Status: {
-				isRightIconVisible: false,
-				navTitle: '',
-				apiType: '',
-				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
-				curr: 0,
-				total: 0,
-				pageHide: false,
-				Pop: {
-					showPop: false, //是否显示弹窗
+	import gbk from '@/utils/gbk.js'
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	import request, {
+		baseURL
+	} from '@/utils/request.js';
+	import {
+		deviceDetail
+	} from '@/api/100J/HBY100-J.js'
+	var these = null;
+	import Common from '@/utils/Common.js'
+	const pagePath = "/pages/100/HBY100";
+	export default {
+		data() {
+			return {
+				Status: {
+					isRightIconVisible: false,
+					navTitle: '',
+					apiType: '',
+					navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
+					curr: 0,
+					total: 0,
+					pageHide: 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: '强光',
+							icon: '/static/images/6155/DeviceDetail/qiang.png'
+						}],
+						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,
+				},
+				formData: {
+					img: '',
+					sta_battery: '',
+					xuhang: '',
+					blename: '',
+					deviceId: '',
+					deviceName: '',
+					RSSI: '',
+					statu: '',
+					macAddress: '',
+					bleStatu: false,
+					sta_address: '',
+					sta_VoiceType: '',
+					sta_VoiceVolume: 1,
+					sta_LightType: '',
+					sta_LightFreq: 0.5,
+					sta_LightDimmer: 10,
+					sta_system: '',
+					warnTime: 0,
+					sta_SOSType: 0
+				},
+				dic: {
+					sta_VoiceType: {
+						"1": {
+							key: "1",
+							name: '消防',
+							show: true
+						},
+						"2": {
+							key: "2",
+							name: '公安',
+							show: true
+						},
+						"3": {
+							key: "3",
+							name: '交警',
+							show: true
+						},
+						"4": {
+							key: "4",
+							name: '市政',
+							show: true
+						},
+						"5": {
+							key: "5",
+							name: '应急',
+							show: true
+						},
+						"6": {
+							key: "6",
+							name: '医疗',
+							show: true
+						},
+						"7": {
+							key: "7",
+							name: '铁道',
+							show: true
+						},
+						"8": {
+							key: "8",
+							name: 'app语音',
+							show: false
+						},
+						"0": {
+							key: "0",
+							name: '关闭',
+							show: false
+						}
+					},
+
+					sta_LightType: [{
+							key: "1",
+							name: '红蓝',
+							show: true
+						},
+						{
+							key: "2",
+							name: '红闪',
+							show: true
+						},
+						{
+							key: "3",
+							name: '黄闪',
+							show: true
+						},
+						{
+							key: "4",
+							name: '蓝闪',
+							show: true
+						},
+						{
+							key: "5",
+							name: '红流水',
+							show: true
+						},
+						{
+							key: "6",
+							name: '黄流水',
+							show: true
+						},
+						{
+							key: "7",
+							name: '蓝流水',
+							show: true
+						},
+						{
+							key: "0",
+							name: '关闭',
+							show: false
+						}
+					],
+
+
+					sta_system: {
+						"0": '关机',
+						"1": '仅充电',
+						"2": '开机未充电',
+						"3": '开机且充电',
+						"": ""
+					}
+
+				},
+				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
+				},
+				permissions: [],
+				audioData: {
+					packetCtn: 0,
+					hexs: []
+				},
+				deviceInfo: {},
+			}
+		},
+		onUnload() {},
+		onLoad: function() {
+			const eventChannel = this.getOpenerEventChannel();
+			var these = this;
+			eventChannel.on('detailData', function(data) {
+				var device = data.data;
+				these.device = device;
+				these.Status.navTitle = data.data.deviceName;
+				these.Status.apiType = data.apiType;
+				these.Status.isRightIconVisible = these.Status.apiType === 'listA';
+				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(',');
+							}
+						}
+					});
+
+				}
+				console.log(data, 'datatatatat');
+				these.fetchDeviceDetail(data.data.id)
+			});
+
+		},
+		onHide: function() {
+			this.Status.pageHide = true;
+		},
+		onShow() {
+			this.Status.pageHide = false;
+		},
+		computed: {
+
+		},
+		methods: {
+			// 获取设备详情（普通详情）
+			fetchDeviceDetail(id) {
+				deviceDetail(id).then((res) => {
+					if (res.code == 200) {
+						this.deviceInfo = res.data
+					}
+				})
+			},
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '670'
+						};
+
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
+			// 语音管理
+			audioManager(item) {
+				if (this.Status.apiType !== 'listA') {}
+				uni.navigateTo({
+					url: '/pages/100J/audioManager/AudioList',
+					events: {
+						audioApply: function(id) {
+							//应用某个语音时，将数据发送给设备
+							console.log("准备发送数据", id);
+							showLoading(these, {
+								text: '准备发送数据'
+							});
+							these.audioData.hexs = uni.getStorageSync(Common.pcmStorageKey + "_" + id);
+							console.log("hexs.length=", these.audioData.hexs.length)
+							these.HoldYouHand();
+						}
+					},
+					success: (res) => {
+						// 页面跳转成功后的回调函数
+						res.eventChannel.emit('deviceData', {
+							data: item
+						});
+					},
+				});
+			},
+			//频率
+			onFreqChanging(e) {
+				this.formData.sta_LightFreq = e.detail.value;
+			},
+			//音量
+			onVolumeChanging(e) {
+				this.formData.sta_VoiceVolume = e.detail.value;
+			},
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.formData.sta_LightDimmer = e.detail.value;
+			},
+			lightTypeSet(item, index) {
+				this.formData.sta_LightType = item.key;
+			},
+			// 报警模式
+			setUsrToggle() {
+				this.Status.usrToggle = !this.Status.usrToggle;
+			},
+			// 播放语音
+			openVolume(item, index) {
+				if (item) {
+					console.log(item.key, 'keyyy');
+					this.formData.sta_VoiceType = item.key;
+				} else if (index === '8') { // 点击“播放语音”的场景
+					this.formData.sta_VoiceType = '8';
+
+				}
+			},
+			// 报警模式
+			sosSetting(item) {
+				const isClose = item === 0;
+				if (!this.Status) this.Status = {};
+				if (!this.Status.Pop) this.Status.Pop = {
+					showPop: false
+				};
+				//弹窗配置
+				this.Status.Pop = {
+					...this.Status.Pop,
+					showPop: true,
+					message: isClose ? '确定解除声光报警模式?' : '确定开启强制报警?',
+					buttonText: isClose ? '解除' : '开启',
+					borderColor: "#e034344d",
+					buttonBgColor: "#E03434",
+					showCancel: true,
+					buttonCancelText: '取消',
+					okCallback: () => {
+						this.formData.sta_SOSType = item;
+						uni.showToast({
+							title: isClose ? '声光报警已解除' : '强制报警已开启',
+							icon: 'none'
+						});
+					}
+				};
+			},
+
+			deviceRecovry(res) {},
+			deviceDispose(res) {},
+			bleStateBreak() {},
+			bleStateRecovry() {},
+			previewImg(img) {},
+
+			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				if (this.formData.sta_battery <= 20) {
+					this.showMsg("设备电量低");
+				}
+			},
+			showBleUnConnect() {},
+
+			proParam: function() {
+				uni.navigateTo({
+					url: '/pages/common/productDes/index?id=' + this.device.id,
+					success(ev) {}
+				});
+			},
+			handRemark: function() {
+				uni.navigateTo({
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+			handVideo: function() {
+				uni.navigateTo({
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+
+			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',
@@ -237,1268 +659,875 @@ export default {
 					buttonBgColor: '#BBE600',
 					buttonTextColor: '#232323DE',
 					iconUrl: '',
-					message: '您确定要这样做吗？',
+					message: '',
 					buttonText: '确定',
 					clickEvt: '',
 					visiblePrompt: false,
-					promptTitle: '设备名称',
+					promptTitle: '',
 					modelValue: '',
 					visibleClose: false,
 					okCallback: null,
+					showSlot: false,
 					buttonCancelText: '',
 					showCancel: false,
-				},
-				BottomMenu: {
-					show: false,
-					showHeader: true,
-					menuItems: [{
-						text: '强光',
-						icon: '/static/images/6155/DeviceDetail/qiang.png'
-					}],
-					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,
-			},
-			formData: {
-				img: '/static/images/common/HBY100J.png',
-				sta_battery: '',
-				xuhang: '',
-				blename: '',
-				deviceId: '',
-				deviceName: '',
-				RSSI: '',
-				statu: '',
-				macAddress: '',
-				bleStatu: false,
-				sta_address: '',
-				sta_VoiceType: '',
-				sta_VoiceVolume: 1,
-				sta_LightType: '',
-				sta_LightFreq: 0.5,
-				sta_LightDimmer: 10,
-				sta_system: '',
-				warnTime: 0,
-				sta_SOSType: 0
-			},
-			dic: {
-				sta_VoiceType: {
-					"1": {
-						key: "1",
-						name: '消防',
-						show: true
-					},
-					"2": {
-						key: "2",
-						name: '公安',
-						show: true
-					},
-					"3": {
-						key: "3",
-						name: '交警',
-						show: true
-					},
-					"4": {
-						key: "4",
-						name: '市政',
-						show: true
-					},
-					"5": {
-						key: "5",
-						name: '应急',
-						show: true
-					},
-					"6": {
-						key: "6",
-						name: '医疗',
-						show: true
-					},
-					"7": {
-						key: "7",
-						name: '铁道',
-						show: true
-					},
-					"8": {
-						key: "8",
-						name: 'app语音',
-						show: false
-					},
-					"0": {
-						key: "0",
-						name: '关闭',
-						show: false
-					}
-				},
-
-				sta_LightType: [{
-					key: "1",
-					name: '红蓝',
-					show: true
-				},
-				{
-					key: "2",
-					name: '红闪',
-					show: true
-				},
-				{
-					key: "3",
-					name: '黄闪',
-					show: true
-				},
-				{
-					key: "4",
-					name: '蓝闪',
-					show: true
-				},
-				{
-					key: "5",
-					name: '红流水',
-					show: true
-				},
-				{
-					key: "6",
-					name: '黄流水',
-					show: true
-				},
-				{
-					key: "7",
-					name: '蓝流水',
-					show: true
-				},
-				{
-					key: "0",
-					name: '关闭',
-					show: false
-				}
-				],
-
-
-				sta_system: {
-					"0": '关机',
-					"1": '仅充电',
-					"2": '开机未充电',
-					"3": '开机且充电',
-					"": ""
 				}
 
-			},
-			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
-			},
-			permissions: [],
-			audioData: {
-				packetCtn: 0,
-				hexs: []
-			}
-		}
-	},
+				let keys = Object.keys(def);
 
-	onUnload() { },
-	onLoad: function () {
-		const eventChannel = this.getOpenerEventChannel();
-		var these = this;
-		eventChannel.on('detailData', function (data) {
-			console.log("收到父页面的参数：" + data);
-			var device = data.data;
-			these.device = device;          
-			these.Status.navTitle = data.data.deviceName;
-			these.Status.apiType = data.apiType;
-			these.Status.isRightIconVisible = these.Status.apiType === 'listA';
-			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(',');
-						}
-					}
-				});
-			}
-
-		});
-
-	},
-	onHide: function () {
-		this.Status.pageHide = true;
-	},
-	onShow() {
-		this.Status.pageHide = false;
-	},
-	computed: {
-
-	},
-	methods: {
-		handleRightClick(item, s) {
-			if (item && item.callback) {
-				item.callback(item, s);
-			}
-		},
-		navigatorBack() {
-			uni.navigateBack();
-		},
-
-		gotoShare(item, s) {
-			uni.navigateTo({
-				url: '/pages/common/share/index',
-				events: {
-					ack: function (data) { }
-				},
-				success: (res) => {
-					let json = {
-						persissonType: '670'
-					};
-
-					res.eventChannel.emit('share', {
-						data: json
-					});
-				}
-			})
-		},
-		audioManager() {
-			if (this.Status.apiType !== 'listA') { }
-			uni.navigateTo({
-				url: '/pages/common/audioManager/AudioList',
-				events: {
-					audioApply: function (id) {
-						//应用某个语音时，将数据发送给设备
-						console.log("准备发送数据", id);
-						showLoading(these, {
-							text: '准备发送数据'
-						});
-						these.audioData.hexs = uni.getStorageSync(Common.pcmStorageKey + "_" + id);
-						console.log("hexs.length=", these.audioData.hexs.length)
-						these.HoldYouHand();
-					}
-				},
-			});
-		},
-		//频率
-		onFreqChanging(e) {
-			this.formData.sta_LightFreq = e.detail.value;
-		},
-		//音量
-		onVolumeChanging(e) {
-			this.formData.sta_VoiceVolume = e.detail.value;
-		},
-		// 亮度调节
-		onBrightnessChanging(e) {
-			this.formData.sta_LightDimmer = e.detail.value;
-		},
-		lightTypeSet(item, index) {
-			this.formData.sta_LightType = item.key;
-		},
-		// 报警模式
-		setUsrToggle() {
-			this.Status.usrToggle = !this.Status.usrToggle;
-		},
-		// 播放语音
-		openVolume(item, index) {
-			if (item) {
-				console.log(item.key, 'keyyy');
-				this.formData.sta_VoiceType = item.key;
-			} else if (index === '8') { // 点击“播放语音”的场景
-				this.formData.sta_VoiceType = '8';
-				
-			}
-		},
-		// 报警模式
-		sosSetting(item) {
-			const isClose = item === 0;
-			if (!this.Status) this.Status = {};
-			if (!this.Status.Pop) this.Status.Pop = { showPop: false };
-			//弹窗配置
-			this.Status.Pop = {
-				...this.Status.Pop,
-				showPop: true,
-				message: isClose ? '确定解除声光报警模式?' : '确定开启强制报警?',
-				buttonText: isClose ? '解除' : '开启',
-				borderColor: "#e034344d",
-				buttonBgColor: "#E03434",
-				showCancel: true,
-				buttonCancelText: '取消',
-				okCallback: () => {
-					this.formData.sta_SOSType = item;
-					uni.showToast({
-						title: isClose ? '声光报警已解除' : '强制报警已开启',
-						icon: 'none'
-					});
-				}
-			};
-		},
-
-		deviceRecovry(res) { },
-		deviceDispose(res) { },
-		bleStateBreak() { },
-		bleStateRecovry() { },
-		previewImg(img) { },
-
-		bleValueNotify: function (receive, device, path, recArr) { //订阅消息
-			if (receive.deviceId !== this.formData.deviceId) {
-				return;
-			}
-			if (this.formData.sta_battery <= 20) {
-				this.showMsg("设备电量低");
-			}
-		},
-		showBleUnConnect() { },
-
-		proParam: function () {
-
-			uni.navigateTo({
-				url: '/pages/common/productDes/index?id=' + this.device.id,
-				success(ev) {
-
-				}
-			});
-		},
-		handRemark: function () {
-			uni.navigateTo({
-				url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
-				success(ev) {
-
-				}
-			});
-		},
-		handVideo: function () {
-			uni.navigateTo({
-				url: '/pages/common/operationVideo/index?id=' + this.device.id,
-				success(ev) {
-
-				}
-			});
-		},
-
-		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 (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];
 
-			if (!option.borderColor) {
-				option.borderColor = '#BBE600';
-				option.buttonBgColor = '#BBE600';
-			}
-			these.Status.Pop.showPop = true;
-		},
-		btnClick() {
+						this.Status.Pop[key] = option[key];
+					}
+				}
 
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
+			},
+			btnClick() {
+
+			}
 		}
 	}
-}
 </script>
 
 <style>
-.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;
-}
-
-.proinfo .itemcontent {
-	display: flex;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-evenly;
-}
-
-.proinfo .item {
-	width: 180rpx;
-	height: 180rpx;
-	box-sizing: border-box;
-	padding: 40rpx;
-	border-radius: 16rpx;
-	background: rgba(26, 26, 26, 1);
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-}
-
-.proinfo .item .img {
-	width: 50rpx;
-	height: 50rpx;
-
-
-}
-
-.proinfo .item .txt {
-	color: rgba(255, 255, 255, 0.6);
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-	margin-top: 20rpx;
-	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: 40px;
-	height: 100%;
-
-}
-
-.navbarRight .imgContent {
-	width: 36rpx;
-	height: 36rpx;
-	position: relative;
-}
-
-.navbarRight .imgContent:first-child {
-
-	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;
-}
+	.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;
+	}
+
+	.proinfo .itemcontent {
+		display: flex;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+	}
+
+	.proinfo .item {
+		width: 180rpx;
+		height: 180rpx;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.proinfo .item .img {
+		width: 50rpx;
+		height: 50rpx;
+
+
+	}
+
+	.proinfo .item .txt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		margin-top: 20rpx;
+		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: 40px;
+		height: 100%;
+
+	}
+
+	.navbarRight .imgContent {
+		width: 36rpx;
+		height: 36rpx;
+		position: relative;
+	}
+
+	.navbarRight .imgContent:first-child {
+
+		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;
+	}
 
-.uninavebartext {
-	width: 100%;
-	font-size: 32rpx;
-}
+	.uninavebartext {
+		width: 100%;
+		font-size: 32rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/100J/audioManager/AudioList.vue b/pages/100J/audioManager/AudioList.vue
new file mode 100644
index 0000000..5ebbf95
--- /dev/null
+++ b/pages/100J/audioManager/AudioList.vue
@@ -0,0 +1,840 @@
+<template>
+	<view class="maincontent contentBg">
+		<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+			:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in dataListA" class="li" :key="index" :ref="'swipeItem_' + index">
+					<view class="itemIcon center" :class="{'displayNone':!Status.isEdit,'check':isCheck(item,index)}"
+						v-on:click.stop="checkToggle(item,index)">
+						<image class="img" :class="{'displayNone':!isCheck(item,index)}"
+							src="/static/images/common/gou.png" mode="aspectFit"></image>
+					</view>
+					<view class="itemMain " :class="{'Edit':Status.isEdit}">
+						<uni-swipe-action-item :right-options="Options" @click="handleSwipeClick($event, item, index)"
+							class="device-card ">
+							<view @click.stop="handleFile(item,index)">
+								<view class="item">
+									<view class="itemLeft ">
+										<view class="title">{{ item.fileNameExt }}</view>
+										<view class="smallTitle">
+											<!-- 展示前端生成的时间 -->
+											<text>{{item.createTime || Common.DateFormat(new Date(), "yyyy年MM月dd日")}}</text>
+											<text v-show="item.duration">{{item.duration}}秒</text>
+											<image :class="{'displayNone':!item.fileUrl}" class="img"
+												src="/static/images/100/volume.png" mode="aspectFit"
+												@click.stop="play(item,index)"></image>
+										</view>
+									</view>
+									<view class="itemRight ">
+										<view class="btn" @click.stop="Apply(item,index)"
+											:class="{'active':item.isApply,'btn-default':!item.isApply}">
+											{{item.isApply ?'使用中':'使用'}}
+										</view>
+									</view>
+									<view class="clear"></view>
+								</view>
+							</view>
+						</uni-swipe-action-item>
+					</view>
+				</view>
+			</uni-swipe-action>
+		</mescroll-uni>
+		<view class="footer">
+			<view class="addContent" :class="{'displayNone':Status.isEdit}">
+				<view class="addItem" @click="gotoRecord('Record')">
+					<view class="imgContent center">
+						<image class="img" src="/static/images/100/record.png" mode="aspectFit"></image>
+					</view>
+					<view class="txt">录制语音</view>
+				</view>
+				<view class="addItem" @click="gotoRecord('File')">
+					<view class="imgContent center">
+						<image class="img" src="/static/images/100/upload.png" mode="aspectFit"></image>
+					</view>
+					<view class="txt">上传语音</view>
+				</view>
+				<view class="addItem" @click="gotoRecord('Txt')">
+					<view class="imgContent center">
+						<image class="img" src="/static/images/100/txtToAudio.png" mode="aspectFit"></image>
+					</view>
+					<view class="txt">文字转语音</view>
+				</view>
+			</view>
+			<view class="editContent" :class="{'displayNone':!Status.isEdit}">
+				<view class="btn-del" @click.stop="delCheckList()">删除</view>
+			</view>
+		</view>
+
+		<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 class="popup-prompt">
+				<input type="text" class="popup-prompt-input" placeholder="请输入名称" v-model="cEdit.fileNameExt" />
+			</view>
+		</MessagePopup>
+		<!-- <view class="displayNone">
+			<audio :src="cPlay.src" :id="cPlay.Id" :name="cPlay.name" author="">
+		</view> -->
+		<global-loading ref="loading"></global-loading>
+	</view>
+</template>
+
+<script>
+	var eventChannel = null;
+	var these = null;
+	var ble = null;
+	var innerAudioContext = null;
+	var timeout = null;
+	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue'
+	import BleTool from '@/utils/BleHelper.js'
+	import {
+		deviceVoliceList,
+		videRenameAudioFile,
+		deviceDeleteAudioFile
+	} from '@/api/100J/HBY100-J.js'
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	import Common from '@/utils/Common.js'
+	export default {
+		components: {
+			MescrollUni
+		},
+		data() {
+			return {
+				mescroll: null,
+				Status: {
+					isEdit: false,
+					playState: '',
+					playPath: '',
+					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,
+						showSlot: false,
+					},
+				},
+				Options: [{
+						text: '重命名',
+						style: {
+							backgroundColor: '#E09319',
+							borderRadius: '16px',
+							width: '240rpx', // 初始宽度
+						},
+					},
+					{
+						text: '删除',
+						style: {
+							backgroundColor: 'rgb(240, 60, 60)',
+							borderRadius: '16px',
+							width: '240rpx', // 初始宽度
+						},
+					},
+				],
+
+				blue: {
+
+				},
+				device: {},
+				dataListA: [],
+				checkList: [],
+				downOption: {
+					auto: true
+				},
+				upOption: {
+					auto: false,
+					noMoreSize: 0,
+					offset: 50,
+					isLock: false,
+					empty: {
+						tip: '暂无数据',
+						hideScroll: false
+					}
+				},
+				page: 1, // 当前页码
+				size: 10, // 每页条数
+				total: 0, // 总数据量
+				loadedCount: 0,
+				loading: false,
+				finished: false,
+				mescrollHeight: 0,
+				cEdit: {
+					Id: "", //编号 
+					fileNameExt: "", //名称
+					createTime: "", //创建时间
+					fileUrl: "", //本地地址
+					fileUrl: "", //网络地址
+					statu: "", //状态,是否公开
+					isApply: "" //是否使用中
+
+				},
+				cPlay: {
+					Id: "", //编号
+					fileNameExt: "", //名称
+					createTime: "", //创建时间
+					fileUrl: "", //本地地址
+					fileUrl: "", //网络地址
+					statu: "", //状态,是否公开
+					isApply: "" //是否使用中
+				}
+			}
+		},
+		onLoad() {
+			these = this;
+			this.getSystemInfoSyncH();
+			eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('deviceData', (rec) => {
+				console.log(rec, 'ressss');
+				this.blue = rec.ble;
+				this.device = rec.data;
+				this.getinitData(rec.data.deviceId,true)
+			});
+
+		},
+		onBackPress() {
+			console.log("页面返回")
+		},
+		onUnload() {
+			console.log("页面卸载了");
+		},
+		methods: {
+			//语音管理列表
+			getinitData(val,isLoadMore = false) {
+				let data = {
+					deviceId: this.device.deviceId
+				}
+				deviceVoliceList(data).then((res) => {
+					if (res.code == 200) {
+						this.total = res.total;
+						const list = res.data.map(item => ({
+							...item,
+							createTime: item.createTime || Common.DateFormat(new Date(), "yyyy年MM月dd日")
+						}));
+						this.dataListA = list;
+						// 通知mescroll加载完成
+						if (this.mescroll) {
+							this.mescroll.endBySize(list.length, this.total);
+						}
+					}
+				})
+			},
+			createAudioPlayer(localPath) {
+				if (innerAudioContext) {
+					innerAudioContext.close();
+					console.log("1111111")
+				}
+				innerAudioContext = plus.audio.createPlayer({
+					src: localPath,
+					autoplay: false,
+					backgroundControl: false,
+				});
+				innerAudioContext.addEventListener('canplay', () => {
+					console.log("准备就绪,可以播放了");
+					this.Status.playState = 'ready';
+					this.cEdit.time = innerAudioContext.getDuration();
+					console.log("音频长度:", this.cEdit.time);
+				});
+				//开始播放
+				innerAudioContext.addEventListener("play", (res) => {
+					this.Status.playState = 'play';
+					console.log("播放中", res);
+				});
+				//暂停播放
+				innerAudioContext.addEventListener("pause", (res) => {
+					this.Status.playState = 'pause';
+					console.log("暂停了", res);
+				});
+				//播放结束 
+				innerAudioContext.addEventListener("ended", (res) => {
+					this.Status.playState = 'ready';
+					console.log("播放结束", res);
+				});
+				innerAudioContext.addEventListener("seeked", (res) => {
+					console.log("seek完成了", res);
+				})
+				innerAudioContext.addEventListener("error", (ex) => {
+
+					console.log("播放错误", ex);
+				});
+			},
+			gotoRecord(type) {
+				let id = this.device.deviceId;
+				uni.navigateTo({
+					url: '/pages/100J/audioManager/Recording?pageType=' + type + '&id=' + id,
+					events: {
+						RecordOver: function(res) {
+							these.downCallback();
+						}
+					},
+					fail(ex) {
+						this.showMsg("资源不存在");
+					}
+				});
+			},
+			play(item, index) {
+				if (item.type === 'Txt') {
+					this.showMsg("文字转语音暂不支持播放")
+					return;
+				}
+				if (!item.fileUrl) {
+					this.showMsg("音频加载错误无法播放");
+					return;
+				}
+				if (this.Status.playPath === item.fileUrl) {
+					console.log("当前正在播放");
+					if (this.Status.playState === 'play') {
+						console.log("暂停播放:", item)
+						innerAudioContext.pause();
+						this.Status.playState = 'pause'
+						return;
+					} else if (this.Status.playState === 'pause') {
+						console.log("恢复播放:", item)
+						innerAudioContext.play();
+						this.Status.playState = 'play'
+						return;
+					}
+				} else {
+					console.log("准备播放:", item)
+					this.Status.playPath = item.fileUrl;
+					this.createAudioPlayer(item.fileUrl);
+					innerAudioContext.play();
+				}
+			},
+			handleSwipeClick(e, item, index) {
+				console.log(e.content.text, item)
+				switch (e.index) {
+					case 0:
+						this.ReName(item, index);
+						break
+					case 1:
+						this.delCheckList(item, index);
+						break
+				};
+				if (this.$refs.swipeAction) {
+					this.$refs.swipeAction.closeAll();
+				}
+			},
+			ReName(item, index) {
+				this.cEdit = Object.assign(this.cEdit, item);
+				let task = () => {
+					this.closePop();
+					let data = {
+						fileName: this.cEdit.fileNameExt,
+						deviceId: this.device.deviceId,
+						fileId: item.fileId
+					}
+					videRenameAudioFile(data).then((res) => {
+						console.log('res');
+						if (res.code == 200) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 1000
+							});
+							this.getinitData()
+							this.cEdit.fileNameExt = ''
+							// 关闭所有滑动项
+							this.$refs.swipeAction.closeAll();
+						}
+					})
+				}
+
+				this.showPop({
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE60096',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: true,
+					okCallback: task,
+					showSlot: true,
+					buttonCancelText: '取消',
+					showCancel: true
+				});
+			},
+			// 删除
+			delCheckList(item, index) {
+				if (!this.checkList.length && !item) {
+					console.log("无文件删除");
+					return;
+				}
+				let task = () => {
+					let data = {
+						fileId: item.fileId,
+						deviceId: this.device.deviceId
+					}
+					deviceDeleteAudioFile(data).then((res) => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 1000
+							});
+							this.getinitData()
+							// 关闭所有滑动项
+							this.$refs.swipeAction.closeAll();
+						}
+					})
+				}
+				this.showPop({
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#e034344d',
+					textColor: '#ffffffde',
+					buttonBgColor: '#E03434',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '删除后无法恢复,你确定要删除吗?',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: true,
+					okCallback: task,
+					showSlot: false,
+					buttonCancelText: '取消',
+					showCancel: true
+
+				})
+			},
+			isCheck(item, index) {
+				let f = this.checkList.find((v, vi) => {
+					return v === item.Id;
+				});
+				if (f) {
+					return true;
+				}
+				return false;
+			},
+			checkToggle(item, index) {
+				let f = null;
+				let i = null;
+				this.checkList.find((v, vi) => {
+					if (v === item.Id) {
+						f = v;
+						i = vi;
+						return true;
+					}
+					return false;
+				});
+				if (i !== null) {
+					this.checkList.splice(i, 1);
+				} else {
+					this.checkList.push(item.Id);
+				}
+			},
+			Apply(item, index) {
+				if (item.isApply) {
+					return;
+				}
+				let task = () => {
+					let fileList = uni.getStorageSync(Common.audioStorageKey);
+					for (let i = 0; i < these.dataListA.length; i++) {
+						let ele = these.dataListA[i];
+						if (i === index) {
+							these.$set(these.dataListA[index], "isApply", true);
+							fileList.find(v => {
+								if (!v.devices) {
+									v.devices = [];
+								}
+								if (v.Id == ele.Id) {
+									v.devices.push(these.device.id);
+									return true;
+								} else {
+									for (let j = 0; j < v.devices.length; j++) {
+										if (v.devices[j] === these.device.id) {
+											v.devices.splice(j, 1);
+											break
+										};
+									}
+								}
+								return false;
+							});
+						} else {
+							these.$set(these.dataListA[i], "isApply", false);
+						}
+					}
+					console.log("状态修改完成");
+					eventChannel.emit('audioApply', item.Id);
+					console.log("返回上一页");
+					uni.navigateBack();
+				}
+			},
+			closePop: function() {
+				this.Status.Pop.showPop = false;
+
+				if (this.Status.Pop.cancelCallback) {
+					this.Status.Pop.cancelCallback();
+				}
+			},
+			HidePop: function() {
+				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;
+			},
+			showMsg(msg, isSucc) {
+				let icoUrl = '/static/images/6155/DeviceDetail/uploadErr.png';
+				let borderColor = "#e034344d";
+				let buttonBgColor = "#E03434";
+				if (isSucc) {
+					icoUrl = '/static/images/common/success.png';
+					borderColor = "#BBE600";
+					buttonBgColor = "#BBE600";
+				}
+				this.showPop({
+					message: msg,
+					iconUrl: icoUrl,
+					borderColor: borderColor,
+					buttonBgColor: buttonBgColor,
+					buttonText: '确定',
+					okCallback: null
+				});
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			// 下拉刷新
+			downCallback() {
+				// 重置分页参数
+				this.page = 1;
+				this.getinitData(false);
+			},
+			// 上拉加载 
+			upCallback() {
+				this.page += 1;
+				this.getinitData(true);
+			},
+			getSystemInfoSyncH() {
+				let sysInfo = uni.getSystemInfoSync();
+				// 底部 footer 高度约 220rpx + 120rpx = 340rpx，转换为 px（1rpx = sysInfo.pixelRatio / 750 * 屏幕宽度？不，直接用 rpx 转 px 公式）
+				const footerHeight = 500 * (sysInfo.screenWidth / 750); // rpx 转 px
+				console.log("footerHeight=", footerHeight);
+				this.mescrollHeight = sysInfo.screenHeight - footerHeight;
+				console.log("mescrollHeight=", this.mescrollHeight);
+			},
+			handleFile(item, index) {}
+		}
+	}
+</script>
+
+<style>
+	.popup-prompt {
+		width: 100%;
+		margin-top: 40rpx;
+	}
+
+	.popup-prompt-input {
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		border: 1rpx solid #BBE60096;
+		border-radius: 10rpx;
+		padding: 0 20rpx;
+		margin-bottom: 30rpx;
+		font-size: 26rpx;
+		box-sizing: border-box;
+		text-align: left;
+
+	}
+
+	.li {
+		border-radius: 16rpx;
+		background: #1a1a1a;
+		margin-top: 24rpx;
+		width: 100%;
+		box-sizing: border-box;
+		padding-left: 15rpx;
+
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+
+	}
+
+	.li .itemMain {}
+
+	.li .item {
+		width: 100%;
+		height: 200rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.li .itemMain {
+		width: 100%;
+	}
+
+	.li .itemMain.Edit {
+		width: calc(100% - 35rpx);
+		margin-left: 15rpx;
+	}
+
+	.item .itemLeft {
+		width: calc(100% - 120rpx);
+	}
+
+	.item .itemRight {
+		width: 120rpx;
+
+	}
+
+	.li .btn {
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+	}
+
+	.li .btn.btn-default {
+		background-color: #AED600;
+		color: #000000;
+
+	}
+
+	.li .btn.active {
+
+		background: #3a3a3a;
+
+		color: #ffffff99;
+
+
+	}
+
+	.item .itemLeft .title {
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 32rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14rpx;
+		text-align: left;
+	}
+
+	.item .itemLeft .smallTitle {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+
+		width: calc(100% - 50rpx);
+		margin-top: 5rpx;
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14px;
+
+	}
+
+	.item .itemLeft .img {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.itemIcon {
+		width: 40rpx;
+		height: 40rpx;
+		box-sizing: border-box;
+		border: 1px solid rgba(255, 255, 255, 0.4);
+		border-radius: 8rpx;
+		color: #00000000;
+	}
+
+	.itemIcon .img {
+		width: 28rpx;
+		height: 20rpx;
+	}
+
+	.itemIcon.check {
+		background-color: #BBE600;
+		color: #000000;
+	}
+
+	.footer {
+		width: 100%;
+		min-height: 220rpx;
+		height: auto;
+		position: fixed;
+		z-index: 99;
+		bottom: 0rpx;
+		left: 0rpx;
+		box-sizing: border-box;
+		border-radius: 16rpx 16rpx 0px 0px;
+		/* background: #000000; */
+		padding-bottom: 120rpx;
+	}
+
+	.footer .addContent {
+		height: 100%;
+		margin-top: 20rpx;
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+		align-items: center;
+
+	}
+
+	.footer .addContent .addItem {
+		width: 140rpx;
+		height: 180rpx;
+
+		display: flex;
+		flex-wrap: wrap;
+		align-content: space-between;
+		justify-content: center;
+		align-items: center;
+
+		box-sizing: border-box;
+	}
+
+	.addItem .imgContent {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+	}
+
+	.addItem .imgContent .img {
+		width: 60rpx;
+		height: 52rpx;
+	}
+
+	.addItem .txt {
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 26rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+		letter-spacing: 0.14px;
+		text-align: center;
+	}
+
+	.footer .btn-del {
+		width: 100%;
+		height: 100rpx;
+		line-height: 100rpx;
+		border-radius: 180rpx;
+		background: rgba(224, 52, 52, 1);
+
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 32rpx;
+		font-weight: 400;
+
+		letter-spacing: 12rpx;
+		text-align: center;
+
+	}
+
+	.editContent {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: flex-start;
+		width: 100%;
+		height: 100%;
+		justify-content: flex-end;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/100J/audioManager/Recording.vue b/pages/100J/audioManager/Recording.vue
new file mode 100644
index 0000000..4847162
--- /dev/null
+++ b/pages/100J/audioManager/Recording.vue
@@ -0,0 +1,1458 @@
+<template>
+	<view class="maincontent contentBg">
+		<!-- 文字转语音 -->
+		<view v-if="Status.pageType==='Txt'">
+			<view>
+				<view class="importTxt fright" @click="importDoc">导入文档</view>
+				<view class="clear"></view>
+			</view>
+			<view class="text-content">
+				<view class="uni-textarea">
+					<textarea class="textarea" v-model="formData.txt" placeholder-class="placehoderClass"
+						placeholder="请输入要转换的文本" :auto-height="true" maxlength="100" cursor-color="#BBE600" />
+				</view>
+				<view class="line"></view>
+				<view class="footBtn">
+					<view class="fright convert" @click.stop="txtToAudio()">转换</view>
+					<view class="fright audioSett" @click.stop="formData.txt=''">清空</view>
+					<view class="clear"></view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 获取到的语音信息 -->
+		<view class="cEdit"
+			:class="{'displayNone':(!AudioData.tempFilePath && Status.pageType!=='Txt')|| (AudioData.hexLength===0 && Status.pageType==='Txt')}">
+			<view class="audioRemark">
+				<view>
+					<view>
+						<input type="text" class="txtName" v-model="cEdit.name" placeholder="音频名称"
+							placeholder-class="placehoderClass" />
+					</view>
+					<view>
+						<text>{{cEdit.createTime}}</text>
+						<text>{{getFormatSeconds(cEdit.time,true)}}</text>
+					</view>
+				</view>
+				<view class="btnSave" v-if="Status.pageType!=='Txt'" @click.stop="uploadLuYin">保存</view>
+			</view>
+			<view class="slide" v-if="Status.pageType!=='Txt'">
+				<view class="circle" :style="{'left':PlayProgress}"></view>
+				<view class="line"></view>
+				<view class="fleft">
+					{{getFormatSeconds(cEdit.currTime)}}
+				</view>
+				<view class="fright">
+					{{getFormatSeconds(cEdit.time)}}
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view class="control" v-if="Status.pageType!=='Txt'">
+				<view class="playControl">
+					<view class="seek" @click.stop="seek(-10)">
+						<image class="img" src="/static/images/common/prev.png" mode="aspectFit"></image>
+					</view>
+					<view class="play" @click="playToggle()">=
+						<image class="img"
+							:class="{'displayNone':Status.playState!=='ready' && Status.playState!=='pause'}"
+							src="/static/images/common/play.png" mode="aspectFit"></image>
+						<image class="img" :class="{'displayNone':!Status.playState || Status.playState!=='play'}"
+							src="/static/images/common/pause.png" mode="aspectFit"></image>
+					</view>
+					<view class="seek" @click.stop="seek(10)">
+						<image class="img" src="/static/images/common/next.png" mode="aspectFit"></image>
+					</view>
+				</view>
+				<view class="drop" v-if="Status.pageType!=='Txt'" @click.stop="drop()">
+					<uni-icons type="trash" size="30" color="#e03434"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="txtBtns" v-if="Status.pageType==='Txt'" :class="{'displayNone':AudioData.hexLength===0}">
+			<view class="btnSave fright" @click.stop="SaveTTS()">保存</view>
+			<view class="audioSett fright" @click.stop="CancelTTS">取消</view>
+			<view class="clear"></view>
+		</view>
+		<!-- 录音的提示 -->
+		<view v-if="Status.pageType==='Record'">
+			<view class="tips" :class="{'displayNone':Status.isRecord || AudioData.tempFilePath}">
+				点击下方红色录制按钮开始录音，吐字清晰，语句流畅
+			</view>
+		</view>
+		<!-- 录音、选择文件操作 -->
+		<view class="footer" v-if="Status.pageType!=='Txt'">
+			<view class="opt">
+				<view class="recording" :class="{'displayNone':Status.pageType!=='Record'}">
+					<view class="recordTitle">语音录制{{Status.RecordName}}</view>
+					<view class="recordName" :class="{'visibilityHidden':!formatSecondsToDHMS}">
+						{{formatSecondsToDHMS?formatSecondsToDHMS:"00:00"}}
+					</view>
+				</view>
+				<view class="btnRecord center" @click.stop="toggleRecord()"
+					:class="{'displayNone':Status.pageType!=='Record'}">
+					<view class="start" :class="{'active':Status.isRecord}"></view>
+				</view>
+				<view class="btnRemark" :class="{'displayNone':Status.pageType!=='Record'}">
+					{{Status.isRecord?'录制中':'录制'}}
+				</view>
+				<view class="btnCheckFile center" @click.stop="checkFile()"
+					:class="{'displayNone':Status.pageType!=='File'}">
+					<view class="polygon center">
+						<uni-icons type="plusempty" size="45" color="#ffffff99"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 自定义弹出层 -->
+		<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 class="popup-prompt">
+				<input type="text" class="popup-prompt-input" placeholder="请输入名称" v-model="cEdit.name" />
+			</view>
+		</MessagePopup>
+		<global-loading ref="loading" />
+		<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+	</view>
+</template>
+
+<script>
+	var eventChannel = null;
+	var these = null;
+	var innerAudioContext = null;
+	var AudeoRecoder = null;
+	var audioTime = null;
+	var hexs = null;
+	import request, {
+		baseURL
+	} from '@/utils/request';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+	import Common from '@/utils/Common.js';
+
+
+
+	export default {
+		data() {
+			return {
+				Status: {
+					playState: '', //播放状态
+					pageType: '', //页面类型，用于区分录音、选择文件、文字转语音
+					pageValid: false, //页面状态，是否已销毁
+					recoderIntval: null, //录音的定时器
+					isRecord: false, //是否正在录音
+					RecordTime: null, //已录间的时长
+					ID: '',
+					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,
+						showSlot: false
+					},
+				},
+				cEdit: {
+
+					Id: "", //编号 
+					name: "", //名称
+					createTime: "", //创建时间
+					localPath: "", //本地地址
+					webPath: "", //网络地址
+					statu: "", //状态,是否公开
+					isApply: "", //是否使用中
+					time: "", //音频总长度
+					currTime: '', //当前播放进度
+					type: ''
+				},
+				AudioData: {
+					tempFilePath: '',
+					hexLength: 0
+				},
+				uploadOptions: {
+
+				},
+				formData: {
+					txt: '祝我暴富，发财吧'
+				}
+			}
+		},
+
+		computed: {
+			formatSecondsToDHMS() {
+				let seconds = this.Status.RecordTime;
+
+				return this.getFormatSeconds(seconds);
+
+			},
+			PlayProgress() {
+				return this.cEdit.currTime / (this.cEdit.time === 0 ? 1 : this.cEdit.time) * 100 + '%';
+			}
+		},
+		onLoad(opt) {
+			eventChannel = this.getOpenerEventChannel();
+			these = this;
+			this.Status.pageType = opt.pageType;
+			console.log('id:', opt.id); // 输出：123
+			these.Status.ID = opt.id
+			let title = ""
+			if (opt.pageType === 'Record') {
+				title = "录制语音";
+			} else if (opt.pageType === 'Txt') {
+				title = '文字转语音';
+			} else {
+				title = "文件上传";
+			}
+			uni.setNavigationBarTitle({
+				title: title
+			});
+		},
+		onUnload() {
+			this.destoryAudioPlayer();
+			clearInterval(audioTime);
+			eventChannel.emit('RecordOver', {
+				data: '从音频页面返回,刷新数据'
+			});
+		},
+		onBackPress(e) {
+			if (this.Status.isRecord) { //如果正在录音，提示是否放弃
+				this.showMsg("正在录音,是否放弃?", false, true, () => {
+					these.Status.pageValid = true;
+					these.stopLuYin();
+					uni.navigateBack();
+				});
+				return true;
+			} else {
+				if (this.AudioData.tempFilePath) {
+					this.showMsg("录音没有保存是否放弃?", false, true, () => {
+						these.Status.pageValid = true;
+						this.dropTmpFile();
+						this.AudioData.tempFilePath = "";
+						AudeoRecoder = null;
+						uni.navigateBack();
+					});
+					return true;
+				}
+
+			}
+
+		},
+		methods: {
+			CancelTTS() {
+				this.cEdit.name = '';
+				this.cEdit.Id = "";
+				this.cEdit.createTime = "";
+				this.cEdit.currTime = "";
+				this.cEdit.isApply = "";
+				this.cEdit.localPath = "";
+				this.cEdit.statu = "";
+				this.cEdit.time = "";
+				this.cEdit.webPath = "";
+				this.AudioData.hexLength = 0;
+				this.cEdit.type = this.Status.pageType;
+				hexs = [];
+			},
+			SaveTTS() {
+				if (!this.cEdit.name) {
+					this.showMsg("请输入语音名称");
+					return;
+				}
+
+				this.cEdit.localPath = "";
+				this.cEdit.Id = Common.guid();
+				this.cEdit.createTime = Common.DateFormat(new Date(), "yyyy年MM月dd日");
+				this.cEdit.isApply = false;
+				this.cEdit.statu = false;
+				this.cEdit.type = this.Status.pageType;
+				this.cEdit.webPath = "";
+
+				let pro1 = new Promise((resolve, reject) => {
+					uni.setStorage({
+						key: Common.pcmStorageKey + "_" + this
+							.cEdit.Id,
+						data: hexs,
+						success() {
+							resolve();
+						},
+						fail(ex) {
+							reject(ex)
+						}
+					});
+				});
+				let pro2 = new Promise((resolve, reject) => {
+					let array = uni.getStorageSync(Common
+						.audioStorageKey);
+					if (!array) {
+						array = [this.cEdit];
+					} else {
+						array.unshift(this.cEdit);
+					}
+					uni.setStorage({
+						key: Common.audioStorageKey,
+						data: array,
+						success() {
+							resolve();
+						},
+						fail(ex) {
+							reject(ex)
+						}
+					});
+				});
+				Promise.allSettled([pro1, pro2]).then(res => {
+					if (res[0].status == 'fulfilled' && res[1]
+						.status == 'fulfilled') {
+						updateLoading(these, {
+							text: "操作成功"
+						});
+						this.AudioData.tempFilePath = "";
+						this.Status.isRecord = false;
+						uni.navigateBack();
+						return;
+					} else {
+						updateLoading(these, {
+							text: "操作没有成功"
+						});
+
+					}
+					this.timeOutCloseLoad();
+
+				}).catch(ex => {
+					updateLoading(these, {
+						text: "出现异常" + JSON.stringify(ex)
+					});
+					this.timeOutCloseLoad();
+				});
+
+			},
+			importDoc() {
+				this.checkFile();
+			},
+			txtToAudio() {
+				let msg = "";
+				if (!this.formData.txt) {
+					msg = '请输入语音内容';
+				}
+				if (this.formData.txt.length > 100) {
+					msg = "内容限制在100字以内";
+				}
+				if (msg) {
+					this.showMsg(msg);
+					return;
+				}
+				hexs = [];
+				this.AudioData.hexLength = 0;
+				showLoading(this, {
+					text: '正在生成语音'
+				});
+
+				let closeWaiting = () => {
+					setTimeout(() => {
+						hideLoading(this);
+					}, 2000)
+				}
+				let task = () => {
+					return new Promise((succ, err) => {
+						request({
+							url: "/app/video/ttsToOss",
+							method: 'post',
+							data: {
+								deviceId: these.Status.ID,
+								text: this.formData.txt
+							}
+						}).then(res => {
+							if (res && res.code && res.code === 200) {
+								succ(res.data);
+								console.log('这是成功了吗');
+								uni.navigateBack()
+							} else {
+								err(res);
+							}
+						}).catch(ex => {
+							console.error("出现异常", ex);
+							err(res);
+						});
+					})
+				}
+				task().then(res => {
+					try {
+						console.log("文本转语音成功", res);
+						hexs = res;
+						this.AudioData.hexLength = hexs.length;
+						this.AudioData.tempFilePath = "";
+						this.cEdit.localPath = "";
+						this.cEdit.time = "";
+						this.playInit("");
+						updateLoading(this, {
+							text: '文本转语音成功'
+						});
+					} catch (error) {
+						console.error("出现错误,", error)
+					}
+				}).catch(ex => {
+					console.error("出现异常", ex);
+					updateLoading(this, {
+						text: '生成失败'
+					});
+				}).finally(closeWaiting);
+			},
+			timeOutCloseLoad() {
+				setTimeout(() => {
+					hideLoading(these);
+				}, 1200);
+			},
+			// 保存录音并上传（已修复文件格式问题）
+			uploadLuYin() {
+				// 文件类型验证
+				if (!this.AudioData.tempFilePath) {
+					this.showMsg("请先录制或选择音频文件");
+					return;
+				}
+				// 检查文件扩展名
+				const validExtensions = ['.mp3', '.wav', '.aac', '.m4a'];
+				let uploadFilePath = this.AudioData.tempFilePath;
+				const hasValidExtension = validExtensions.some(ext =>
+					uploadFilePath.toLowerCase().endsWith(ext)
+				);
+				if (!hasValidExtension) {
+					// 如果没有有效扩展名，添加.mp3扩展名
+					uploadFilePath = uploadFilePath + '.mp3';
+					console.log("自动添加.mp3扩展名，新路径:", uploadFilePath);
+				}
+
+				console.log("上传文件路径:", uploadFilePath);
+				plus.io.resolveLocalFileSystemURL(uploadFilePath, (entry) => {
+					entry.getMetadata((metadata) => {
+						console.log("文件大小:", metadata.size, "字节");
+						console.log("文件类型验证通过");
+						this.doUpload(uploadFilePath);
+					}, (err) => {
+						console.error("获取文件元数据失败:", err);
+						this.doUpload(this.AudioData.tempFilePath);
+					});
+				}, (err) => {
+					console.error("文件不存在或路径错误:", err);
+					this.doUpload(this.AudioData.tempFilePath);
+				});
+			},
+
+			// 执行上传操作
+			doUpload(filePath) {
+				const key = `${Common.pcmStorageKey}_${this.cEdit.Id}`;
+				const store = uni.getStorageInfoSync();
+				if (store.keys.includes(key)) return;
+				const token = uni.getStorageSync('token');
+				const clientid = uni.getStorageSync('clientID');
+				const these = this;
+				showLoading(this, {
+					text: "文件上传中"
+				});
+				console.log("最终上传文件路径:", filePath);
+				uni.uploadFile({
+					url: baseURL + "/app/video/uploadAudioToOss",
+					filePath: filePath,
+					name: 'file',
+					header: {
+						"Authorization": `Bearer ${token}`,
+						"clientid": clientid
+					},
+					formData: {
+						deviceId: these.Status.ID
+					},
+					success: (res) => {
+						try {
+							if (!res.data) {
+								throw new Error('res.data is empty');
+							}
+							const resData = JSON.parse(res.data);
+							if (resData.code === 200) {
+								// 合并两个存储操作
+								Promise.all([
+									new Promise((resolve, reject) => {
+										uni.setStorage({
+											key,
+											data: resData.data,
+											success: resolve,
+											fail: reject
+										});
+									}),
+									new Promise((resolve, reject) => {
+										let array = uni.getStorageSync(Common.audioStorageKey) ||
+										[];
+										array.unshift(these.cEdit);
+										uni.setStorage({
+											key: Common.audioStorageKey,
+											data: array,
+											success: resolve,
+											fail: reject
+										});
+									})
+								]).then(() => {
+									updateLoading(these, {
+										text: "操作成功"
+									});
+									these.AudioData.tempFilePath = "";
+									these.Status.isRecord = false;
+									uni.navigateBack();
+								}).catch(ex => {
+									updateLoading(these, {
+										text: `出现异常${JSON.stringify(ex)}`
+									});
+									these.timeOutCloseLoad();
+								});
+								return;
+							} else {
+								console.log('上传失败:', resData.msg);
+								uni.showToast({
+									title: resData.msg,
+									icon: 'none',
+									duration: 3000
+								});
+								these.timeOutCloseLoad();
+							}
+						} catch (error) {
+							uni.showToast({
+								title: '服务器响应格式错误',
+								icon: 'none',
+								duration: 3000
+							});
+							these.timeOutCloseLoad();
+						}
+					},
+					fail: (err) => {
+						console.error('上传文件失败:', err);
+						uni.showToast({
+							title: '上传失败，请检查网络',
+							icon: 'none',
+							duration: 3000
+						});
+						these.timeOutCloseLoad();
+					},
+					complete: () => {
+						console.log('上传操作完成');
+					}
+				});
+			},
+
+			drop() {
+				this.showMsg("您确定删除该音频吗?", false, true, () => {
+					these.dropTmpFile();
+					this.cEdit = {
+						Id: "", //编号 
+						name: "", //名称
+						createTime: "", //创建时间
+						localPath: "", //本地地址
+						webPath: "", //网络地址
+						statu: "", //状态,是否公开
+						isApply: "", //是否使用中
+						time: "", //音频总长度
+						currTime: '' //当前播放进度
+					};
+					this.Status.playState = "";
+
+				})
+			},
+			seek(intval) { //快进快退
+				let tmp = this.cEdit.currTime + intval;
+				console.log("tmp=" + tmp)
+				if (tmp < 0) {
+
+					this.cEdit.currTime = 0;
+					innerAudioContext.seekTo(0);
+					innerAudioContext.play();
+				} else if (tmp > this.cEdit.time) {
+					this.cEdit.currTime = this.cEdit.time;
+					innerAudioContext.seekTo(this.cEdit.time);
+					innerAudioContext.stop();
+					clearInterval(audioTime);
+				} else {
+					this.cEdit.currTime = tmp;
+					innerAudioContext.seekTo(tmp);
+				}
+			},
+			playToggle() {
+				if (this.Status.playState === '') {
+					this.showMsg("音频未就绪");
+					return;
+				}
+				if (innerAudioContext) {
+					if (this.Status.playState == 'play') {
+						innerAudioContext.pause();
+					} else {
+						innerAudioContext.play();
+					}
+				} else {
+					this.showMsg("播放器未就绪");
+				}
+			},
+			getFormatSeconds(seconds, Ms) {
+				if (!seconds) {
+					return "";
+				}
+				let totalSeconds = Math.floor(seconds);
+				let days = Math.floor(totalSeconds / 86400); // 1天=86400秒
+				let remainingSeconds = totalSeconds % 86400;
+				let hours = Math.floor(remainingSeconds / 3600);
+				let minutes = Math.floor((remainingSeconds % 3600) / 60);
+				let secs = remainingSeconds % 60;
+
+				// 补零处理
+				let paddedDays = String(days).padStart(2, '0');
+				let paddedHours = String(hours).padStart(2, '0');
+				let paddedMinutes = String(minutes).padStart(2, '0');
+				let paddedSecs = String(secs).padStart(2, '0');
+				if (Ms) {
+					return `${paddedMinutes}分${paddedSecs}秒`;
+				}
+				return `${paddedMinutes}:${paddedSecs}`;
+			},
+			createAudioPlayer() {
+				try {
+					console.log("准备创建播放器");
+					if (innerAudioContext) {
+						this.destoryAudioPlayer();
+						clearInterval(audioTime);
+						this.cEdit.currTime = 0;
+					}
+					innerAudioContext = plus.audio.createPlayer({
+						src: this.cEdit.localPath,
+						autoplay: false,
+						backgroundControl: false,
+					});
+					console.log('播放器创建成功');
+					innerAudioContext.addEventListener('canplay', () => {
+						console.log("准备就绪,可以播放了");
+						this.Status.playState = 'ready';
+						this.cEdit.time = innerAudioContext.getDuration();
+						this.cEdit.time = Math.ceil(this.cEdit.time);
+						console.log("音频长度:", this.cEdit.time);
+					});
+					console.log("canplay事件注册成功")
+					//开始播放
+					innerAudioContext.addEventListener("play", (res) => {
+						if (this.Status.playState === 'ready') {
+							this.cEdit.currTime = 0;
+						}
+						this.Status.playState = 'play';
+						audioTime = setInterval(() => {
+							this.cEdit.currTime += 1;
+						}, 1000);
+						console.log("播放中", res);
+					});
+					console.log("play事件注册成功")
+					//播放结束 
+					innerAudioContext.addEventListener("ended", (res) => {
+						clearInterval(audioTime);
+						this.cEdit.currTime = 0;
+						this.Status.playState = 'ready';
+						console.log("播放结束", res);
+					});
+					console.log("ended事件注册成功")
+					//暂停播放
+					innerAudioContext.addEventListener("pause", (res) => {
+						clearInterval(audioTime);
+						audioTime = null;
+						this.Status.playState = 'pause';
+						console.log("暂停了", res);
+					});
+					console.log("pause事件注册成功")
+					innerAudioContext.addEventListener("seeked", (res) => {
+						console.log("seek完成了", res);
+					})
+					console.log("seeked事件注册成功")
+
+					innerAudioContext.addEventListener('error', ex => {
+						console.log("出错了", ex)
+					});
+					console.log("error事件注册成功");
+
+					this.Status.playState = 'ready';
+				} catch (ex) {
+					// console.error("出现错误", ex);
+				}
+			},
+			destoryAudioPlayer() { //销毁播放器
+				if (innerAudioContext) {
+					innerAudioContext.close();
+					console.log("播放器已销毁");
+				}
+			},
+			handleUploadCallback(res) {
+				console.log("选择文件:", res);
+				if (res && res.data) {
+					if (this.Status.pageType === 'File') { //文件上传
+						if (res.data[0].type.indexOf('audio') > -1) {
+							this.cEdit.name = res.data[0].name;
+							this.playInit(res.data[0].tempFilePath);
+						} else {
+							this.showMsg("只能选择音频文件");
+						}
+						return;
+					}
+
+					if (this.Status.pageType === 'Txt') { //文字转语音
+						let file = res.data[0];
+						let path = file.tempFilePath;
+						let type = file.type;
+						if (type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
+							this.parseWord(path); //docx
+							return;
+						}
+						if (type === 'text/plain') {
+							this.parseTxt(path); //txt
+							return;
+						}
+						if (type == "application/msword") { //doc
+							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.parseDoc(path);
+								},
+								showSlot: false,
+								buttonCancelText: '取消',
+								showCancel: true,
+							});
+
+							return;
+						}
+						this.showMsg("只能选择.txt、.docx、.doc文档");
+						return;
+
+					}
+				} else {
+					console.log("未选择任何文件");
+				}
+			},
+			parseTxt(txtPath) { //读取txt文件
+				showLoading(this, {
+					text: "文档读取中"
+				});
+				let promise = new Promise((resolve, reject) => {
+					plus.io.resolveLocalFileSystemURL(
+						txtPath,
+						(entry) => {
+							// 2. 获取文件对象
+							console.log("111111");
+							entry.file(
+								(file) => {
+									console.log("22222")
+									try {
+										let reader = new plus.io.FileReader();
+										reader.onloadend = function(e) {
+											// Get data
+											console.log("读取成功:", e.target.result);
+											resolve(e.target.result);
+										};
+										reader.onerror = function(ex) {
+											console.error("err=", ex)
+											reject("reader.onerror");
+										}
+										reader.readAsText(file);
+									} catch (err) {
+										console.error("err=", err);
+										reject(err.message)
+									}
+								},
+								(err) => {
+									console.error('获取文件对象失败：', err);
+									reject('获取文件对象失败')
+								}
+							);
+						},
+						(err) => {
+							console.error('解析文件路径失败：', err);
+							reject('解析文件路径失败')
+						}
+					);
+				});
+
+				promise.then(txt => {
+					this.formData.txt = txt;
+					updateLoading(this, {
+						text: '读取成功'
+					});
+				}).catch(ex => {
+					updateLoading(this, {
+						text: '无法读取文档'
+					});
+				}).finally(() => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 500)
+				})
+
+			},
+			parseDoc(filePath) {
+				uni.openDocument({
+					filePath: filePath,
+					fail(err) {
+						these.showMsg("无法打开文档");
+					}
+				});
+			},
+			parseWord(filePath) { //读取word文件
+				const token = uni.getStorageSync('token');
+				const clientid = uni.getStorageSync('clientID');
+				showLoading(this, {
+					text: "文档读取中"
+				});
+				let promise = new Promise((resolve, reject) => {
+					uni.uploadFile({
+						url: baseURL + "/app/video/extract",
+						filePath: filePath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data",
+							"Authorization": 'Bearer ' + token,
+							"clientid": clientid
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							reject('文件无法读取,请手动复制文本内容');
+						},
+						success: (res) => {
+							if (res.statusCode === 200) {
+								res = JSON.parse(res.data);
+								console.log("服务器响应=", res);
+								if (res && res.data) {
+									these.formData.txt = res.data;
+									updateLoading(this, {
+										text: '读取成功'
+									});
+									resolve();
+									return;
+								}
+							}
+
+							reject('文件无法读取,请手动复制文本内容');
+						},
+						complete() {
+							setTimeout(() => {
+								hideLoading(these);
+							}, 500);
+						}
+					});
+
+				});
+
+				promise.then(res => {}).catch(ex => {
+					updateLoading(these, {
+						text: ex
+					});
+					uni.openDocument({
+						filePath: filePath,
+						fail(err) {
+							console.error("无法打开文件", err);
+						}
+					});
+				});
+			},
+			checkFile() {
+				this.$refs.XeUpload.upload('file');
+			},
+			toggleRecord() {
+				if (this.Status.recoderIntval) {
+					this.stopLuYin();
+				} else {
+					this.startLuYin();
+				}
+			},
+			playInit(tempFilePath) {
+				let task = (path) => {
+					try {
+						console.log("最终播放路径=", path);
+						// 确保路径有.mp3扩展名
+						if (path && !path.toLowerCase().endsWith('.mp3')) {
+							path = path + '.mp3';
+							console.log("播放路径已添加.mp3扩展名:", path);
+						}
+						this.AudioData.tempFilePath = path;
+						this.cEdit.localPath = path;
+						this.cEdit.Id = Common.guid();
+						this.cEdit.createTime = Common.DateFormat(new Date(), "yyyy年MM月dd日");
+						this.cEdit.isApply = false;
+						this.cEdit.statu = false;
+						this.cEdit.type = this.Status.pageType;
+						this.cEdit.webPath = "";
+						if (path) {
+							this.createAudioPlayer();
+						} else {
+							this.cEdit.time = "";
+						}
+					} catch (exx) {
+						console.error("playInit错误:", exx)
+					}
+				}
+
+				if (tempFilePath) {
+					Common.moveFileToDownloads(tempFilePath).then(res => {
+						console.log("文件移动成功", res);
+						task(res);
+					}).catch(ex => {
+						console.error("文件移动失败了", ex);
+						task(tempFilePath);
+					});
+				} else {
+					task("");
+				}
+			},
+			startLuYin() {
+				this.destoryAudioPlayer();
+				if (!AudeoRecoder) {
+					// #ifdef APP
+					try {
+						AudeoRecoder = uni.getRecorderManager();
+						AudeoRecoder.onStop(function(res) {
+							try {
+								console.log('录音停止:' + JSON.stringify(res));
+								these.AudioData = res;
+								these.cEdit.time = these.Status.RecordTime;
+								these.cEdit.name = "语音录制" + these.Status.RecordName;
+								if (these.Status.pageValid) {
+									these.dropTmpFile();
+									these.Status.pageValid = false;
+									AudeoRecoder = null;
+
+								} else {
+
+									these.playInit(these.AudioData.tempFilePath);
+								}
+							} catch (ex) {
+								console.error("录音停止回调错误:", ex);
+							}
+						});
+					} catch (ex) {
+						console.error("获取录音管理器错误:", ex);
+					}
+					// #endif
+				}
+				let startTask = () => {
+					clearInterval(this.Status.recoderIntval);
+					this.Status.recoderIntval = null;
+					// #ifdef APP  
+					try {
+						AudeoRecoder.start({
+							duration: 60000,
+							sampleRate: 44100,
+							format: 'mp3', // 确保这里是mp3格式
+							frameSize: 16,
+							encodeBitRate: 192000,
+							numberOfChannels: 1
+						});
+					} catch (error) {
+						console.error("开始录音错误:", error);
+					}
+					// #endif
+					this.Status.RecordTime = 0;
+					// 确保录音文件名包含.mp3扩展名
+					this.Status.RecordName = Common.DateFormat(new Date(), "yyyyMMddHHmmss") + ".mp3";
+					this.AudioData.tempFilePath = "";
+					this.Status.recoderIntval = setInterval(() => {
+						this.Status.RecordTime += 1;
+						if (this.Status.RecordTime >= 60) {
+							this.toggleRecord();
+						}
+					}, 1000);
+					this.Status.isRecord = !this.Status.isRecord;
+				}
+				if (this.AudioData.tempFilePath) {
+					this.showMsg("当前录音未保存,您要放弃该录音吗?", false, true, () => {
+						these.dropTmpFile();
+						startTask();
+					})
+				} else {
+					startTask()
+				}
+			},
+			stopLuYin() {
+				clearInterval(this.Status.recoderIntval);
+				this.Status.recoderIntval = null;
+				try {
+					AudeoRecoder.stop();
+				} catch (ex) {
+					console.error("停止录音错误:", ex);
+					if (!these.Status.pageValid) {
+						these.AudioData.tempFilePath = "_doc/" + this.Status.RecordName;
+					}
+				} finally {
+					this.Status.isRecord = !this.Status.isRecord;
+				}
+			},
+			dropTmpFile() {
+				//删除丢弃的文件
+				// #ifdef APP
+				if (!these.AudioData.tempFilePath) {
+					return;
+				}
+				try {
+					plus.io.resolveLocalFileSystemURL(these.AudioData.tempFilePath, (entry) => {
+						// 确认是文件类型
+						if (entry.isFile) {
+							entry.remove(
+								() => {
+									console.log('文件删除成功');
+									// 删除成功后的逻辑
+									these.AudioData.tempFilePath = "";
+								},
+								(err) => {
+									console.error('文件删除失败：', err.message);
+								}
+							);
+						} else {
+							console.error('路径指向的不是文件');
+						}
+					}, (err) => {
+						console.error('路径解析失败：', err.message);
+
+					});
+				} catch (error) {
+					console.error("删除文件异常:", error);
+				}
+				// #endif
+			},
+			closePop: function() {
+				this.Status.Pop.showPop = false;
+
+				if (this.Status.Pop.cancelCallback) {
+					this.Status.Pop.cancelCallback();
+				}
+			},
+			HidePop: function() {
+				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;
+			},
+			showMsg(msg, isSucc, showCancel, okCallback) {
+				if (showCancel === undefined) {
+					showCancel = false;
+				}
+				if (okCallback === undefined) {
+					okCallback = null;
+				}
+				let icoUrl = '/static/images/6155/DeviceDetail/uploadErr.png';
+				let borderColor = "#e034344d";
+				let buttonBgColor = "#E03434";
+				if (isSucc) {
+					icoUrl = '/static/images/common/success.png';
+					borderColor = "#BBE600";
+					buttonBgColor = "#BBE600";
+				}
+				this.showPop({
+					message: msg,
+					iconUrl: icoUrl,
+					borderColor: borderColor,
+					buttonBgColor: buttonBgColor,
+					buttonText: '确定',
+					okCallback: okCallback,
+					showCancel: showCancel,
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.footer .opt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+	}
+
+	.footer .recordTitle {
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+		letter-spacing: 0.14rpx;
+		text-align: center;
+	}
+
+	.footer .recordName {
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		line-height: 34rpx;
+		letter-spacing: 0.14px;
+		text-align: center;
+		margin-bottom: 40rpx;
+	}
+
+	.footer .btnRecord .start {
+		background: rgba(224, 52, 52, 1);
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+	}
+
+	.footer .btnRecord .start.active {
+		border-radius: 8rpx;
+		background: rgba(224, 52, 52, 1);
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.footer .btnRecord {
+
+		width: 110rpx;
+		height: 110rpx;
+		box-sizing: border-box;
+		border: 4rpx solid rgba(255, 255, 255, 0.6);
+		border-radius: 50%;
+	}
+
+	.footer .btnRemark {
+		color: rgba(255, 255, 255, 0.6);
+		margin-top: 20rpx;
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+		letter-spacing: 0.14px;
+		text-align: center;
+
+	}
+
+	.footer {
+		padding-top: 60rpx;
+		padding-bottom: 60rpx;
+		width: 100%;
+
+		height: auto;
+		position: fixed;
+		z-index: 99;
+		left: 0rpx;
+		bottom: 0rpx;
+		border-radius: 16rpx 16rpx 0px 0px;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+	}
+
+	.popup-prompt {
+		width: 100%;
+		margin-top: 40rpx;
+	}
+
+
+
+	.popup-prompt-input {
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		border: 1rpx solid #BBE60096;
+		border-radius: 10rpx;
+		padding: 0 20rpx;
+		margin-bottom: 30rpx;
+		font-size: 26rpx;
+		box-sizing: border-box;
+		text-align: left;
+
+	}
+
+
+	.tips {
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+		letter-spacing: 0.14rpx;
+		text-align: left;
+	}
+
+	.polygon {
+		width: 300rpx;
+		height: 150rpx;
+		background-color: #3A3A3A;
+		border-radius: 10rpx;
+		color: rgba(255, 255, 255, 0.6);
+		;
+	}
+
+	.cEdit {
+		width: 100%;
+		height: auto;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 40rpx 30rpx
+	}
+
+	.btnSave {
+		width: 130rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		text-align: center;
+		color: rgba(23, 23, 23, 1);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 12rpx;
+		background-color: #BBE600;
+		border-radius: 180rpx;
+	}
+
+	.txtName {
+		color: rgba(174, 214, 0, 1);
+		border-bottom: 1rpx solid rgba(174, 214, 0, 1);
+		font-family: PingFang SC;
+		font-size: 32rpx;
+		font-weight: 400;
+		line-height: 44rpx;
+		letter-spacing: 0.14px;
+		text-align: left;
+		margin-bottom: 10rpx;
+	}
+
+	.audioRemark {
+		display: flex;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.slide {
+		padding-top: 60rpx;
+		width: 100%;
+		position: relative;
+	}
+
+	.slide .line {
+		width: 100%;
+		height: 4rpx;
+		border-radius: 12rpx;
+		background: rgba(106, 106, 106, 1);
+	}
+
+	.slide .circle {
+		position: absolute;
+		margin-top: -4rpx;
+		width: 12rpx;
+		height: 12rpx;
+		background: rgba(234, 234, 234, 1);
+		border-radius: 50%;
+	}
+
+	.control {
+		width: 100%;
+		padding: 40rpx;
+		position: relative;
+	}
+
+	.control .playControl {
+		width: 100%;
+		position: absolute;
+		left: 0rpx;
+		bottom: 0rpx;
+		z-index: 1;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.control .drop {
+		position: absolute;
+		z-index: 2;
+		bottom: 0rpx;
+		right: 0rpx;
+	}
+
+	.playControl .seek .img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.playControl .play .img {
+		width: 38rpx;
+		height: 44rpx;
+		margin: 0rpx 80rpx;
+	}
+
+	.input {
+		border-bottom: 1rpx solid #FFFFFF;
+	}
+
+	.placehoderClass {
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 32rpx;
+		font-weight: 400;
+		line-height: 44rpx;
+		letter-spacing: 0.14px;
+	}
+
+	.text-content {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.importTxt {
+		color: rgba(174, 214, 0, 1);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		height: 60rpx;
+		line-height: 60rpx;
+		letter-spacing: 0.14px;
+
+	}
+
+	.textarea {
+		min-height: 300rpx;
+
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.line {
+		width: 100%;
+		height: 0rpx;
+		border-bottom: 1rpx solid rgba(255, 255, 255, 0.36);
+		margin-bottom: 20rpx;
+	}
+
+	.footBtn {
+		width: 100%;
+
+	}
+
+	.footBtn .convert {
+		/* 组合 99 */
+		width: 130rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		border-radius: 180px;
+		color: #232323;
+		background-color: #AED600;
+		text-align: center;
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 12rpx;
+	}
+
+	.footBtn .audioSett,
+	.audioSett {
+		margin-right: 50rpx;
+		color: #FFFFFFDE;
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 55rpx;
+		letter-spacing: 0px;
+		text-align: center;
+	}
+
+	.txtBtns {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index a25cc90..6faf71e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-export const env = 'production'; //production development  //开发of线上 改这里就行
+export const env = 'development'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options" + JSON.stringify(options), BASE.BASE_URL)