zc

pages_manage/views/emergencyEvacuationBig.vue

@@ -658,7 +658,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) {
@@ -667,6 +666,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = false;
 					this.sendLock = true; //触发了上滑取消发送，上锁
 				} else {
 					uni.showToast({
@@ -674,6 +674,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = true;
 					this.sendLock = false; //上划距离不足，依然可以发送，不上锁
 				}
 			},

pages_manage/views/laboratory/voiceBroadcast.vue

@@ -189,7 +189,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) {
@@ -198,6 +197,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = false;
 					this.sendLock = true; //触发了上滑取消发送，上锁
 				} else {
 					uni.showToast({
@@ -205,6 +205,7 @@
 						icon: "none",
 						duration: 60000
 					});
+					this.liveType = true;
 					this.sendLock = false; //上划距离不足，依然可以发送，不上锁
 				}
 			},