diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index c3b5c8f..a7069d0 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -109,9 +109,10 @@
 					<scroll-view class="scrol" scroll-y="true">
 						<view v-for="(v,i) in fwzlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
 							<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
-							<text style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName}}</text>
+							<text style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName?.substring(0,4)}}</text>
+							<view>{{v.directiveName?.substring(4,12)}}</view>
 						</view>
-						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="fwzlarr.length==0">
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="fwzlarr?.length==0||!fwzlarr">
 							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
 							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
 								暂无服务指令
@@ -347,7 +348,7 @@
 					<view class="">
 						<view class="first-line">
 							<view style="font-size: 1.2vw;">
-								{{ item.nuName }}
+								{{ item.nuName.length>6?item.nuName.substring(0,6)+'.':item.nuName }}
 							</view>
 							<view class="first-line-second">
 								{{ item.elderInfo?.name?`入住`:`空闲` }}
@@ -988,13 +989,13 @@
 	const shtab = (e)=>{
 		fwzlindex.value = e;
 		if(e==0){
-			fwzlarr.value = zlarr.value.care
+			fwzlarr.value = zlarr.value?.care
 		}
 		if(e==1){
 			fwzlarr.value = [];
 		}
 		if(e==2){
-			fwzlarr.value = zlarr.value.logistics
+			fwzlarr.value = zlarr.value?.logistics
 		}
 	}
 	const zldex = (e) =>{
@@ -2256,6 +2257,13 @@
 					color: #333333;
 					width: 100%;
 				}
+				view{
+					text-align: center;
+					font-weight: 400;
+					font-size: 0.7vw;
+					color: #555;
+					width: 100%;
+				}
 			}
 			.act{
 				background: #F2F8FF;
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 6eb9c2b..f8fe72d 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -574,17 +574,15 @@
 		pageNo: 1,
 		pageSize: 10,
 		employeeId:uni.getStorageSync('userInfo').employessId, 
-		nuId:uni.getStorageSync('nuId')
-		
+		nuId:uni.getStorageSync('nuId'),
+		workType:5
 	})
 	const plsbuy = ref([])
 	const firstgetqueryCgdList = (nuId) => {
 		form.nuId = nuId;
 		queryOrderList(form).then(res => {
-			console.log(res)
 			if(res.result.records.length>0){
 				indexmessage.value = res.result.records[0];
-				// clickLeftMenu(0,res.result.records[0])
 			}else{
 				indexmessage.value = {};
 			}
@@ -838,7 +836,6 @@
 			nuId:nuId 
 		}
 		queryCountByType(data).then(res=>{
-			console.log(res)
 			hldyobj.value = res.result
 		})
 	}
@@ -848,7 +845,7 @@
 	const zlfunc = (nuId)=>{
 		let data = {
 			nuId:nuId,
-			elderId:elderId
+			// elderId:elderId
 		}
 		queryAll(data).then(res=>{
 			console.log(res)
@@ -1030,7 +1027,8 @@
 			leftMenuArray.value = res.result.records;
 			// console.log(leftMenuArray.value)
 			filteredMenu(2).forEach((element : any, index : number) => {
-				if (element.nuId === uni.getStorageSync('NUall').nuId) {
+				// console.log(element.nuId , uni.getStorageSync('NUall').nuId,filteredMenu(2))
+				if (element.nuId == uni.getStorageSync('NUall').nuId) {
 					menutarget.value = index;
 					clickmenu(index)
 				}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 22e7103..b1d5f1b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -51,7 +51,7 @@
 			<view class="gray-box-bgc">
 				<scroll-view style="width: 100%;height: 100%;" scroll-y :show-scrollbar="true">
 					<view style="margin-bottom: 10rpx;">
-						1、服务条款与隐私政策确认：登录即表示您已阅读并同意《NU 护理单元用户服务协议》及《NU 护理单元隐私信息保护政策》，其中包含对您权利义务、个人信息处理的详细说明。
+						1、服务条款与隐私政策确认：登录即表示您已阅读并同意《护理单元用户服务协议》及《护理单元隐私信息保护政策》，其中包含对您权利义务、个人信息处理的详细说明。
 					</view>
 					<view style="margin-bottom: 10rpx;">
 						2、账号使用规范：账号仅限本人使用，禁止恶意注册、转借或泄露。请妥善保管账号密码，因保管不善导致的账号安全问题，由您自行承担责任。
diff --git a/pages/watch/settings/menusettings.vue b/pages/watch/settings/menusettings.vue
index a1c7515..bc5dd55 100644
--- a/pages/watch/settings/menusettings.vue
+++ b/pages/watch/settings/menusettings.vue
@@ -59,8 +59,8 @@
 			<view class="box-any" @touchmove.prevent>
 				<view class="title-left">
 					<!-- <image class="back-img" src="/static/left.png" @click="openany=false"></image> -->
-					<view v-if="!opentype" class="back-font">NU护理单元隐私信息保护政策</view>
-					<view v-if="opentype" class="back-font">NU护理单元用户服务协议</view>
+					<view v-if="!opentype" class="back-font">护理单元隐私信息保护政策</view>
+					<view v-if="opentype" class="back-font">护理单元用户服务协议</view>
 				</view>
 				<twoseven v-if="!opentype" />
 				<oneseven v-if="opentype" />
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index 7778d3f..04b9580 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -73,8 +73,8 @@
 			<view class="box-any" @touchmove.prevent>
 				<view class="title-left">
 					<!-- <image class="back-img" src="/static/left.png" @click="openany=false"></image> -->
-					<view v-if="!opentype" class="back-font">NU护理单元隐私信息保护政策</view>
-					<view v-if="opentype" class="back-font">NU护理单元用户服务协议</view>
+					<view v-if="!opentype" class="back-font">护理单元隐私信息保护政策</view>
+					<view v-if="opentype" class="back-font">护理单元用户服务协议</view>
 				</view>
 				<twoseven v-if="!opentype" />
 				<oneseven v-if="opentype" />