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

pages.json

@@ -212,6 +212,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+		},
+		{
+			"path" : "pages/procurement/outbound",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 
 		// {

pages/Warehouse/Warehouse.vue

@@ -20,8 +20,8 @@
 					<!-- 采购增加层级高度方便点击 -->
 				</view>
 			</view>
-			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','拣货','完结','护理单元','监控室']"
+			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','拣货','完结','护理单元','监控室','请领出库','退货入库']"
-				:key='i' @click="onlyjump(i)">
+				:key='i' @click.stop="housactive(i)">
 				<view> </view>
 				<view class="tp">
 					<text>{{v}}</text>
@@ -34,7 +34,6 @@
 			</view>
 			<view @click="onlyjump(5)" class="zhanwei"></view>
 
-			<!-- <arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" /> -->
 			<view class="operationbtn">
 				<view v-for="(v,i) in ['请领出库','退货入库','库存盘点','实时监控']" @tap="onTap(i)"
 					:class="beblue === i ? 'click-box-target' : 'click-box'">
@@ -59,106 +58,86 @@
 		},
 	});
 	const housedex = ref(-1);
-
+	const lastTap = ref(0)
+	const DOUBLE_TAP_DELAY = 300;
+	const setout = ref(null)
 	const housactive = (index : number) => {
-		console.log("点击哪个了",index)
-		if (index > 5) { return }
-		if(housedex.value == index){
-			if (housedex.value == 0) {
-				navurl.value = 'pages/Warehouse/paymoney'
-				uni.navigateTo({
-					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)
+			const now = Date.now()
-		// 只有中心的四个有动画.....所以点不到监控室
+			if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-		if (index === 5) {
+				// 双击成立
-			uni.navigateTo({
+				clearTimeout(setout.value)
-				url: "/pages/watch/full"
+				if (index == 0) {
-			})
+					navurl.value = 'pages/Warehouse/paymoney'
-		}
+					uni.navigateTo({
+						url: '/' + navurl.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
+				 	})
+				 }
+				 if (index === 5) {
+				 	uni.navigateTo({
+				 		url: "/pages/watch/full"
+				 	})
+				 }
+				 if (index ==6) {
+				 		navurl.value = 'pages/procurement/outbound?code=0'
+				 		uni.navigateTo({
+				 			url: '/' + navurl.value
+				 		})
+				 }
+				 if (index ==7) {
+				 		navurl.value = 'pages/procurement/outbound?code=1'
+				 		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
+			}
+		
 	}
 	onMounted(() => {
 		housedex.value = 1
 	})
 	const navurl = ref('');
-	const movecard = (type : number) => {
-		// console.log(type,housedex.value)
-		switch (type) {
-			case 0:
-				// 上
-				housedex.value > 0 ? housedex.value-- : housedex.value = 3
-				break;
-			case 1:
-				housedex.value > 2 ? housedex.value = 0 : housedex.value++
-				// →
-				break;
-			case 2:
-				housedex.value > 2 ? housedex.value = 0 : housedex.value++
-				// 下
-				break;
-			case 3:
-				housedex.value > 0 ? housedex.value-- : housedex.value = 3
-				// ←
-				break;
-			case 4:
-				// 确定
-				// console.log('选中' + housedex.value)
-				if (housedex.value == 1) {
-					navurl.value = 'pages/Warehouse/procurement'
-					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
-					})
-				}
-				// uni.navigateTo({
-				// 	url: '/' + navurl.value
-				// })
-				break;
-			case 5:
-				// 返回
-				uni.navigateBack()
-				break;
-
-			default:
-				break;
-		}
-	}
 	const onlyjump = (index : number) => {
 		console.log("点击了哪个图标", index)
-		if (index > 5) { return }
+		if (index > 5) {
+				navurl.value = 'pages/Warehouse/finish'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			return 
+		}
 		if (index < 4) {
 			housedex.value = index;
 		}
@@ -512,6 +491,14 @@
 			top: 24vw;
 			right: 6vw;
 		}
+		.annotation7 {
+			top: 62vh;
+			left: 40vw;
+		}
+		.annotation8 {
+			top: 5vh;
+			left: 28vw;
+		}
 
 		// title
 		.annotation {

pages/procurement/outbound.vue

@@ -0,0 +1,32 @@
+<template>
+	<view>
+		<view 
+		style="
+		width: 100%;
+		height: 100vh;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 2vw;">
+		{{code==0?'请领出库':'退货入库'}}
+		
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(e) {
+			this.code = e.code
+		},
+		data() {
+			return {
+				code:0
+			};
+		}
+	}
+</script>
+
+<style lang="less">
+
+</style>

unpackage/dist/dev/.nvue/pages/camera.js

@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };