Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/nurse/newindex.vue

@@ -516,7 +516,7 @@
 										编辑
 									</view>
 								</view>
-								
+
 								<!-- <view class="target-items">
 									<view class="target-gray">
 										{{ ruleritem.categoryName }}
@@ -1361,8 +1361,11 @@
 		typeof window !== 'undefined' && window.requestAnimationFrame
 			? window.requestAnimationFrame
 			: (cb) => setTimeout(cb, 16);
+
 	function handleScrolltime(e) {
 		// uni-app 的 scroll 事件通常把位置放在 e.detail.scrollTop
+		// console.log("触发上下滑动")
+		killbaddata.value = true
 		// 为保险，先做容错判断
 		const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
 		lastY = scrollTop;
@@ -1379,7 +1382,12 @@
 		}
 	}
 	const leftIn = ref(0)
+
+	const killbaddata = ref(true)
+
 	function handleTop(e) {
+		// console.log(`触发左右滑动`)
+		killbaddata.value = true
 		leftIn.value = e.detail.scrollLeft
 	}
 	// 方法：根据条件返回不同的类名
@@ -2380,9 +2388,11 @@
 		// shakyTable.value = false
 		saveX.value = Math.floor(e.touches[0].pageX);
 		saveY.value = Math.floor(e.touches[0].pageY);
+		killbaddata.value = false
 
 		longPressTimer.value = setTimeout(() => {
 			if (isScrolling.value) return
+			if (killbaddata.value) return
 			if (item.directiveName) {
 				let reldata = []
 				const query = uni.createSelectorQuery()
@@ -2416,9 +2426,11 @@
 		saveX.value = Math.floor(e.touches[0].pageX);
 		saveY.value = Math.floor(e.touches[0].pageY);
 
+
 		longPressTimer.value = setTimeout(() => {
 			if (isScrolling.value) return
-
+			// console.log("/////",killbaddata.value)
+			// if (killbaddata.value) return
 			isTuoing.value = true;
 			emit('handsend', item)
 			postitem.value = item