From 3afb825ac54c7ce911e9a692e57b12c092995d68 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 6 Jan 2026 14:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/doctorask/doctorask.vue         |  5 +++-
 pages/NursingNew/component/index.vue          | 24 +++++++++----------
 pages/NursingNew/index.vue                    | 13 +++++-----
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue
index 7e920ee..223323d 100644
--- a/pages/NursingNew/component/doctorask/doctorask.vue
+++ b/pages/NursingNew/component/doctorask/doctorask.vue
@@ -183,6 +183,9 @@
 			</view>
 		</view>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
+		<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top:-5vw;height: 110vh;" v-if="status=='nomore'&&plsbuy.length==0">
+			<defaultr cont="暂无数据" style="z-index: 999;margin: auto;top: 0;left:35vw;bottom: 0;right: 0;"></defaultr>
+		</view>
 	</view>
 </template>
 <script setup lang="ts">
@@ -217,7 +220,7 @@
 	}
 	const firstgetqueryCgdList = () => {
 		queryCareList(form).then(res => {
-			console.log(form)
+			console.log(res)
 			plsbuy.value.push(...res.result.records);
 			status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
 			if(form.pageNo==1){
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 9986af4..0a81b89 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -762,12 +762,12 @@
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
 			if (!oldVal && newVal) {
 				console.log(oldVal && newVal)
-				transition.value = false;
-				// console.log("????",transition.value)
-				setTimeout(() => {
-					transition.value = true;
-					// console.log("看看", uni.getStorageSync('NUall'))
-				}, 50)
+				// transition.value = false;
+				// // console.log("????",transition.value)
+				// setTimeout(() => {
+				// 	transition.value = true;
+				// 	// console.log("看看", uni.getStorageSync('NUall'))
+				// }, 50)
 			} else {
 				transition.value = false;
 			}
@@ -802,6 +802,10 @@
 		fullDate.value = `${year}.${month}.${day}`;
 	};
 	onMounted(() => {
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
 		name.value = uni.getStorageSync('realname')
 		typeNow.value = 0;
 		timerId = updateTime();
@@ -809,12 +813,6 @@
 		setInterval(updateTime, 1000);
 		photoplay.value = true;
 		getmenu();
-		transition.value = false;
-		// console.log("????",transition.value)
-		setTimeout(() => {
-			transition.value = true;
-			// console.log("看看", uni.getStorageSync('NUall'))
-		}, 50)
 	})
 	 
 	const filteredMenu = (index : number) => {
@@ -1008,7 +1006,7 @@
 	.index-content-other {
 		width: 65vw;
 		height: 100%;
-		transition: opacity 1s ease;
+		transition: opacity 0.4s ease;
 		position: relative;
 
 		.abs-time {
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index b80620f..9fc557a 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -3,7 +3,7 @@
 		<!-- 左侧菜单 -->
 		<leftcontent :list="arrlist" @navurl="navurl"></leftcontent>
 		<!-- 主页 -->
-		<index :isShow="menuIndex==0" v-if="menuIndex==0" @swip="swip"/>
+		<index :isShow="menuIndex==0" v-if="swipedex==0" @swip="swip"/>
 		<!-- 户嘱页 -->
 		<nurse :isshow="menuIndex==1" v-if="swipedex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
 		<!-- 医嘱 -->
@@ -39,8 +39,9 @@
 
 	const listarr = ref([]);
 	onMounted(() => {
-		menuIndex.value = -1;
-		nextTick(() => menuIndex.value = 0)
+		menuIndex.value = 0;
+		swipedex.value = 0;
+		nextTick(() => swipedex.value = 0)
 
 		getServiceTree().then((res : any) => {
 			//缓存护嘱菜单
@@ -65,8 +66,8 @@
 		})
 	}
 	const tabbrarr = ref([
-		{ name: '护嘱', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'hldy_hljz'},
-		{ name: '护理', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'hldy_yljz'},
+		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'hldy_hljz'},
+		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'hldy_yljz'},
 		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_xzjz'},
 		{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_ql'},
 	])
@@ -90,7 +91,7 @@
 			case 'hldy_yljz':
 			swipedex.value = 2;
 			setTimeout(()=>{
-				menuIndex.value = 3;
+				menuIndex.value = 2;
 			},100)
 			console.log('医疗矩阵')
 				break;