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

pages/Warehouse/warehome.vue

@@ -17,12 +17,12 @@
 		</view>
 		<view class="clikurlbox">
 			<view class="tp" :class="'itemact'+(index+1)" v-for="(item,index) in animArray" :key='index'
-				@click.stop="housactive(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 ['采购','盘点','拣货','请领出库','退货入库','监控室']">
+			<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>
@@ -42,17 +42,18 @@
 	 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 == 0) {
+	 		if (index == 1) {
-	 		// 	navurl.value = 'pages/Warehouse/paymoney'
+	 			navurl.value = 'pages/Warehouse/paymoney'
-	 		// 	uni.navigateTo({
+	 			uni.navigateTo({
-	 		// 		url: '/' + navurl.value
+	 				url: '/' + navurl.value
-	 		// 	})
+	 			})
-	 		// }
+	 		}
 	 		if (index == 0) {
 	 			navurl.value = 'pages/procurement/material'
 	 			uni.navigateTo({
@@ -71,13 +72,18 @@
 	 				url: "/pages/watch/full"
 	 			})
 	 		}
-	 		if (index == 6) {
+			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 == 7) {
+	 		if (index == 8) {
 	 			navurl.value = 'pages/procurement/outbound?code=1'
 	 			uni.navigateTo({
 	 				url: '/' + navurl.value
@@ -88,12 +94,6 @@
 	 	} else {
 	 		setout.value = setTimeout(() => {
 	 			// console.log("点击哪个了", index)
-	 			if (index === 5) {
-	 				uni.navigateTo({
-	 					url: "/pages/watch/full"
-	 				})
-	 			}
-	 
 	 		}, DOUBLE_TAP_DELAY)
 	 		// 记录本次时间，等待下次点击
 	 		lastTap.value = now
@@ -171,6 +171,18 @@
 			width: '14.3vw',
 			height: '13vw'
 		},
+		{
+			url: genPaths(
+				'/static/index/warehouse/home',
+				'unit11-',
+				5,    // 张数
+				'png',
+				0,     // 起始索引为 1
+				false  // 不补零
+			),
+			width: '14.3vw',
+			height: '13vw'
+		},
 		])
 </script>
 
@@ -220,6 +232,13 @@
 			right: 21vw;
 			z-index: 65;
 		}
+		.itemact6 {
+			width: 18.2vw;
+			height: 12vw;
+			top: 8vw;
+			left: 12vw;
+			z-index: 65;
+		}
 		view{
 			position: fixed;
 			z-index: 10;
@@ -240,6 +259,7 @@
 			align-items: center;
 			padding: 0 1vw;
 			white-space: nowrap;
+			z-index: 70;
 			&:nth-child(1){
 				top: 38vw;
 				left: 19.5vw;