diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index b252a17..a3e5dd6 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -148,217 +148,15 @@
 			type: Boolean,
 			required: true,
 		},
-		propsmove: {
-			type: Number
-		},
-		isMain: {
-			type: Boolean
-		}
+
 	});
-	const movetype = ref(-1);
-	// 监听 isMain 的变化，但只在 isShow 为 true 时响应
-	watch(
-		() => props.isMain,
-		(newVal, oldVal) => {
-			// 如果不是从一个明确的布尔值变到另一个（例如首次 undefined -> 布尔），可以按需忽略
-			if (typeof oldVal !== 'boolean') return
-			// 仅在 isShow 为 true 时生效
-			if (!props.isShow) return
-
-			if (lanjie.value) {
-				lanjie.value = false
-				// console.log("！！！！！！！", movetype.value,
-				// 	zeroIndex.value,
-				// 	typeNow.value)
-				return
-			}
-
-			if (oldVal === true && newVal === false) {
-				movetype.value = 0;
-				zeroIndex.value = 0;
-				typeNow.value = zeroIndex.value;
-				// console.log("isActive?")
-			} else if (oldVal === false && newVal === true) {
-				movetype.value = -1
-				zeroIndex.value = -1
-				typeNow.value = 0
-				console.log("?????")
-			}
-		}
-	)
-	const zeroIndex = ref(-1)
-	const emit = defineEmits(['back', 'cleanmain'])
-	const savetopindex = ref(0)
-	watch(
-		() => props.propsmove,
-		() => {
-			if (movetype.value != -1) {
-				switch (movetype.value) {
-					case 0:
-						switch (props.propsmove) {
-							case 0:
-								movetype.value = -1
-								zeroIndex.value = -1
-
-								emit("back")
-
-								break;
-							case 1:
-
-								if (zeroIndex.value < typeArray.value.length - 1) {
-									zeroIndex.value++
-									typeNow.value = zeroIndex.value;
-								}
-
-								break;
-							case 2:
-								savetopindex.value = zeroIndex.value;
-								movetype.value = 1
-								zeroIndex.value = 0
-								break;
-
-							case 3:
-								if (zeroIndex.value) {
-									zeroIndex.value--
-									typeNow.value = zeroIndex.value;
-								} else {
-									movetype.value = -1
-									zeroIndex.value = -1
-									emit("back")
-								}
-
-								break;
-							case 4:
-								typeNow.value = zeroIndex.value;
-
-								break;
-							default:
-						}
 
 
-						break;
-					case 1:
-
-						switch (props.propsmove) {
-							case 0:
-								if (zeroIndex.value) {
-									zeroIndex.value--
-								} else {
-									movetype.value = 0
-									// zeroIndex.value = 0
-									// typeNow.value = zeroIndex.value;
-									zeroIndex.value = savetopindex.value
-									typeNow.value = savetopindex.value;
-								}
-
-								break;
-							case 1:
-								zeroIndex.value = 0
-								movetype.value = 2
-
-								break;
-							case 2:
-								if (zeroIndex.value < 2) {
-									zeroIndex.value++
-								} else {
-									zeroIndex.value = 0
-									movetype.value = 3
-								}
-								break;
-
-							case 3:
-
-								movetype.value = -1
-								zeroIndex.value = -1
-								emit("back")
-
-								break;
-							default:
-						}
-						break;
-					case 2:
-
-						switch (props.propsmove) {
-							case 0:
-								if (zeroIndex.value) {
-									zeroIndex.value--
-								} else {
-									movetype.value = 0
-									// zeroIndex.value = 0
-									// typeNow.value = zeroIndex.value;
-									zeroIndex.value = savetopindex.value
-									typeNow.value = savetopindex.value;
-								}
-
-								break;
-							case 1:
-								zeroIndex.value = 0
-								movetype.value = 3
-
-								break;
-							case 2:
-								if (zeroIndex.value < 2) {
-									zeroIndex.value++
-								} else {
-									zeroIndex.value = 0
-									movetype.value = 3
-								}
-								break;
-
-							case 3:
-								zeroIndex.value = 0
-								movetype.value = 1
-
-								break;
-							default:
-						}
-						break;
-					case 3:
-
-						switch (props.propsmove) {
-							case 0:
-								zeroIndex.value = 0
-								movetype.value = 1
-
-								break;
-							case 1:
-
-								if (zeroIndex.value === 0) {
-									zeroIndex.value++
-								} else {
-									zeroIndex.value = 2
-									movetype.value = 2
-								}
-								break;
-							case 2:
-
-								break;
-
-							case 3:
-								if (zeroIndex.value === 1) {
-									zeroIndex.value--
-								} else {
-									zeroIndex.value = 2
-									movetype.value = 1
-								}
-
-								break;
-							default:
-						}
-						break;
-					default:
-				}
-			}
-
-		}
-	)
 	const typeNow = ref(-1);
 	const photoplay = ref(false)
 	const downArray = ref()
 	const scrollTop = ref(0);
-	const ceshi = () => {
-		console.log("ceshi")
-	}
+
 	function onScroll(e) {
 		// e.detail.scrollTop 就是当前滚动距离
 		scrollTop.value = e.detail.scrollTop
@@ -385,18 +183,6 @@
 			url: "/static/index/newindex/rightmenu/2.png",
 			name: '协助执行'
 		},
-		// {
-		// 	url: "/static/index/newindex/rightmenu/0.png",
-		// 	name: '重点追踪'
-		// },
-		// {
-		// 	url: "/static/index/newindex/rightmenu/1.png",
-		// 	name: '转单执行'
-		// },
-		// {
-		// 	url: "/static/index/newindex/rightmenu/2.png",
-		// 	name: '协助执行'
-		// },
 	])
 	const downStates = ref([
 		{
@@ -456,79 +242,7 @@
 		...basesmall,
 		...[...basesmall].reverse()   // 先拷贝一份再反转，避免修改原 base
 	])
-	const typeArray = ref([
-		{
-			url: genPaths(
-				'/static/index/newindex/huli',
-				'care',
-				8,    // 张数
-				'png',
-				0,     // 起始索引为 1
-				false  // 不补零
-			), name: '护理类'
-		},
-		{
 
-			url: genPaths(
-				'/static/index/newindex/yiliao',
-				'health_',
-				8,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			), name: '医疗类'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newindex/kufang',
-				'storeroom_',
-				11,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			), name: '库房类'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newindex/baojie',
-				'clean_',
-				12,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			), name: '保洁类'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newindex/xiaoxi',
-				'wash_',
-				14,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			), name: '消洗类'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newindex/kangfu',
-				'recovery_',
-				6,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			), name: '康复类'
-
-		},
-
-	])
 
 	// 使用watch监听isShow变化
 	const transition = ref(false);
@@ -586,13 +300,13 @@
 		photoplay.value = true;
 	})
 	const lanjie = ref(false);
-	const clean = () => {
-		if (movetype.value == -1) {
-			lanjie.value = true;
-			emit("cleanmain")
-		}
+	// const clean = () => {
+	// 	if (movetype.value == -1) {
+	// 		lanjie.value = true;
+	// 		emit("cleanmain")
+	// 	}
 
-	}
+	// }
 </script>
 
 <style scoped lang="less">
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index d9517a0..0816598 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -50,8 +50,7 @@
 			</view>
 		</view> -->
 		<!-- 主页 -->
-		<index :isShow="menuIndexshow" v-if="!menuIndex" :propsmove="propsmove" :isMain="isMain" @back="movecard(5)"
-			@cleanmain="movecard(1)" />
+		<index :isShow="menuIndexshow" v-if="!menuIndex" />
 		<!-- 设备页 -->
 		<equipment :isShow="menuIndexshowfifth" v-if="menuIndex==4" :propsmove="propsmove" :isMain="isMain"
 			@back="movecard(5)" @cleanmain="movecard(1)" @canback="canmoveit" />
diff --git a/pages/login/animationpage.vue b/pages/login/animationpage.vue
index 0fcd6ca..d6e9a50 100644
--- a/pages/login/animationpage.vue
+++ b/pages/login/animationpage.vue
@@ -1,6 +1,6 @@
 <!-- 动画页 -->
 <template>
-	<view>
+	<view @click="morerule=false" >
 		<view class="home">
 			<image class="all-home" src="/static/index/warehouse/newhome/backpage.jpg" mode="aspectFit"></image>
 		</view>
@@ -34,16 +34,45 @@
 			</view>
 			<image class="blue-imge" src="/static/index/warehouse/home/z.png" mode=""></image>
 		</view>
-		<view class="juzhen tp" @click="housactive(6)">
+		<view class="juzhen tp" @click.stop="morerule=true">
 			<donghua width="17vw" height="17vw" :interval="300" :links="juzhenarray" :playing="playall" :loop="true" />
 		</view>
-		<view class="juzhentag tp" @click="housactive(6)">
+		<view class="juzhentag tp" @click.stop="morerule= true">
 			<view class="blue-bgc" style="background: #7BC2FF;width: 7vw;">
-				设置
+				指令矩阵
 				<view class="triangle-middle" style="border-top: 0.5vw solid #7BC2FF"></view>
 			</view>
 			<image class="blue-imge" src="/static/index/warehouse/home/z.png" mode=""></image>
 		</view>
+		<view class="openmore" v-show="morerule" @click.stop>
+			<div class="triangle-left"></div>
+			<view class="openmore-title">
+				指令矩阵
+			</view>
+			<view class="openmore-gray">
+				一体化行政调度，驱动高效运营，智能统筹护理资源，提升照护效率。
+			</view>
+			<view class="openmore-button">
+				<view class="one-button">
+					<image class="small-imge" src="/static/index/warehouse/t1.png" mode=""></image>
+					护理矩阵
+				</view>
+				<view class="one-button">
+					<image class="small-imge" src="/static/index/warehouse/t2.png" mode=""></image>
+					医疗矩阵 
+				</view>
+			</view>
+			<view class="openmore-button">
+				<view class="one-button">
+					<image class="small-imge" src="/static/index/warehouse/t3.png" mode=""></image>
+					行政矩阵
+				</view>
+				<view class="one-button">
+					<image class="small-imge" src="/static/index/warehouse/t4.png" mode=""></image>
+					请领矩阵
+				</view>
+			</view>
+		</view>
 		<view class="exittag tp" @click="exitshow=true">
 			<view class="blue-bgc" style="background: #7BC2FF;width: 7vw;">
 				退出
@@ -93,7 +122,14 @@
 		</view>
 		<view class="leadtag tp" @click="housactive(8)">
 			<view class="gray-bgc">
-				配务室
+				长者标签
+				<view class="triangle-left"></view>
+				<view class="triangle-left-bgc"></view>
+			</view>
+		</view>
+		<view class="settingtag tp" @click="housactive(6)">
+			<view class="gray-bgc">
+				设置
 				<view class="triangle-left"></view>
 				<view class="triangle-left-bgc"></view>
 			</view>
@@ -103,7 +139,7 @@
 		</view>
 		<view class="returntag tp" @click="housactive(7)">
 			<view class="gray-bgc">
-				办公室
+				行政办公室
 				<view class="triangle-left"></view>
 				<view class="triangle-left-bgc"></view>
 			</view>
@@ -142,6 +178,7 @@
 	const zyupgrade = ref(null);
 	const leftMenuArray = ref([])
 	const exitshow = ref(false);
+	const morerule = ref(false)
 	// 生命周期钩子
 	onShow(() => {
 		zyupgrade.value?.check_update();
@@ -235,14 +272,15 @@
 	const navurl = ref('')
 	const housactive = (index : number) => {
 
-		let data = filteredMenu(0)[0]
-		uni.setStorageSync('nuId', data.nuId);
-		uni.setStorageSync('nuName', data.nuName);
-		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
-		uni.setStorageSync('NUall', data);
+		
 
 		housedex.value = index;
 		if (index == 0) {
+			let data = filteredMenu(0)[0]
+			uni.setStorageSync('nuId', data.nuId);
+			uni.setStorageSync('nuName', data.nuName);
+			uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
+			uni.setStorageSync('NUall', data);
 			uni.navigateTo({
 				url: '/pages/NursingNew/index'
 			})
@@ -267,6 +305,11 @@
 		// 	})
 		// }
 		if (index == 4) {
+			let data = filteredMenu(2)[0]
+			uni.setStorageSync('nuId', data.nuId);
+			uni.setStorageSync('nuName', data.nuName);
+			uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
+			uni.setStorageSync('NUall', data);
 			uni.navigateTo({
 				url: '/pages/Warehouse/warehome',
 			})
@@ -551,12 +594,13 @@
 		left: 19vw;
 		z-index: 50;
 	}
+
 	.exittag {
 		position: fixed;
 		top: 6vw;
 		right: 10.5vw;
 		z-index: 51;
-		
+
 		.blue-imge {
 			position: absolute;
 			top: 2.2vw;
@@ -566,6 +610,7 @@
 			height: 5vw;
 		}
 	}
+
 	.juzhentag {
 		position: fixed;
 		top: 20vw;
@@ -735,6 +780,13 @@
 		z-index: 51;
 	}
 
+	.settingtag {
+		position: fixed;
+		top: 52vw;
+		right: 15vw;
+		z-index: 51;
+	}
+
 	.right-title {
 		position: fixed;
 		right: 2vw;
@@ -756,4 +808,56 @@
 
 		}
 	}
+
+	.openmore {
+		position: fixed;
+		top: 30vh;
+		left: 33.5vw;
+		width: 22vw;
+		height: 22.5vh;
+		background-color: #fff;
+		z-index: 53;
+		border-radius: 0.5vw;
+		box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+		padding: 1.5vw 2vw;
+		.openmore-title{
+			font-size: 1.5vw;
+			font-weight: 600;
+		}
+		.openmore-gray{
+			font-size: 1vw;
+			color: #999;
+			margin-top: 0.5vw;
+		}
+		.triangle-left {
+			position: absolute;
+			left: -1vw;
+			top: 3vh;
+			width: 0;
+			height: 0;
+			border-top: 1vw solid transparent;
+			border-bottom: 1vw solid transparent;
+			border-right: 1.2vw solid #fff;
+		}
+		.openmore-button{
+			display: flex;
+			margin-top: 1.5vw;
+			width: 100%;
+			// height: 3vw;
+			// background-color: red;
+			.one-button{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 1vw;
+				width: 10vw;
+				font-size: 1.2vw;
+				.small-imge{
+					width: 1.5vw;
+					height: 1.5vw;
+					margin-right: 0.4vw;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/static/index/warehouse/t1.png b/static/index/warehouse/t1.png
new file mode 100644
index 0000000..ab70cc3
Binary files /dev/null and b/static/index/warehouse/t1.png differ
diff --git a/static/index/warehouse/t2.png b/static/index/warehouse/t2.png
new file mode 100644
index 0000000..0e41cbd
Binary files /dev/null and b/static/index/warehouse/t2.png differ
diff --git a/static/index/warehouse/t3.png b/static/index/warehouse/t3.png
new file mode 100644
index 0000000..32eb312
Binary files /dev/null and b/static/index/warehouse/t3.png differ
diff --git a/static/index/warehouse/t4.png b/static/index/warehouse/t4.png
new file mode 100644
index 0000000..3df8b67
Binary files /dev/null and b/static/index/warehouse/t4.png differ