From 132f4f8f2845f11529c3dd9af5dcb8c710587738 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Fri, 28 Nov 2025 13:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/nurse/index.css   | 102 +--
 pages/NursingNew/component/nurse/index.vue   |   6 +-
 pages/Warehouse/warehome.vue                 | 856 ++++++++++---------
 static/index/newruler/jiao.png               | Bin 1597 -> 1714 bytes
 unpackage/dist/dev/.nvue/pages/camera.js     |   2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js |   2 +-
 6 files changed, 490 insertions(+), 478 deletions(-)

diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 5c1a4d1..fa06e8c 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -68,8 +68,9 @@
 					position: absolute;
 					top: 0rpx;
 					right: 0rpx;
-					width: 55rpx;
-					height: 45rpx;
+					width: 200rpx;
+					height: 100rpx;
+					/* background-color: red; */
 				}
 
 				.title-time-font {
@@ -356,18 +357,18 @@
 						position: absolute;
 						top: -4rpx;
 						right: -4rpx;
-						width: 65rpx;
-						height: 30rpx;
+						width: 70rpx;
+						height: 40rpx;
 
 					}
 
 					.title-time-button-font {
-						color: #fff;
+						color: #1083f8;
 						position: absolute;
 						top: 2rpx;
 						right: 8rpx;
 						font-size: 19rpx;
-						z-index: 9999;
+						z-index: 99;
 					}
 
 					.right-box-font {
@@ -594,11 +595,12 @@
 		}
 
 		.title-time-font-rel {
-			font-size: 25rpx;
+			font-size: 23rpx;
 			margin-bottom: 5rpx;
 			overflow: hidden;
 			text-overflow: ellipsis;
 			white-space: nowrap;
+			color: #888888;
 		}
 
 		.title-time-items {
@@ -910,9 +912,9 @@
 	.title-time-font {
 		position: absolute;
 		top: 0rpx;
-		right: 5rpx;
-		font-size: 14rpx;
-		color: #fff;
+		right: 4rpx;
+		font-size: 20rpx;
+		color: #1083f8;
 	}
 }
 
@@ -1576,33 +1578,6 @@
 	flex-direction: column;
 }
 
-.title-time-border-red {
-	background-color: #dae8fa;
-	width: calc(100%);
-	height: calc(100%);
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	/* 调整 box-shadow 使其向下投影 */
-	box-shadow: 0px 20rpx 40rpx #dae8fa;
-
-	background:
-		linear-gradient(to right, red, red) top left / 60rpx 8rpx no-repeat,
-		/* 左上角垂直 */
-		linear-gradient(to bottom, red, red) top left / 8rpx 60rpx no-repeat,
-		/* 右上角水平 */
-		linear-gradient(to left, red, red) top right / 60rpx 8rpx no-repeat,
-		/* 右上角垂直 */
-		linear-gradient(to bottom, red, red) top right / 8rpx 60rpx no-repeat,
-		/* 左下角水平 */
-		linear-gradient(to right, red, red) bottom left / 60rpx 8rpx no-repeat,
-		/* 左下角垂直 */
-		linear-gradient(to top, red, red) bottom left / 8rpx 60rpx no-repeat,
-		/* 右下角水平 */
-		linear-gradient(to left, red, red) bottom right / 60rpx 8rpx no-repeat,
-		/* 右下角垂直 */
-		linear-gradient(to top, red, red) bottom right / 8rpx 60rpx no-repeat;
-}
 
 .title-time-border-big {
 	transform: scale(1.3);
@@ -1638,35 +1613,6 @@
 	position: relative;
 }
 
-.title-time-border-blue {
-	background-color: #dae8fa;
-	width: calc(100%);
-	height: calc(100%);
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	/* 调整 box-shadow 使其向下投影 */
-	box-shadow: 0px 20rpx 40rpx #dae8fa;
-	background:
-		/* 左上角水平 */
-		linear-gradient(to right, #0184db, #0184db) top left / 60rpx 8rpx no-repeat,
-		/* 左上角垂直 */
-		linear-gradient(to bottom, #0184db, #0184db) top left / 8rpx 60rpx no-repeat,
-		/* 右上角水平 */
-		linear-gradient(to left, #0184db, #0184db) top right / 60rpx 8rpx no-repeat,
-		/* 右上角垂直 */
-		linear-gradient(to bottom, #0184db, #0184db) top right / 8rpx 60rpx no-repeat,
-		/* 左下角水平 */
-		linear-gradient(to right, #0184db, #0184db) bottom left / 60rpx 8rpx no-repeat,
-		/* 左下角垂直 */
-		linear-gradient(to top, #0184db, #0184db) bottom left / 8rpx 60rpx no-repeat,
-		/* 右下角水平 */
-		linear-gradient(to left, #0184db, #0184db) bottom right / 60rpx 8rpx no-repeat,
-		/* 右下角垂直 */
-		linear-gradient(to top, #0184db, #0184db) bottom right / 8rpx 60rpx no-repeat;
-}
-
-
 .title-time-border-yellow {
 	margin: 10rpx;
 	border: 2rpx solid transparent;
@@ -1676,7 +1622,7 @@
 	border-radius: 20rpx;
 	display: flex;
 	align-items: center;
-	background-color: #fff;
+	background-color: rgba(255, 255, 255, 0.5);
 	flex-direction: column;
 	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
 }
@@ -1692,7 +1638,7 @@
 	align-items: center;
 	flex-direction: column;
 	opacity: 0.3;
-	background-color: #fff;
+	background-color: rgba(255, 255, 255, 0.5);
 	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
 }
 
@@ -1707,7 +1653,7 @@
 	align-items: center;
 	flex-direction: column;
 	animation: shakesmall 0.8s infinite;
-	background-color: #fff;
+	background-color: rgba(255, 255, 255, 0.5);
 }
 
 .down-icons {
@@ -2345,20 +2291,20 @@
 			top: 0rpx;
 			right: 0rpx;
 			width: 120rpx;
-			height: 40rpx;
+			height: 50rpx;
 		}
 
 		.zhiling-card-font {
 			position: absolute;
-			top: 0rpx;
-			right: 0rpx;
-			width: 120rpx;
-			height: 40rpx;
+			top: 5rpx;
+			right: 20rpx;
+			/* width: 100rpx; */
+			/* height: 40rpx; */
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			color: #fff;
-			font-size: 24rpx;
+			color: #1083f8;
+			font-size: 22rpx;
 		}
 
 		.bag {
@@ -2375,7 +2321,7 @@
 	.overlay {
 		position: fixed;
 		inset: 0;
-		background: rgba(0, 0, 0, 0.1);
+		background-color: rgba(236, 237, 241, 0.4);
 		/* 半透明黑色 */
-		z-index: 998;
+		z-index: 999;
 	}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index 030d505..d4f8c4e 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -183,17 +183,17 @@
 																v-show=" liang.index0 !== index0 || liang.index1 !== index1 || canmove"
 																style="flex-direction: column;">
 																<image v-show="item1.startTime"
-																	style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
+																	style="width: 50rpx;height: 50rpx;margin: 0 auto;margin-top: 20rpx"
 																	:src="item1.netImmediateFile?item1.netImmediateFile:`/static/logo.png`" />
 																<view class="title-time-time" style="font-size: 30rpx;">
 																	{{item1.startTime + `-` + item1.endTime}}
 																</view>
 																<image class="title-time-button"
-																	style="width: 80rpx;height: 48rpx;"
+																	style="width: 80rpx;height: 50rpx;"
 																	v-if="item1.cycleType!='日常'"
 																	src="/static/index/newruler/jiao.png" />
 																<view class="title-time-font"
-																	style="right: 10rpx;top: 5rpx;font-size: 23rpx;"
+																	style="right: 10rpx;top: 5rpx;"
 																	v-if="item1.cycleType!='日常'">
 																	{{item1.cycleType}}
 																</view>
diff --git a/pages/Warehouse/warehome.vue b/pages/Warehouse/warehome.vue
index b96d961..6014fc6 100644
--- a/pages/Warehouse/warehome.vue
+++ b/pages/Warehouse/warehome.vue
@@ -1,395 +1,461 @@
-<template>
-	<view>
-		<view class="home tp"> <image src="/static/index/warehouse/home/Back2.jpg" mode="aspectFill"></image></view>
-		<view class="contitem tp" >
-			<image src="/static/index/warehouse/home/warehouse.png" mode="aspectFill"></image>
-		</view>
-		<view class="hldy tp">
-			<donghua width="16vw" height="8.6vw" :links="logoval.url" :playing="true" />
-		</view>
-		<view class="route tp">
-			<image src="/static/index/warehouse/home/carrhate.gif" mode="aspectFill" style="z-index: 4;"></image>
-		</view>
-		<view class="pulu1 tp">
-			<!-- <image src="/static/index/warehouse/home/pu1.png" mode="aspectFill" ></image> -->
-			<image src="/static/index/warehouse/home/pu3.gif" mode="aspectFill" ></image>
-		</view>
-		<view class="pulu2 tp">
-			<!-- <image src="/static/index/warehouse/home/pu2.png" mode="aspectFill"  ></image> -->
-			<image src="/static/index/warehouse/home/pu2.gif" mode="aspectFill"  ></image>
-		</view>
-		<view class="clikurlbox">
-			<view class="tp" :class="'itemact'+(index+1)" v-for="(item,index) in animArray" :key='index'
-				@click="housactive(index)">
-				<donghua :width="item.width" :height="item.height" :links="item.url" :playing="index == housedex" />
-			</view>
-		</view>
-		<view class="cardtm">
-			<view class="b" :class="{ 'actve':housedex == i}" v-for="(v,i) in ['采购','盘点','拣货','请领出库','退货入库','监控室']" @click="housactive(i)">
-				<text></text>{{v}}
-				<view class="tp">
-					<image src="/static/index/warehouse/home/z.png" mode=""></image>
-				</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script setup lang="ts">
-	 import { ref, onMounted, reactive , onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
-	 
-	 const housedex = ref(0);
-	 const lastTap = ref(0)
-	 const DOUBLE_TAP_DELAY = 300;
-	 const setout = ref(null)
-	 const navurl = ref('')
-	 const housactive = (index : number) => {
-		 console.log(index)
-	 	housedex.value = index;
-	 	const now = Date.now()
-	 	if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-	 		// 双击成立
-	 		clearTimeout(setout.value)
-	 		if (index == 1) {
-	 			navurl.value = 'pages/Warehouse/paymoney'
-	 			uni.navigateTo({
-	 				url: '/' + navurl.value
-	 			})
-	 		}
-	 		if (index == 0) {
-	 			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) {
-	 			uni.navigateTo({
-	 				url: "/pages/watch/full"
-	 			})
-	 		}
-			if (index === 5) {
-				uni.navigateTo({
-					url: "/pages/watch/full"
-				})
-			}
-	 		if (index == 7) {
-	 			navurl.value = 'pages/procurement/outbound?code=0'
-	 			uni.navigateTo({
-	 				url: '/' + navurl.value
-	 			})
-	 		}
-	 		if (index == 8) {
-	 			navurl.value = 'pages/procurement/outbound?code=1'
-	 			uni.navigateTo({
-	 				url: '/' + navurl.value
-	 			})
-	 		}
-	 		// 重置，避免多次触发
-	 		lastTap.value = 0
-	 	} else {
-	 		setout.value = setTimeout(() => {
-	 			// console.log("点击哪个了", index)
-	 		}, DOUBLE_TAP_DELAY)
-	 		// 记录本次时间，等待下次点击
-	 		lastTap.value = now
-	 	}
-	 
-	 }
-	 
-	 
-	 function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
-	 	return Array.from({ length: count }, (_, i) => {
-	 		const idx = pad
-	 			? String(i + startIndex).padStart(2, '0')
-	 			: i + startIndex
-	 		return `${base}/${prefix}${idx}.${ext}`
-	 	})
-	 }
-	 const animArray = ref([
-	 	{
-	 		url: genPaths(
-	 			'/static/index/warehouse/home/',
-	 			'Procurement',
-	 			5,    // 张数
-	 			'png',
-	 			0,     // 起始索引为 1
-	 			false  // 不补零
-	 		),
-	 		width: '22.3vw',
-	 		height: '13.6vw'
-	 	},
-		{
-			url: genPaths(
-				'/static/index/warehouse/home',
-				'inventory',
-				4,    // 张数
-				'png',
-				0,     // 起始索引为 1
-				false  // 不补零
-			),
-			width: '11vw',
-			height: '10vw'
-		},
-		{
-			url: genPaths(
-				'/static/index/warehouse/home',
-				'pick',
-				4,    // 张数
-				'png',
-				0,     // 起始索引为 1
-				false  // 不补零
-			),
-			width: '11vw',
-			height: '9vw'
-		},
-		{
-			url: genPaths(
-				'/static/index/warehouse/home',
-				'unit1-',
-				5,    // 张数
-				'png',
-				0,     // 起始索引为 1
-				false  // 不补零
-			),
-			width: '14.3vw',
-			height: '13vw'
-		},
-		{
-			url: genPaths(
-				'/static/index/warehouse/home',
-				'unit1-',
-				5,    // 张数
-				'png',
-				0,     // 起始索引为 1
-				false  // 不补零
-			),
-			width: '14.3vw',
-			height: '13vw'
-		},
-		{
-			url: genPaths(
-				'/static/index/warehouse/home',
-				'unit11-',
-				5,    // 张数
-				'png',
-				0,     // 起始索引为 1
-				false  // 不补零
-			),
-			width: '14.3vw',
-			height: '13vw'
-		},
-		])
-		const logoval = reactive({
-			url: genPaths(
-				'/static/index/warehouse/home',
-				'logo',
-				3,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			)})
-</script>
-
-<style scoped lang="less">
-	.clikurlbox{
-		position: fixed;
-		width: 100vw;
-		height: 100vw;
-		top: 0;
-		left: 0;
-		overflow: hidden;
-		z-index: 61;
-		.itemact1 {
-			width: 22.3vw;
-			height: 13.6vw;
-			bottom: 9.8vw;
-			left: 12.6vw;
-			z-index: 31;
-		}
-		
-		.itemact2 {
-			width: 9vw;
-			height: 9vw;
-			top: 22.5vw;
-			left: 16.5vw;
-			z-index: 57;
-		}
-		
-		.itemact3 {
-			width: 11vw;
-			height: 9vw;
-			top: 37vw;
-			left: 48vw;
-			z-index: 55;
-		}
-		.itemact4 {
-			width: 14.4vw;
-			height: 13vw;
-			top: 35vw;
-			right: 4.4vw;
-			z-index: 65;
-		}
-		.itemact5 {
-			width: 14.4vw;
-			height: 10vw;
-			bottom: 3vw;
-			right: 21vw;
-			z-index: 65;
-		}
-		.itemact6 {
-			width: 18.2vw;
-			height: 12vw;
-			top: 8vw;
-			left: 12vw;
-			z-index: 65;
-		}
-		view{
-			position: fixed;
-			z-index: 10;
-		}
-	}
-	.cardtm{
-		position: relative;
-		z-index: 66;
-		
-		>view{
-			position: fixed;
-			min-width: 5vw;
-			height: 2.7vw;
-			border-radius: 1.35vw;
-			box-shadow: 0rpx 0rpx 0.3vw 0rpx rgba(174,174,188,0.4);
-			z-index: 66;
-			display: flex;
-			align-items: center;
-			padding: 0 1vw;
-			white-space: nowrap;
-			z-index: 70;
-			&:nth-child(1){
-				bottom: 33.5vh;
-				left: 20.5vw;
-			}
-			&:nth-child(2){
-				top: 28vw;
-				left: 26.5vw;
-			}
-			&:nth-child(3){
-				bottom: 21vw;
-				left: 55vw;
-			}
-			&:nth-child(4){
-				top: 35vw;
-				right: 6.5vw;
-			}
-			&:nth-child(5){
-				bottom: 11.5vw;
-				right: 23.5vw;
-			}
-			&:nth-child(6){
-				top: 6vw;
-				left: 17vw;
-			}
-			
-			text{
-				width: 1vw;
-				height: 1vw;
-				border-radius: 50%;
-				border: 1px solid rgba(0, 137, 254, 1);
-				margin: 0 0.4vw 0 0;
-			}
-			view{
-				width: 2.8vw;
-				height: 4.4vw;
-				position: absolute;
-				top: 2vw;
-				left: 30%;
-			}
-		}
-		
-		.actve{
-			background: linear-gradient(-45deg, #0089FE, #97C1FF) !important;
-			color: #fff !important;
-			text{
-				border: 1px solid #fff;
-			}
-		}
-		.b{
-			background: #EFF2F6;
-		}
-	}
-	.pulu1{
-		width: 28.2vw;
-		height: 9.8vw;
-		position: fixed;
-		top: 30vw;
-		right: 9.2vw;
-		z-index: 60;
-		overflow: auto;
-		image{
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-	}
-	.pulu2{
-		width: 16.8vw;
-		height: 24vw;
-		position: fixed;
-		top: 30.7vw;
-		right: 21.1vw;
-		z-index: 60;
-		image{
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-	}
-	.route{
-		width: 99.5vw;
-		height: 51.2vw;
-		position: fixed;
-		top: 4.5vw;
-		left: 0.3vw;
-		z-index: 2;
-		image{
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-	}
-	.contitem{
-		width: 48vw;
-		height: 36vw;
-		position: fixed;
-		top: 5.3vw;
-		left: 28.2vw;
-		z-index: 50;
-	}
-	
-	.hldy{
-		position: fixed;
-		left: 6.7vw;
-		bottom: 3.7vw;
-		
-	}
-.home{
-	width: 100vw;
-	height: 100vh;
-	overflow: hidden;
-	position: relative;
-	z-index: 0;
-}
-.tp {
-	image{
-		width: 100%;
-		height: 100%;
-	}
-}
-</style>
+<template>
+	<view>
+		<view class="home tp">
+			
+			<image src="/static/index/warehouse/home/Back2.jpg" mode="aspectFill"></image>
+		</view>
+		<view class="contitem tp">
+			<image src="/static/index/warehouse/home/warehouse.png" mode="aspectFill"></image>
+		</view>
+		<view class="hldy tp">
+			<donghua width="16vw" height="8.6vw" :links="logoval.url" :playing="true" />
+		</view>
+		<view class="route tp">
+			<image src="/static/index/warehouse/home/carrhate.gif" mode="aspectFill" style="z-index: 4;"></image>
+		</view>
+		<view class="pulu1 tp">
+			<!-- <image src="/static/index/warehouse/home/pu1.png" mode="aspectFill" ></image> -->
+			<image src="/static/index/warehouse/home/pu3.gif" mode="aspectFill"></image>
+		</view>
+		<view class="pulu2 tp">
+			<!-- <image src="/static/index/warehouse/home/pu2.png" mode="aspectFill"  ></image> -->
+			<image src="/static/index/warehouse/home/pu2.gif" mode="aspectFill"></image>
+		</view>
+		<view class="clikurlbox">
+			<view class="tp" :class="'itemact'+(index+1)" v-for="(item,index) in animArray" :key='index'
+				@click="housactive(index)">
+				<donghua :width="item.width" :height="item.height" :links="item.url" :playing="index == housedex" />
+			</view>
+		</view>
+		<view class="cardtm">
+			<view class="b" :class="{ 'actve':housedex == i}" v-for="(v,i) in ['采购','盘点','拣货','请领出库','退货入库','监控室']"
+				@click="housactive(i)">
+				<text></text>{{v}}
+				<view class="tp">
+					<image src="/static/index/warehouse/home/z.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="contain-right-button" @click="goback()">
+			<image class="buttont-img" style="margin-top: 4rpx;" src="/static/index/purchaseorder/back.png" />
+			<view class="button-font">
+				返回
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
+
+	const housedex = ref(0);
+	const lastTap = ref(0)
+	const DOUBLE_TAP_DELAY = 300;
+	const setout = ref(null)
+	const navurl = ref('')
+	const housactive = (index : number) => {
+		console.log(index)
+		housedex.value = index;
+		const now = Date.now()
+		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
+			// 双击成立
+			clearTimeout(setout.value)
+			if (index == 1) {
+				navurl.value = 'pages/Warehouse/paymoney'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 0) {
+				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) {
+				uni.navigateTo({
+					url: "/pages/watch/full"
+				})
+			}
+			if (index === 5) {
+				uni.navigateTo({
+					url: "/pages/watch/full"
+				})
+			}
+			if (index == 7) {
+				navurl.value = 'pages/procurement/outbound?code=0'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 8) {
+				navurl.value = 'pages/procurement/outbound?code=1'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			// 重置，避免多次触发
+			lastTap.value = 0
+		} else {
+			setout.value = setTimeout(() => {
+				// console.log("点击哪个了", index)
+			}, DOUBLE_TAP_DELAY)
+			// 记录本次时间，等待下次点击
+			lastTap.value = now
+		}
+
+	}
+
+
+	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
+		return Array.from({ length: count }, (_, i) => {
+			const idx = pad
+				? String(i + startIndex).padStart(2, '0')
+				: i + startIndex
+			return `${base}/${prefix}${idx}.${ext}`
+		})
+	}
+	const animArray = ref([
+		{
+			url: genPaths(
+				'/static/index/warehouse/home/',
+				'Procurement',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '22.3vw',
+			height: '13.6vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'inventory',
+				4,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '11vw',
+			height: '10vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'pick',
+				4,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '11vw',
+			height: '9vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit1-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit1-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit11-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
+	])
+	const logoval = reactive({
+		url: genPaths(
+			'/static/index/warehouse/home',
+			'logo',
+			3,    // 张数
+			'png',
+			1,     // 起始索引为 1
+			false  // 不补零
+		)

+	})
+	const goback = () => {
+		console.log("?/////")
+		uni.navigateBack()
+	}
+</script>
+
+<style scoped lang="less">
+	.clikurlbox {
+		position: fixed;
+		width: 100vw;
+		height: 100vw;
+		top: 0;
+		left: 0;
+		overflow: hidden;
+		z-index: 61;
+
+		.itemact1 {
+			width: 22.3vw;
+			height: 13.6vw;
+			bottom: 9.8vw;
+			left: 12.6vw;
+			z-index: 31;
+		}
+
+		.itemact2 {
+			width: 9vw;
+			height: 9vw;
+			top: 22.5vw;
+			left: 16.5vw;
+			z-index: 57;
+		}
+
+		.itemact3 {
+			width: 11vw;
+			height: 9vw;
+			top: 37vw;
+			left: 48vw;
+			z-index: 55;
+		}
+
+		.itemact4 {
+			width: 14.4vw;
+			height: 13vw;
+			top: 35vw;
+			right: 4.4vw;
+			z-index: 65;
+		}
+
+		.itemact5 {
+			width: 14.4vw;
+			height: 10vw;
+			bottom: 3vw;
+			right: 21vw;
+			z-index: 65;
+		}
+
+		.itemact6 {
+			width: 18.2vw;
+			height: 12vw;
+			top: 8vw;
+			left: 12vw;
+			z-index: 65;
+		}
+
+		view {
+			position: fixed;
+			z-index: 10;
+		}
+	}
+
+	.cardtm {
+		position: relative;
+		z-index: 66;
+
+		>view {
+			position: fixed;
+			min-width: 5vw;
+			height: 2.7vw;
+			border-radius: 1.35vw;
+			box-shadow: 0rpx 0rpx 0.3vw 0rpx rgba(174, 174, 188, 0.4);
+			z-index: 66;
+			display: flex;
+			align-items: center;
+			padding: 0 1vw;
+			white-space: nowrap;
+			z-index: 70;
+
+			&:nth-child(1) {
+				bottom: 33.5vh;
+				left: 20.5vw;
+			}
+
+			&:nth-child(2) {
+				top: 28vw;
+				left: 26.5vw;
+			}
+
+			&:nth-child(3) {
+				bottom: 21vw;
+				left: 55vw;
+			}
+
+			&:nth-child(4) {
+				top: 35vw;
+				right: 6.5vw;
+			}
+
+			&:nth-child(5) {
+				bottom: 11.5vw;
+				right: 23.5vw;
+			}
+
+			&:nth-child(6) {
+				top: 6vw;
+				left: 17vw;
+			}
+
+			text {
+				width: 1vw;
+				height: 1vw;
+				border-radius: 50%;
+				border: 1px solid rgba(0, 137, 254, 1);
+				margin: 0 0.4vw 0 0;
+			}
+
+			view {
+				width: 2.8vw;
+				height: 4.4vw;
+				position: absolute;
+				top: 2vw;
+				left: 30%;
+			}
+		}
+
+		.actve {
+			background: linear-gradient(-45deg, #0089FE, #97C1FF) !important;
+			color: #fff !important;
+
+			text {
+				border: 1px solid #fff;
+			}
+		}
+
+		.b {
+			background: #EFF2F6;
+		}
+	}
+
+	.pulu1 {
+		width: 28.2vw;
+		height: 9.8vw;
+		position: fixed;
+		top: 30vw;
+		right: 9.2vw;
+		z-index: 60;
+		overflow: auto;
+
+		image {
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+	}
+
+	.pulu2 {
+		width: 16.8vw;
+		height: 24vw;
+		position: fixed;
+		top: 30.7vw;
+		right: 21.1vw;
+		z-index: 60;
+
+		image {
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+	}
+
+	.route {
+		width: 99.5vw;
+		height: 51.2vw;
+		position: fixed;
+		top: 4.5vw;
+		left: 0.3vw;
+		z-index: 2;
+
+		image {
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+	}
+
+	.contitem {
+		width: 48vw;
+		height: 36vw;
+		position: fixed;
+		top: 5.3vw;
+		left: 28.2vw;
+		z-index: 50;
+	}
+
+	.hldy {
+		position: fixed;
+		left: 6.7vw;
+		bottom: 3.7vw;
+
+	}
+
+	.home {
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		position: relative;
+		z-index: 0;
+
+	}
+
+	.tp {
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.contain-right-button {
+		position: fixed;
+		top: 5vh;
+		right: 2vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 6vh;
+		width: 8.5vw;
+		border-radius: 40rpx;
+		border: 1rpx solid #555555;
+		border-color: #D9DADC;
+		box-shadow: 0 1rpx 3rpx #D9DADC;
+		margin-left: 20rpx;
+		z-index: 99;
+	
+		.buttont-img {
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 5rpx;
+		}
+	
+		.button-font {
+			font-size: 30rpx;
+			color: #555555;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/index/newruler/jiao.png b/static/index/newruler/jiao.png
index 8c490fe25905e8294cf89ec02f841aafa8ffd048..ad0776268efa95990786be28235558aa7fd93cef 100644
GIT binary patch
delta 1116
zcmdnXvx!%+Gr-TCmrII^fq{Y7)59eQNV@^C5eFNPd^mS)@I*xoM)iqala-AW%q{g&
zlaeir4a|(pbrg&Yj7;?njPwo7b&U+HObo4zEhaNE&YFCjvE9p5&(KIgBRn%NCBM8_
zQ%RvBx4_re$}_LHBrz{J)zigR2`HkMnVDi`W@2V+>}+Z5>}+6eXy|6(<YHv$WNPAK
z;OcB>U}5ey*??I_0jkIZr=lEY1DGO1oQn1!Oftf$=m)b?eb460Y77j_ik>cxAr-gY
z%=XT|>>$$meA&{annJ9O0#n)r6vQ|hD>zhCA~v*%?r*-&IyFM!#>a>Nv4GH8L5HOc
z0#mkmMlLwCtW04}Va}r)lPlEfj?L4Sy?aFN_&ojecV}F<&aTV5pW5>_)yirSOYJ3z
zBMD(9Y=$$=U)bjMkg>kFuxLr+pSZ;ztlN$+a#Ljc%zEpRg-wFNoLL^+QtkH*ZJsSy
z=Jtq@`T8H1sB0d7`W}AtQWk7z%&rjp7nh=tvRcLB`=S*F9k=pb66_qdDlum6e-W2F
zXXWq8iFXu(Yh*2I%6>(OlzTL9e4HtF&D7{!02A}|g5x2@hA~RBrr!Bj&tmlH9p6Qc
z*PLwYZl0=A>^mf@Vi7QDM;+U*Y3b!2zSo(q|8cEiG5z$4?`q^p-sO4cgLam<+aJ9y
zyFRkXevbM}zNe40BLwYR>Yknj>Rk9pg73NcrP>$%^X@2G1qQukd9X&w)-QRc+%efT
z?bg3$P2F{1rhAp-b2YzJ#Ugn-D(d-z<{!N-eSX1GmAj6HI~UikxVs?VU|rH4qZjW!
zm@X*jdst8*IIqc$Z<Do><~}A1wM(`cmfFE<S6Sa_U$nw7&w`g><{|Yk<wADV*L+-?
z4{&#Jx35Y3$}mgLq@3gZ%^bJ?%6IR~DinJuX7Z>`EuLS6!RX}c72(W5yVhRS5Hm2V
zpTl)Y_Riu(Of4dQ6P%bQH41J|o--rfxNTzIqrULwdAgzHDyCCv8m{#o_Sio2xNT%1
zyEk_aZ#u_It`b@Pt--P$HSYwjeOYqAV&jIqDHHP?rY~4{qn-Pt{>l?y8#|kS@@E{L
z;joKsZhILE-*kz)iYfEOB*YgKX7O%3T`_0lhIjQ7Slt<UgV`S+dDLdvRdSBWC8vJU
zJAqpMnT(eiSEk7=ye43Mc$es_84XL~l2ejarhO{Cz$twpGs8qoV$q~&sRptWUOh9|
zsxY_7&q+9Nr}AY}H`9Ap&eobOc>LmiU`dfr)qB^2d{Pkx?^fi^+T*_`LB3gSVe_}&
zLYldTLN{ENIm_mo`|jIp-{2Rv<_^=*t=?(*)1nRTKDx`#E%E>HEx8Qygbz`n+f2_H
f|CsWh(||#QX{FNr)~~aG1qOqstDnm{r-UW|C@8>i

delta 989
zcmdnQyO&3?Gr-TCmrII^fq{Y7)59eQNZSIjGzS}yJU_kt&_qQI#y1naCaV}Km|N-@
znwS|`SX!E!o9ieT85kMs8<^=End%xDTbY_$8JbLDoTZ$SY^#(}Qc_^0uU}AFl%tnl
zl&+tWte={bnwy$eQmk*NXE=Ex<Aiz>J#z((@XWlF{PJQ=C54LI0xRdD)Wnih7a+D(
z0-A2BYha;kU>IU(U}b1*WoV{tU}0ro08#3jpOTqYiK*1Y%Fxux#0W)cYDr>BVo4&Z
zVs((gXsT0^t<v&~auZ8zl`?Y^(^K^e^3o^kGs!5p89SSsnpwJ;xmvm!8oC)+8oM~U
zxmq}xyO<c6Iy#$8&W0;;G{C87Ig>#Q)Fc;Nij)+JOM+6<tWxrmOF`k~>0+w{3>v+Z
z%oHoAURPXtCmS<6)tfy{f5X7Q_}tUQF{I+wlNsl=SrR3V?|*+I*2u-LsGuY;#&U;+
z#?#}IG&G;;AMni9Rku8KbE-y=$3umml|_X`g+f7Io?dVF?0cV`QeNgZt-JR5O8@h3
z_I-YL`+05Jy_@ANHzt`iq<O5+5Ecro)vy=PI=TM*iHy$*9;ptu{X6OpHm>cnKQ5d%
z&F|b!{U?ogHk{w;^FXe$WkCt+=gZ3{NWGYTss8xX-;G<g_s?oD-sEqV!nOUrmv>)6
z?&Ci7aPbW#YMGmypFQF6`@2NfJpSMu4W+qHTzryUmn5)z#veK(p)fnC>ve1Y7s)fd
zVMedjYbO*QpCz$asq>dk=JIB4$@+rC4O@1dpM1}2bwu0Ei|T5DkEg~J$}=o;YvD=r
zw4VE`abI@D*2h5U8Rjv&I;U4ePBU4(_jpO(kEXEHpC&#Mac?ilyetvtn;FJCtuKm^
zH~GoMknH%(<=+1zB{`>V5qp13?XuH~C3hvlcTWlMv@Xm$(Wto9oHuys#J<NfSI(`M
zX?KeX-{aoBed5;(9@!t`_85JgJY^RHS7g+Fi8Iy9u3cd2bPf8>AJ0?Ae<9&-+Oj!z
zGKQwR)+gR`3VgX{)%r!#jAtkuUa~|$>u>tYIi3+tJ@$F*JW+m1cK6*&X7AtP`*McA
oe0K<o$Mi{$7+&_4GqN#w)K@N=E?%q+%&-ie?5=(;>zopr0FIq=tpET3

diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 04100f2..12310ff 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/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
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index c959abe..dd59bdc 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/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
 };