merge upstream

pages/210/deviceControl/index.vue

@@ -83,7 +83,8 @@
 						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1"
 							:class="{ 'active-mode': selectedIndex === index }">
 							<view class="mode-v2" @click="handleModeClick(index)">
-								<image :src="item.image" class="setIMG" mode="aspectFit"></image>
+								<image :src="selectedIndex === index ? item.activeImage : item.image" class="setIMG"
+									mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">{{ item.title }}</view>
 									<view class="mode-v3" v-if="item.subTitle">{{ item.subTitle }}</view>
@@ -194,6 +195,25 @@
 			<!-- ======各个弹框类型======= -->
 			<CustomPopupTXT :show="currentPopup.show" v-bind="currentPopup.config" @confirm="handleConfirm"
 				@cancel="handleCancel" class="custom-popup-txt" />
+			<!-- ===========报警声音========== -->
+			<view class="agreement-mask" v-if="lightModeC">
+				<view class="agreement-popupB" @click.stop>
+					<view class="popup-title">报警声音</view>
+
+					<view class="example_img">
+						<image src="/static/images/210/upload.png" mode="aspectFit" class="uploadIMG"></image>
+						<view>点击选择上传文件</view>
+					</view>
+					<view class="example_img">
+						<image src="/static/images/210/delete.png" mode="aspectFit" class="uploadIMG"></image>
+						<view>删除</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleAlarmSound">确定</button>
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -225,34 +245,41 @@
 		},
 		data() {
 			return {
-				selectedIndex: -1, // Track currently selected index
+				selectedIndex: -1,
+				lightModeC: false,
 				modeItems: [{
 						image: "/static/images/210/lj.png",
+						activeImage: "/static/images/210/lj-HL.png",
 						title: "联机设备",
 						subTitle: ""
 					},
 					{
 						image: "/static/images/210/bj.png",
+						activeImage: "/static/images/210/bj-HL.png",
 						title: "报警声音",
 						subTitle: "上传"
 					},
 					{
 						image: "/static/images/210/zd.png",
+						activeImage: "/static/images/210/zd-HL.png",
 						title: "自动报警",
 						subTitle: ""
 					},
 					{
-						image: "/static/images/210/zd-HL.png",
+						image: "/static/images/210/zd.png",
+						activeImage: "/static/images/210/zd-HL.png",
 						title: "手动报警",
 						subTitle: ""
 					},
 					{
 						image: "/static/images/common/path7.png",
+						activeImage: "/static/images/210/path-HL.png",
 						title: "开机画面",
 						subTitle: "上传"
 					},
 					{
 						image: "/static/images/210/time.png",
+						activeImage: "/static/images/210/time-HL.png",
 						title: "报警时长",
 						subTitle: "30秒"
 					}
@@ -477,7 +504,10 @@
 			},
 			// 报警声音
 			soundAlarm() {
-
+				this.lightModeC = true
+			},
+			handleAlarmSound() {
+				this.lightModeC = false
 			},
 			// 自动报警
 			automaticAlarm() {
@@ -1262,10 +1292,10 @@
 
 	.agreement-popupB {
 		width: 100%;
-		height: 32%;
+		/* height: 32%; */
 		background-color: rgb(42, 42, 42);
 		border-radius: 60rpx 60rpx 0rpx 0rpx;
-		padding: 40rpx;
+		padding: 40rpx 0rpx 140rpx 40rpx;
 		box-sizing: border-box;
 		position: absolute;
 		bottom: 0rpx;
@@ -1280,6 +1310,21 @@
 		border: 1px solid rgba(255, 200, 78, 1);
 	}
 
+	.example_img {
+		display: flex;
+		color: #fff;
+		margin-bottom: 20rpx;
+		align-items: center;
+		cursor: pointer;
+		font-size: 30rpx;
+	}
+
+	.uploadIMG {
+		width: 62rpx;
+		height: 62rpx;
+		margin-right: 15rpx;
+	}
+
 	.popup-Title {
 		color: rgba(255, 200, 78, 1);
 	}

pages/common/audioManager/Recording.vue

@@ -8,7 +8,6 @@
 
 				<view class="clear"></view>
 			</view>
-
 			<view class="text-content">
 				<view class="uni-textarea">
 					<textarea class="textarea" v-model="formData.txt" placeholder-class="placehoderClass"
@@ -265,7 +264,6 @@
 			});
 		},
 		onBackPress(e) {
-			debugger;
 			if (this.Status.isRecord) { //如果正在录音，提示是否放弃
 				this.showMsg("正在录音,是否放弃?", false, true, () => {
 					these.Status.pageValid = true;
@@ -438,7 +436,6 @@
 				task().then(res => {
 
 					try {
-						debugger;
 						console.log("文本转语音成功", res);
 						hexs = res;
 
@@ -1091,7 +1088,6 @@
 
 			},
 			stopLuYin() {
-				debugger;
 				clearInterval(this.Status.recoderIntval);
 				this.Status.recoderIntval = null;