diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 9298fb0..a9ed0ae 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -291,6 +291,7 @@
 									<image :src="v.netPic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
 								</view>
+								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="emotionTagList.length==0" style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
 							</view>
 						</view>
 						<view class="carfd" v-if="zzbqshow">
@@ -303,6 +304,7 @@
 									<image :src="v.netPic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
 								</view>
+								<image src="/static/index/card/zanw.png" mode="aspectFill" v-if="bodyTagList.length==0" style="width: 5.4vw;height: 5.4vw;margin-top: -0.7vw;"></image>
 							</view>
 						</view>
 					</view>
@@ -489,19 +491,30 @@
 		pageSize: 10,
 		employeeId:uni.getStorageSync('userInfo').employessId, 
 		nuId:uni.getStorageSync('nuId')
+		
 	})
 	const plsbuy = ref([])
-	const firstgetqueryCgdList = () => {
+	const firstgetqueryCgdList = (nuId) => {
+		form.nuId = nuId;
+		console.log(form)
 		queryOrderList(form).then(res => {
-			plsbuy.value.push(...res.result.records);
-			if(form.pageNo==1){
-				clickLeftMenu(0,plsbuy.value[0])
+			console.log(res)
+			// plsbuy.value.push(...res.result.records);
+			if(res.result.records.length>0){
+				clickLeftMenu(0,res.result.records[0])
+			}else{
+				indexmessage.value = [];
 			}
 		})
 	}
 	const clickLeftMenu = (index : any, item : object) => {
 		queryOrderInfoList({ mainId: item.id }).then(res => {
-			indexmessage.value = res.result[0]
+			console.log(res)
+			if(res.result.length>0){
+				indexmessage.value = res.result[0]
+			}else{
+				indexmessage.value = [];
+			}
 		})
 	}
 	const open = ref(0)
@@ -710,7 +723,8 @@
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
-		getgif();
+		console.log(data.nuId)
+		firstgetqueryCgdList(data.nuId);
 		emit('swip')
 	}
 
@@ -742,15 +756,17 @@
 		})
 	}
 	const end = (v)=>{
-		if(v.izStart!='Y'&& v.izFinish!='N'){return}
-		endOrder({id:v.directiveId}).then(res=>{
+		console.log(v)
+		if(v.izStart=='Y'&& v.izFinish=='N'){
+			endOrder({id:v.id}).then(res=>{
+				console.log(res)
 			if(res.success){
-				v.izStart = "N";
-				v.izFinish = "Y";
+				firstgetqueryCgdList(uni.getStorageSync('nuId'))
 			}else{
 				
 			}
-		})
+		})}
+		
 	}
 	// 通用的生成函数
 	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
@@ -886,12 +902,12 @@
 			employeeId: uni.getStorageSync('userInfo').employessId,
 			workType: 5
 		}
-		// console.log("看看图",data)
-		queryWorkOrderList(data).then((res : any) => {
-			// console.log("看看图",res)
-			indexmessage.value = res.result.records[0]; 
-			// console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
-		})
+		console.log("看看图",data)
+		// queryWorkOrderList(data).then((res : any) => {
+		// 	console.log("看看图",res)
+		// 	indexmessage.value = res.result.records[0]; 
+		// 	console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
+		// })
 	}
 	const lanjie = ref(false);
 	const gotolook = () => {
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index db4bab5..b745d12 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -15,7 +15,7 @@
 			</scroll-view>
 			<view class="logo">
 				<view class="tp">
-					<image src="/static/shouye/xd.png" mode="aspectFill"></image>
+					<image :src="userInfo.avatar?serverUrl+'/sys/common/static/'+userInfo.avatar:'/static/shouye/xd.png'" mode="aspectFill"></image>
 				</view>
 				<text>{{uni.getStorageSync('realname')}}</text>
 			</view>
@@ -33,6 +33,8 @@
 			type:String
 		}
 	});
+	const serverUrl = ref(uni.getStorageSync('serverUrl'))
+	const userInfo = uni.getStorageSync('userInfo');
 	const emit = defineEmits(['navurl'])
 	const dexleft = ref(0);
 	
@@ -129,6 +131,7 @@
 	.tp image{
 		width: 100%;
 		height: 100%;
+		border-radius: 50%;
 	}
 	.guodu {
 		transition: .4s;
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index b4f1793..ec6bffe 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -26,7 +26,7 @@
 				</view>
 			</view>
 
-			<view class="title-card-right">
+			<view class="title-card-right"  @click="jszlshow = true">
 				<view class="card-top">
 					<view class="card-top-left">
 						65
@@ -42,7 +42,36 @@
 						即时
 					</view>
 				</view>
+				<view class="bianj" v-if="jszlshow">
+					<image src="/static/index/card/bj.png" mode="aspectFill"></image>
+				</view>
+				<view class="jszl guodu" @click.stop  :class="jszlshow?'':'jsh0'" >
+					<view class="tittop">
+						<view></view>
+						即时服务指令
+					</view>
+					<view class="spiw">
+						<view v-for="(v,i) in ['库房']" :key="i" :class="i==0?'act':''">{{v}}</view> 
+					</view>
+					<scroll-view class="scrol" scroll-y="true">
+						<view v-for="(v,i) in 1" :key='i' :class="i==2?'act':''" class="cdk">
+							<image src="/static/qr.png" mode="aspectFill"></image>
+							<text>{{v}}</text>
+						</view>
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;">
+							<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;">
+								暂无服务指令
+							</view>
+						</view>
+					</scroll-view>
+					<view class="submit" >
+						<view @click.stop="jszlshow = false">取消</view>
+						<view @click="subitshowing">确定</view>
+					</view>
+				</view>
 			</view>
+			<view class="mengban" v-if="jszlshow" @click="jszlshow = false"></view>
 		</view>
 		<view class="photo-father">
 			<!--  :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}" -->
@@ -248,7 +277,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
-
+	const jszlshow = ref(false)
 	const props = defineProps({
 		isShow: {
 			type: Boolean,
@@ -718,6 +747,7 @@
 		padding: 1.6vw;
 		margin-right: 1.5vw;
 		border: 2rpx solid #D2DFF0;
+		z-index: 99;
 	}
 	.pao-father {
 		position: absolute;
@@ -911,7 +941,6 @@
 			display: flex;
 			justify-content: space-between;
 			position: relative;
-
 			.card-top-left {
 				font-size: 1.8vw;
 				font-weight: 600;
@@ -1161,4 +1190,163 @@
 		height: 500rpx;
 		z-index: 10;
 	}
+	
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+	.jsh0{
+		height: 0vw !important;
+		padding: 0 2vw !important;
+		top: 9.4vw !important;
+	}
+	.jszl{
+		width: 64.5vw;
+		height: 44vw;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136,148,167,0.19);
+		border-radius: 2.2vw;
+		position: absolute;
+		top: 11vw;
+		right: 0;
+		z-index: 200;
+		padding: 2vw;
+		overflow: hidden;
+		.submit{
+			width: 100%;
+			height: 3.2vw;
+			margin-top: 0.4vw;
+			padding-right: 2vw;
+			display: flex;
+			justify-content: flex-end;
+			view{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				&:nth-child(1){
+					width: 7.1vw;
+					height: 3.2vw;
+					background: #F8F8F8;
+					border-radius: 1.6vw;
+					border: 1px solid #E5E5E5;
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #555555;
+				}
+				&:nth-child(2){
+					width: 7.1vw;
+					height: 3.2vw;
+					background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+					border-radius: 1.6vw;
+					border: 1px solid rgba(3,133,250,0.34);
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #1083F8;
+					margin-left: 0.7vw;
+				}
+			}
+		}
+		.scrol{
+			width: 110%;
+			height: 30vw;
+			display: flex;
+			flex-wrap: wrap;
+			
+			.cdk{
+				width: 6.1vw;
+				height: 6.1vw;
+				background: #F8F8F8;
+				border-radius: 1.6vw;
+				margin: 1.5vw 1.5vw 0 0vw;
+				display: inline-block;
+				border: 1px solid #F8F8F8;
+				text-align: center;
+				image{
+					width: 2vw;
+					height: 2vw;
+					margin: 1.4vw auto 0vw;
+				}
+				text{
+					display: block;
+					text-align: center;
+					font-weight: 400;
+					font-size: 1.1vw;
+					color: #333333;
+					width: 100%;
+				}
+			}
+			.act{
+				background: #F2F8FF;
+				border: 1px solid rgba(1,125,233,0.43);
+				text{
+					color: #017DE9;
+				}
+			}
+		}
+		.spiw{
+			width: 14vw;
+			height: 2vw;
+			display: flex;
+			margin-top: 2.5vw;
+			padding-left: 1.5vw;
+			view{
+				font-weight: 400;
+				font-size: 1.3vw;
+				color: #555555;
+				position: relative;
+				line-height: 1.5vw;
+			}
+			.act{
+				color: #222222 !important;
+				font-weight: 500;
+			}
+			.act::after{
+				width: 50%;
+				height: 0.2vw;
+				background: #0089FE;
+				border-radius: 0.1vw;
+				content: '';
+				position: absolute;
+				bottom: 0;
+				left: 25%;
+			}
+		}
+		.tittop{
+			height: 2vw;
+			font-weight: 400;
+			font-size: 1.4vw;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			view{
+				width: 0.4vw;
+				height: 1.2vw;
+				background: #017DE9;
+				border-radius: 0.2vw;
+				margin-right: 0.8vw;
+			}
+		}
+	}
+	.bianj{
+		position: absolute;
+		width: 2.2vw;
+		height: 1.1vw;
+		top: 9.68vw;
+		right: 2.5vw;
+		z-index: 220;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.mengban {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+		background: RGBA(239, 240, 244, 0.55);
+	}
 </style>
\ No newline at end of file
diff --git a/pages/watch/settings/api.js b/pages/watch/settings/api.js
index a9094d2..7c82f37 100644
--- a/pages/watch/settings/api.js
+++ b/pages/watch/settings/api.js
@@ -23,4 +23,12 @@ export const updateBaseInfo = (params) => {
 		method: 'post',
 		data: params,
 	})
-}
\ No newline at end of file
+}
+// 改头像
+export const userEdit = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/sys/user/login/setting/userEdit`,
+		method: 'post',
+		data: params,
+	})
+}
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index 07feb7a..512cf03 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -30,6 +30,17 @@
 					<image class="right-icon" :src="`/static/index/settings/00.png`" />
 				</view>
 			</view>
+			<view  class="item" @click="jumpToTarget(8)">
+				<view class="left-item">
+					<image class="left-icon" :src="`/static/index/settings/6.png`" />
+					<view class="left-font">
+						修改头像
+					</view>
+				</view>
+				<view class="right-item">
+					<image class="right-icon" :src="`/static/index/settings/00.png`" />
+				</view>
+			</view>
 		</view>
 		<view class="array-father">
 			<view v-for="(item,index) in iconsArray.slice(5,8)" :key="index" class="item"
@@ -69,7 +80,17 @@
 				<oneseven v-if="opentype" />
 			</view>
 		</view>
-
+		
+		<view class="avator guodu" :style="avator?'opacity: 1':'opacity: 0;z-index: -1'">
+			<text>点击头像更换</text>
+			<view class="avatorimg" @click="uplod" >
+				<image :src="userInfo.avatar?(userInfo.flag?userInfo.avatar : serverUrl+'/sys/common/static/'+userInfo.avatar):'/static/shouye/xd.png'" mode="aspectFill"></image>
+			</view>
+			<view class="butft" @click="sxdupld(userInfo.avatar)" v-if="userInfo?.flag">
+				确定
+			</view>
+		</view>
+		<view class="mengban" v-if="avator" @click="huanyuan"></view>
 	</view>
 	<view class="bg-mask" v-if="selectserve">
 		<view @click.stop class="white-select">
@@ -99,6 +120,7 @@
 	import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
 	import { getLoginCode, loginApp } from '@/pages/login/api.js'
 
+	import {userEdit} from './api.js'
 	const zyupgrade = ref(null);
 	const issay = ref(false)
 	const openany = ref(false);
@@ -114,8 +136,73 @@
 	const selectserve = ref(false)
 	const allserve = ref(uni.getStorageSync('orgList'))
 
-	const changeServe = (item : any) => {
-		// console.log("啥啊", item)
+	
+		
+	const userInfo = ref(uni.getStorageSync('userInfo'));
+	const avator = ref(false); 
+	const uplod = ()=>{
+		uni.chooseImage({
+			count: 1, //默认9
+			sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['camera','album'], //从相册选择
+			success: (e) => {
+				let ar = JSON.stringify(e.tempFilePaths)
+				uni.compressImage({
+					src: JSON.parse(ar)[0],
+					quality: 80,
+					success: res => {
+						// sxdupld(res.tempFilePath)
+						userInfo.value.flag = true;
+						userInfo.value.avatar = res.tempFilePath;
+						// v.picPatharr.push(res.tempFilePath);
+						// console.log(v.picPatharr)
+					}
+				})
+			}
+		});
+	}
+	const sxdupld = (e) => { 
+		uni.uploadFile({
+			url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+			filePath: e,
+			name: 'file',
+			fileType: 'image',
+			formData: {
+				biz: '/touxiangPath'
+			},
+			header: {
+				'X-Access-Token': uni.getStorageSync('token')
+			},
+			success: res => {
+				const data = JSON.parse(res.data);
+				console.log(data)
+				userInfo.value.avatar = data.message;
+				userInfo.value.flag = false;
+				avaxg();
+			},
+			fail: () => {
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		})
+	}
+	const huanyuan = ()=>{
+		avator.value = false;
+		userInfo.value = uni.getStorageSync('userInfo');
+	}
+	const avaxg = () =>{
+		userEdit({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
+			console.log(res)
+			if(res.success){
+				uni.setStorageSync('userInfo', userInfo.value);
+				uni.showToast({
+					icon:'success',
+					title:"更新成功！"
+				})
+				avator.value = false;
+			}
+		})
+	}
+	const changeServe = (item:any) => {
 		uni.setStorageSync('serverUrl', item.serverUrl);
 		uni.setStorageSync('orgListName', item.departName);
 		uni.setStorageSync('orgListCode', item.orgCode);
@@ -229,6 +316,12 @@
 					animation.value = true;
 				}, 50)
 				break
+			case 8:
+			userInfo.value.flag = false;
+			serverUrl.value = uni.getStorageSync('serverUrl')
+			avator.value = true;
+			console.log(userInfo.value)
+			break
 		}
 	}
 
@@ -248,6 +341,66 @@
 </script>
 
 <style scoped lang="less">
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+	.avator{
+		position: fixed;
+		width: 750rpx;
+		height: 700rpx;
+		border-radius: 30rpx;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		z-index: 1;
+		padding: 0 10%;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		margin: auto;
+		z-index: 20;
+		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136,148,167,0.19);
+		text{
+			margin-top: 100rpx;
+		}
+		.butft {
+			width: 8.5vw;
+			height: 3.3vw;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 1.2vw;
+			border: 1rpx solid #5AAEFF;
+			color: #249BFA;
+			margin-left: 1vw;
+			background: linear-gradient(to bottom, #fff, #D1EAFF);
+			margin-top: 45rpx;
+		}
+		.avatorimg{
+			width: 300rpx;
+			height: 300rpx;
+			margin: 30rpx auto 0;
+			border-radius: 50%;
+			overflow: hidden;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.mengban{
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+	}
 	.index-content-other {
 		width: 100%;
 		// height: 100%;
diff --git a/static/index/card/zanw.png b/static/index/card/zanw.png
new file mode 100644
index 0000000..1c8eb80
Binary files /dev/null and b/static/index/card/zanw.png differ