diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue index 07bfaec..a3b2367 100644 --- a/pages/Warehouse/Warehouse.vue +++ b/pages/Warehouse/Warehouse.vue @@ -20,7 +20,7 @@ - @@ -59,10 +59,53 @@ }, }); const housedex = ref(-1); - + const forthmenuIndex = ref(0); + const lastTap = ref(0) + const DOUBLE_TAP_DELAY = 300; + const setout = ref(null) const housactive = (index : number) => { - console.log("点击哪个了",index) - if (index > 5) { return } + housedex.value = index; + const now = Date.now() + forthmenuIndex.value = i + if (now - lastTap.value < DOUBLE_TAP_DELAY) { + // 双击成立 + clearTimeout(setout.value) + if (index == 1) { + navurl.value = 'pages/procurement/material' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 2) { + navurl.value = 'pages/Warehouse/picking' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 3) { + navurl.value = 'pages/Warehouse/finish' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + // 重置,避免多次触发 + lastTap.value = 0 + } else { + setout.value = setTimeout(()=>{ + console.log("点击哪个了",index) + if (index === 5) { + uni.navigateTo({ + url: "/pages/watch/full" + }) + } + + },DOUBLE_TAP_DELAY) + // 记录本次时间,等待下次点击 + lastTap.value = now + } + + + if(housedex.value == index){ if (housedex.value == 0) { navurl.value = 'pages/Warehouse/paymoney' @@ -70,34 +113,10 @@ url: '/' + navurl.value }) } - if (housedex.value == 1) { - navurl.value = 'pages/procurement/material' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 2) { - navurl.value = 'pages/Warehouse/picking' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 3) { - navurl.value = 'pages/Warehouse/finish' - uni.navigateTo({ - url: '/' + navurl.value - }) - } + return } - housedex.value = index; - // console.log("index", index) - // 只有中心的四个有动画.....所以点不到监控室 - if (index === 5) { - uni.navigateTo({ - url: "/pages/watch/full" - }) - } + } onMounted(() => { housedex.value = 1 @@ -512,6 +531,14 @@ top: 24vw; right: 6vw; } + .annotation7 { + top: 62vh; + left: 40vw; + } + .annotation8 { + top: 5vh; + left: 28vw; + } // title .annotation { diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index 7389561..aed1917 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -39,7 +39,7 @@ 采购单价: - ¥1.50 + ¥{{ gaijia }} @@ -47,17 +47,17 @@ 到货单价 - - ¥1500.00 + + ¥ {{ gaijia }} - 取消 - 确定 @@ -66,50 +66,50 @@ - + 1 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + AC - + 0 - + . @@ -234,7 +234,7 @@ - + - + border-radius: 20rpx;"> @@ -263,7 +262,8 @@ - + - @@ -379,7 +379,6 @@ - - + - + + :src="`/static/index/warehouse/procurement/picking/bebad${!Number(plsbuy[lefttarget]?.status)?``:`target`}.png`" /> 作废 @@ -1072,32 +1071,77 @@ - + -