Merge branch 'nwafu_1st_lhwrrs_v1.1_20260324' into SCHOOL-XiBeiNongLin

pages_manage/views/emergencyEvacuationBig.vue

@@ -633,7 +633,6 @@
 				if (num == 0) {
 					return
 				}
-				this.liveType = false;
 				// console.log('取消', e)
 				let moveLenght = e.touches[e.touches.length - 1].clientY - this.startPoint.clientY; //移动距离
 				if (Math.abs(moveLenght) > 50) {
@@ -642,6 +641,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = false;
 					this.sendLock = true; //触发了上滑取消发送，上锁
 				} else {
 					wx.showToast({
@@ -649,6 +649,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = true;
 					this.sendLock = false; //上划距离不足，依然可以发送，不上锁
 				}
 			},

pages_manage/views/laboratory/voiceBroadcast.vue

@@ -145,7 +145,6 @@
 				if (num == 0) {
 					return
 				}
-				this.liveType = false;
 				console.log('取消', e)
 				let moveLenght = e.touches[e.touches.length - 1].clientY - this.startPoint.clientY; //移动距离
 				if (Math.abs(moveLenght) > 50) {
@@ -154,6 +153,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = false;
 					this.sendLock = true; //触发了上滑取消发送，上锁
 				} else {
 					wx.showToast({
@@ -161,6 +161,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = true;
 					this.sendLock = false; //上划距离不足，依然可以发送，不上锁
 				}
 			},