合并代码

This commit is contained in:
Teng 2026-01-28 16:58:50 +08:00
parent 076dd5d928
commit 349c892018
1 changed files with 14 additions and 2 deletions

View File

@ -516,7 +516,7 @@
编辑 编辑
</view> </view>
</view> </view>
<!-- <view class="target-items"> <!-- <view class="target-items">
<view class="target-gray"> <view class="target-gray">
{{ ruleritem.categoryName }} {{ ruleritem.categoryName }}
@ -1361,8 +1361,11 @@
typeof window !== 'undefined' && window.requestAnimationFrame typeof window !== 'undefined' && window.requestAnimationFrame
? window.requestAnimationFrame ? window.requestAnimationFrame
: (cb) => setTimeout(cb, 16); : (cb) => setTimeout(cb, 16);
function handleScrolltime(e) { function handleScrolltime(e) {
// uni-app scroll e.detail.scrollTop // uni-app scroll e.detail.scrollTop
// console.log("")
killbaddata.value = true
// //
const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0; const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
lastY = scrollTop; lastY = scrollTop;
@ -1379,7 +1382,12 @@
} }
} }
const leftIn = ref(0) const leftIn = ref(0)
const killbaddata = ref(true)
function handleTop(e) { function handleTop(e) {
// console.log(``)
killbaddata.value = true
leftIn.value = e.detail.scrollLeft leftIn.value = e.detail.scrollLeft
} }
// //
@ -2380,9 +2388,11 @@
// shakyTable.value = false // shakyTable.value = false
saveX.value = Math.floor(e.touches[0].pageX); saveX.value = Math.floor(e.touches[0].pageX);
saveY.value = Math.floor(e.touches[0].pageY); saveY.value = Math.floor(e.touches[0].pageY);
killbaddata.value = false
longPressTimer.value = setTimeout(() => { longPressTimer.value = setTimeout(() => {
if (isScrolling.value) return if (isScrolling.value) return
if (killbaddata.value) return
if (item.directiveName) { if (item.directiveName) {
let reldata = [] let reldata = []
const query = uni.createSelectorQuery() const query = uni.createSelectorQuery()
@ -2416,9 +2426,11 @@
saveX.value = Math.floor(e.touches[0].pageX); saveX.value = Math.floor(e.touches[0].pageX);
saveY.value = Math.floor(e.touches[0].pageY); saveY.value = Math.floor(e.touches[0].pageY);
longPressTimer.value = setTimeout(() => { longPressTimer.value = setTimeout(() => {
if (isScrolling.value) return if (isScrolling.value) return
// console.log("/////",killbaddata.value)
// if (killbaddata.value) return
isTuoing.value = true; isTuoing.value = true;
emit('handsend', item) emit('handsend', item)
postitem.value = item postitem.value = item