diff --git a/component/public/newgame/sxy-Timeing.vue b/component/public/newgame/sxy-Timeing.vue
new file mode 100644
index 0000000..9198856
--- /dev/null
+++ b/component/public/newgame/sxy-Timeing.vue
@@ -0,0 +1,201 @@
+<template>
+	<view style="display: flex;align-items: center;"  :class="!isDown?'red':''">
+		<view class="box" id="box_minute" @click="chongzhi()">
+		  <view class="top child text" id="top" >{{ Math.floor(topTime / 60)  }}</view>
+		  <view class="flip child" id="flip" :style="{ transform: transformInfomin?transformInfo:'' }">
+		    <view  class="flip_face child text" :style="{ zIndex: faceZindexmin || 0 }" id="flip_face"  >
+		      {{ Math.floor(bottomTime / 60) }}
+		    </view>
+		    <view  class="flip_back child text" :style="backZindex&&transformInfomin ? { zIndex: backZindex } : {}" id="flip_back" >
+		      {{ Math.floor(topTime / 60) }}
+		    </view>
+		  </view>
+		  <view class="bottom child text" id="bottom" >{{ Math.floor(bottomTime / 60) }}</view>
+		</view>
+		:
+		<view class="box" id="box_minute"  :class="!isDown?'red':''">
+		  <view class="top child text" id="top">{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}</view>
+		  <view class="flip child" id="flip" :style="{ transform: transformInfo }"  >
+		    <view  class="flip_face child text" :style="{ zIndex: faceZindex || 0 }" id="flip_face"  >
+		      {{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60)}}
+		    </view>
+		    <view  class="flip_back child text" :style="backZindex ? { zIndex: backZindex } : {}" id="flip_back" >
+		      {{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}
+		    </view>
+		  </view>
+		  <view class="bottom child text" id="bottom">{{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60) }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  props: {
+    initTime: {
+      // 初始时间
+      type: Number,
+      default: 10,
+    },
+    // isDown: {
+    //   // 是否是倒计时
+    //   type: Boolean,
+    //   default: true,
+    // },
+    threshold: {
+      // 阈值
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      topTime: this.initTime,
+      bottomTime: this.initTime,
+      faceZindex: 1,
+      backZindex: 0,
+      transformInfo: "perspective(500rpx) rotateX(0deg)",
+	  transformInfomin: false,
+	  faceZindexmin: 1,
+	  backZindexmin: 0,
+	  mintime:0,
+      timer: null,
+      timerTwo: null,
+	  isDown:true
+    };
+  },
+  mounted() {
+    this.cycle();
+  },
+  methods: {
+	  chongzhi(){
+		  this.initTime = 185
+		  this.cycle();
+	  },
+    OneCycle(n) {
+      // 一次翻页的周期
+      let num = 0;
+      this.transformInfo = "perspective(500rpx) rotateX(0deg)";
+      this.faceZindex = 1;
+      this.backZindex = 0;
+	  this.bottomTime = this.isDown? n : n-1;
+	  let minutes = Math.floor(n / 60);
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+      this.timer = setInterval(() => {
+        num++;
+        if (num > 50) {
+          num = 0;
+          clearInterval(this.timer);
+          return;
+        }
+
+        if (num === 1) {
+			if (this.isDown) {
+				this.topTime = n - 1 < this.threshold ? n : n - 1; // 60 和 0 在时间里，其实是一样的
+				this.mintime = Math.floor(this.topTime / 60)
+				if(minutes != this.mintime ){
+					this.transformInfomin = true;
+				}else{
+					this.transformInfomin = false;
+				}
+			  } else {
+				this.topTime = n + 1 > this.threshold ? n : n + 1;
+				this.mintime = Math.floor(this.topTime / 60)
+				if(minutes != this.mintime ){
+					this.transformInfomin = true;
+				}else{
+					this.transformInfomin = false;
+				}
+			  }
+			}
+
+        this.faceZindex = num <= 25 ? 1 : 0;
+        this.backZindex = num <= 25 ? 0 : 1;
+
+        this.transformInfo = `perspective(500rpx) rotateX(-${(180 * num) / 50}deg)`;
+     
+	  }, 20); // 将一秒钟分成50份。
+    },
+    cycle() {
+		let minutes = Math.floor(this.initTime / 60);
+      let time = this.initTime;
+	  console.log(minutes,time)
+      this.timerTwo = setInterval(() => {
+        const flag = this.isDown ? time - 1 : time + 1;
+        if (flag === this.threshold) {
+			this.isDown = false
+          // clearInterval(this.timerTwo);
+          // clearInterval(this.timer);
+        }
+        this.OneCycle(time);
+        this.isDown ? time-- : time++;
+      }, 1000);
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+.red{
+	color: red !important;
+	view{
+		color: red !important;
+	}
+}
+.box {
+  position: relative;
+  box-sizing: border-box;
+}
+
+.box .child {
+  width: 3.4vw;
+  height: 1.6vw;
+  overflow: hidden;
+}
+
+.box > .top {
+  background-color: #DCDCDC;
+  line-height: 3.2vw;
+  border-bottom: 2rpx solid #fff;
+  border-radius: 4rpx 4rpx 0 0;
+}
+
+.box .flip {
+  position: absolute;
+  top: 0rpx;
+  z-index: 1;
+  transform-origin: bottom;
+  border-radius: 4rpx 4rpx 0 0;
+}
+
+.box .flip .flip_face {
+  position: absolute;
+  background-color: #DCDCDC;
+  line-height: 3.2vw;
+  z-index: 1;
+  border-bottom: 2rpx solid #fff;
+}
+
+.box .flip .flip_back {
+  position: absolute;
+  background-color: #DCDCDC;
+  line-height: 0rpx;
+  transform: perspective(500rpx) rotateX(0deg) rotateY(-180deg) rotate(180deg);
+  border-top: 2rpx solid #fff;
+}
+
+.box .bottom {
+  background-color: #DCDCDC;
+  line-height: 0rpx;
+  border-top: 2rpx solid #fff;
+  border-radius: 0 0 4rpx 4rpx;
+}
+
+.text {
+  text-align: center;
+  font-size: 2.2vw;
+  font-weight: 900;
+  color: #666;
+}
+</style>
diff --git a/component/public/severcard.vue b/component/public/severcard.vue
index 3ea5f8c..3913509 100644
--- a/component/public/severcard.vue
+++ b/component/public/severcard.vue
@@ -8,9 +8,18 @@
 					{{qcobj.directiveName}}
 				</view>
 			</view>
-			<view>
+			<view style="height: 78%;">
 				<view class="big-time">
-					{{qcobj.startTime?.slice(11, 16) }} - {{qcobj.endTime?.slice(11, 16) }}
+					<view>
+						{{qcobj.startTime?.slice(11, 16) }}
+						<!--  - {{qcobj.endTime?.slice(11, 16) }} -->
+					</view>
+					<view>
+						 <timeing></timeing>
+					</view>
+				</view>
+				<view class="names">
+					{{ qcobj?.directiveName }} 
 				</view>
 				<view class="icon-people">
 					<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
@@ -46,6 +55,7 @@
 	 import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent,watch } from 'vue';
 	 import { queryOrderlist,startDirectiveServe,finishDirectiveServe,queryOrderInfoList } from '@/pages/procurement/api/lunpan.js'
 	 import { startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js'
+	 import timeing from './newgame/sxy-Timeing.vue'
 	 const qcobj = ref({})
 	 const openleft = ref(true)
 	 const open = ref(0);
@@ -179,11 +189,25 @@
 				height: 8vw;
 			}
 		}
-	
+		.names{
+			font-weight: 400;
+			font-size: 1.5vw;
+			color: #333333;
+			margin-top: 1.4vw;
+			padding-left: 1vw;
+		}
 		.big-time {
 			font-weight: 600;
-			font-size: 1.8vw;
+			font-size: 2.3vw;
 			padding-left: 1vw;
+			width: 18vw;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			>view{
+				display: flex;
+				align-items: center;
+			}
 		}
 	
 		.icon-people {
@@ -192,6 +216,7 @@
 			color: #555555;
 			width: 18vw;
 			padding-left: 1vw;
+			white-space: nowrap;
 			.people-img {
 				width: 1.5vw;
 				height: 1.5vw;
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 41ee8f8..f49a97c 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;">
 								暂无服务指令
@@ -126,7 +127,8 @@
 			</view>
 		</view>
 		<view class="mengban" v-if="jszlshow" @click="jszlshow = false" ></view>
-		<view class="photo-father">
+		<serveswipe></serveswipe>
+		<!-- <view class="photo-father" >
 			<view class="juzhong" style="margin-left: -30rpx;" :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}">
 				<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
 					:interval="120" />
@@ -246,8 +248,8 @@
 				</view>
 				<tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang>
 			</view>	
-		</view>
-		<view class="left-menu"  v-show="indexmessage?.startTime">
+		</view> -->
+		<!-- <view class="left-menu"  v-show="indexmessage?.startTime">
 			<view  style="margin: 30rpx 0;" @click="errmsgclk(0,1)">
 				<view class="left-ball" :style="indexmessage?.serviceContent!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
 					<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
@@ -299,7 +301,7 @@
 			</scroll-view>
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`"
 				@click="scrollTop > (55* rightMenu.length) ? scrollTop = (55* rightMenu.length) : scrollTop += 115 " />
-		</view>
+		</view> -->
 	</view>
 	<errorshow :show="openerror" :font="errmsg" @close="openerror=false" :icons="false" style="left: 44%;"/>
 	<errorshow :show="error" :font="msg" @close="error=false"  style="left: 44%;"/>
@@ -347,7 +349,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?`入住`:`空闲` }}
@@ -606,6 +608,7 @@
 	// import {startOrder,endOrder} from './doctorask/api/api.js'
 	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder,generateInstant} from '../component/doctorask/api/api.js'
 	import { getNclist } from "./nurse/api.js";
+	import serveswipe from './leftcontent/serveswipe.vue';
 	const serverUrl = ref(uni.getStorageSync('imagebase') )
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
 	const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
@@ -730,6 +733,7 @@
 	const firstgetqueryCgdList = (nuId) => {
 		form.nuId = nuId;
 		queryOrderList(form).then(res => {
+			console.log(form)
 			if(res.result.records.length>0){
 				indexmessage.value = res.result.records[0]
 				// clickLeftMenu(0,res.result.records[0])
@@ -988,13 +992,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 +2260,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/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index 09a1f05..42977c6 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -12,9 +12,9 @@
 				</view>
 				<scroll-view class="cont" :scroll-y="true" :scroll-top="scrolltop" @scroll="scroll"  scroll-with-animation @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
 					<view class="items" v-for="(v,i) in list" :key='i' @click="naurl(i);emit('navurl',i,v)">
-						<view class="tm guodu" :class="{'act':i==dexleft}">
-							<image :src="i==dexleft?v.urls:v.url" mode="aspectFill" class="guodu"></image>
-							<text>{{v.name}}</text>
+						<view class="tm guodu" >
+							<image :src="i==dexleft?v.url:v.urls" mode="aspectFill" class="guodu"></image>
+							<text :style="i==dexleft?'color:#0080FC':''">{{v.name}}</text>
 						</view>
 						<!-- <view class="heng guodu" :style="i!=dexleft&&i!=list.length-1?'opacity: 1':'opacity: 0'"></view> -->
 					</view>
@@ -232,7 +232,8 @@
 					}
 					text{
 						font-weight: 400;
-						font-size: 0.9vw;
+						font-size: 1.3vw;
+						margin-top: 0.8vw;
 						color: #666666;
 					}
 				}
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
new file mode 100644
index 0000000..d62500c
--- /dev/null
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -0,0 +1,1316 @@
+<template>
+	<view>
+		<view class="swipeservwe">
+			<view class="btn les" @click="swip(-1)">
+				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" style="transform: rotate(180deg);"/>
+			</view>
+			<view class="btn ris" @click="swip(1)">
+				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
+			</view>
+			<swiper class="swiper" :circular="true" :indicator-dots="false"
+			easing-function="easeInOutCubic"
+			 :autoplay="autoplay" :interval="3000" :duration="500" :current="current" @change="change">
+				<swiper-item v-for="(indexmessage,i) in 5" :key="i" class="swper">
+					 <view class="photo-father" >
+					 	<view class="juzhong" style="margin-left: -30rpx;" :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}">
+					 		<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
+					 			:interval="120" />
+					 	</view>
+						<view class="timedjs">
+							<text>服务倒计时</text>
+							<timeing ></timeing>
+						</view>
+					 	<view class="weight-time">
+					 		<view v-if="indexmessage?.startTime">
+					 			{{ indexmessage?.startTime.slice(11, 16)  }}
+					 			-
+					 			{{ indexmessage?.endTime.slice(11, 16) }}
+					 		</view>
+					 		<view style="height: 5vw;" >
+					 		</view>
+					 		<view class="pao-father" >
+					 			<image class="pao-img" :src="`/static/index/newindex/states/pao.png`" />
+					 			<view style="z-index: 1;"  v-if="topbuttontarget==0">
+					 				{{indexmessage?.izStart=='N'?'待执行':'执行中'}}
+					 			</view>
+					 		</view>
+					 	</view>
+						
+					 	<image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
+					 		:src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
+					 	
+						
+						<view style="display: flex;align-items: center; ">
+					 		<view class="server-name" v-if="indexmessage?.startTime">
+					 			{{ indexmessage?.directiveName }} 
+					 		</view>
+					 	</view>
+						
+						
+						
+					 	<view style="display: flex;margin-top: 40rpx;" >
+					 		<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
+					 			<view :class="indexmessage?.izStart=='N'?'start-button':'end-button'"  @click="start(indexmessage)">
+					 				开始服务
+					 			</view>
+					 		</view>
+					 		<view style="width: 240rpx;height: 90rpx;">
+					 			<view :class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'start-button':'end-button'"    @click="end(indexmessage)">
+					 				结束服务
+					 			</view>
+					 		</view>
+					 
+					 	</view>
+						<view class="left-menu"  >
+							<view  style="margin: 30rpx 0;" @click="errmsgclk(0,1)">
+								<view class="left-ball" :style="indexmessage?.serviceContent!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
+								</view>
+							</view>
+							<view  style="margin: 30rpx 0;" @click="errmsgclk(1,1)">
+								<view class="left-ball" :style="indexmessage?.mp3File!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+1+'.png'" />
+								</view>
+							</view>
+							<view style="margin: 30rpx 0;" @click="errmsgclk(2,1)">
+								<view class="left-ball" :style="indexmessage?.mp4File!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+2+'.png'" />
+								</view>
+							</view>
+							<view v-for="(item,index) in [3,4]" :key="index" style="margin: 30rpx 0;" @click="errmsgclk(item,2)">
+								<view class="left-ball"  :style="indexmessage?.izStart=='Y'?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
+								</view>
+							</view>
+						</view>
+						<view class="right-menu" >
+							<view class="zhezhao-top" ></view>
+							<view class="zhezhao-bottom" ></view>
+							<image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`"  />
+							<view scroll-y="true" class="right-scroll"  >
+								<view style="height: 20rpx;"> </view>
+								
+								<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(1)">
+									<view class="white-circle" :style="indexmessage?.izStart=='Y'?'background-color:RGBA(228, 229, 231, 1)' : ''">
+										<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" />
+										<view class="right-menu-name">
+											转单执行
+										</view>
+									</view>
+								</view>
+								<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(2)">
+									<view class="white-circle">
+										<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
+										<view class="right-menu-name">
+											协助执行
+										</view>
+									</view>
+								</view>
+								<view style="height: 30rpx;">
+						
+								</view>
+							</view>
+							<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`"
+								@click="scrollTop > (55* rightMenu.length) ? scrollTop = (55* rightMenu.length) : scrollTop += 115 " />
+						</view>
+					 		
+					 </view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- <tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang> -->
+		<tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang>
+		<view class="mengban" v-if="zdxzdex>0" @click="zdxzdex=0"></view>
+		<view class="photowall" v-show="zdxzdex>0" :style="zdxzdex?{opacity:1}:{opacity:0}" v-if="zdxzdex">
+			<view class="photowall-title">
+				<view class="photowall-name">
+					{{ zdxzdex==1?`转单执行`:`协助执行` }}
+				</view>
+			</view>
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex v-if="zdxzdex>0">
+				<view class="photowall-other" >
+					<view class="bottom-title" v-for="(v,k) in zdxzarr" :key='k' @click="zdwu(v,k)" 
+					 style="border: 1px solid #f8f8f8;width: 16vw;margin: 0 0.8vw;;height: 17vw;border-radius: 1.1vw;background: #f8f8f8;display: flex;flex-direction: column;align-items: center;"
+					 :style="v.flag?'border: 1px solid #0385FA;background: #fff !important;':''">
+						 <image style="width: 9vw;height: 9vw;border-radius: 50%;margin: 1vw auto;"
+						 		:src="v.headPath?serverUrl+v.headPath:'/static/shouye/xd.png'" />
+						 	<view class="name-weight">
+						 		{{v.name }}
+						 	</view>
+						 	<view class="message-view" v-if="uni.getStorageSync('NUall').elderInfo?.name">
+						 		{{v.sex}}
+						 		<view class="message-shu"></view>
+						 		<view style="font-weight: 600;">
+						 			{{ v.height}}cm
+						 		</view>
+						 		
+						 		<view class="message-shu"></view>
+						 		{{ v.weight}}Kg
+						 	</view>
+						 	 
+						 </view>
+					</view>
+				
+			</scroll-view>	
+			<!-- <view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;"  >
+				<view v-if="flag" class="lanbt" @click="zhixingsub" >确定</view>
+				<view v-if="!flag" class="huibt">确定</view>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch ,reactive} from 'vue';
+	import { onBackPress, onShow, onHide } from "@dcloudio/uni-app"
+	import timeing from '@/component/public/newgame/sxy-Timeing.vue'
+	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder,generateInstant} from '../../component/doctorask/api/api.js'
+	const open = ref(0)
+	const donghuaopo = ref(false);
+	const topbuttontarget = ref(0);
+	const ilanarr = ref([]);
+	const listobj = ref({});
+	const indexmessage = ref({});
+	const photoplay = ref(false)
+	const serverUrl = ref(uni.getStorageSync('imagebase') )
+	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
+	const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+	const current = ref(0)
+	const autoplay = ref(true)
+	const change = (e)=>{
+		console.log(e.detail.current)
+		console.log(current.value)
+		current.value = e.detail.current
+	}
+	const swip = (e)=>{
+		if(current.value==0&&e==-1){
+			return
+		}
+		if(current.value==4&&e==1){
+			return
+		}
+		current.value+=e;
+		autoplay.value = false;
+		setTimeout(()=>{
+			autoplay.value = true;
+		},3000)
+		console.log(current.value)
+	}
+	const form = reactive({
+		pageNo: 1,
+		pageSize: 10,
+		employeeId:uni.getStorageSync('userInfo').employessId, 
+		nuId:uni.getStorageSync('nuId'),
+		workType:5
+	})
+	onMounted(()=>{
+		setTimeout(()=>{
+			photoplay.value = true;
+		},200)
+	})
+	const zdxzdex = ref(0)
+	const zdxzarr = ref(0)
+	const zhixing = (e)=>{
+		if(indexmessage.value?.izStart=='Y' && e ==1){
+			uni.showToast({
+				title:'服务中不能转单！',
+				icon:'none'
+			})
+			return
+		}
+		queryEmpList({id:uni.getStorageSync('userInfo').id}).then(res=>{
+			zdxzarr.value = res.result;
+			zdxzarr.value.forEach(item=>{
+				item.flag = false
+			})
+			zdxzdex.value = e;
+		})
+	}
+	const plsbuy = ref([])
+	const firstgetqueryCgdList = (nuId) => {
+		form.nuId = nuId;
+		queryOrderList(form).then(res => {
+			console.log(form)
+			if(res.result.records.length>0){
+				indexmessage.value = res.result.records[0]
+				// clickLeftMenu(0,res.result.records[0])
+			}else{
+				indexmessage.value = {};
+			}
+		})
+	}
+	const submit = ()=>{
+		let sub = "";
+		ilanarr.value.forEach(item=>{
+			sub+=item+','
+		})
+		if(topbuttontarget.value == 1){
+			editSubPicPath({id:listobj.value.id,manuallyPicPath:sub}).then(res=>{
+				if(res.success){
+					topbuttontarget.value = 0;
+					donghuaopo.value = false;
+					firstgetqueryCgdList(form.nuId)
+					// clickLeftMenu(0,{id:indexmessage.value.mainId})
+				}
+			})
+		}else{
+			editSubMp4({id:listobj.value.id,manuallyMp4Path:sub}).then(res=>{
+				console.log({id:listobj.value.id,manuallyMp4Path:sub},res)
+				if(res.success){
+					topbuttontarget.value = 0;
+					donghuaopo.value = false;
+					firstgetqueryCgdList(form.nuId)
+					// clickLeftMenu(0,{id:indexmessage.value.mainId})
+				}
+			})
+		}
+	}
+	const previewImage = (v, i, arr) => {
+		if(topbuttontarget.value == 1){
+			let u = []
+			arr.forEach(e => {
+				u.push(serverpicUrl.value + e)
+			})
+			uni.previewImage({
+				current: i,
+				urls: u,
+				showmenu: false,
+				longPressActions: {
+					itemList: [],
+				}
+			})
+		}
+	}
+	const videoContext = ref(null)
+	const play = (e,i)=>{
+		 videoContext.value = uni.createVideoContext('myVideo'+i);
+		 videoContext.value.play()
+	}
+	const sxdupld = (e) => {
+		let now = new Date();
+		let year = now.getFullYear();
+		let month = now.getMonth() + 1;
+		uni.uploadFile({
+			url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+			filePath: e,
+			name: 'file',
+			fileType:topbuttontarget.value==2?'video':'image',
+			formData: {
+				biz: year + '/' + month + (topbuttontarget.value==1?'/fwxm/manuallyPicPath':'/fwxm/manuallyMp4Path')
+			},
+			header: {
+				'X-Access-Token': uni.getStorageSync('token')
+			},
+			success: res => {
+				const data = JSON.parse(res.data);
+				ilanarr.value.push(data.message)
+				uni.hideLoading()
+			},
+			fail: () => {
+				uni.hideLoading()
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		})
+	}
+	const uplod = (v) => {
+		if(topbuttontarget.value==1){
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['camera'], //从相册选择
+				success: (e) => {
+					let ar = JSON.stringify(e.tempFilePaths)
+					uni.compressImage({
+						src: JSON.parse(ar)[0],
+						quality: 60,
+						success: res => {
+							sxdupld(res.tempFilePath)
+							// v.picPatharr.push(res.tempFilePath);
+						}
+					})
+				}
+			});
+		}else{
+			uni.chooseVideo({
+				sourceType: ['camera' ],
+				success: (e)=> {
+					uni.showLoading({
+						title:'正在上传...'
+					})
+					uni.compressVideo({
+						src: e.tempFilePath,
+						quality: 'medium',
+						success: res => {
+							sxdupld(res.tempFilePath)
+							// v.picPatharr.push(res.tempFilePath);
+						}
+					})
+					// sxdupld(res.tempFilePath )
+				}
+			});
+		}
+	}
+	const end = (v)=>{
+		if(indexmessage.value.izStart=='Y'&& indexmessage.value.izFinish=='N'){
+			open.value=3;
+		}
+	}
+	const ends = ()=>{
+		
+			endOrder({id:indexmessage.value.id}).then(res=>{
+			if(res.success){
+				open.value=0;
+				// severcards.value.firstgetqueryCgdList()
+				firstgetqueryCgdList(uni.getStorageSync('nuId'))
+			}else{
+				
+			}
+		})
+		
+	}
+	const errmsg = ref('')
+	const openerror = ref(false);
+	const errmsgclk = (e,k)=>{
+		if(k==1){
+			if(indexmessage.value?.izStart=='Y'){
+				switch (e){
+					case 0:
+					if(indexmessage.value?.serviceContent==''){return}
+						errmsg.value = indexmessage.value?.serviceContent
+						break;
+					case 1:
+					if(indexmessage.value?.mp3File==''){return}
+					errmsg.value = indexmessage.value?.mp3File
+						break;
+					case 2:
+					if(indexmessage.value?.mp4File==''){return}
+					errmsg.value = indexmessage.value?.mp4File
+						break;
+						
+					default:
+						break;
+				}
+				openerror.value = true;
+			}
+		}else{
+			if(indexmessage.value?.izStart=='Y'){
+				
+				switch (e){
+					case 3:
+					ysptp(indexmessage.value,0,1)
+						break;
+					case 4:
+					ysptp(indexmessage.value,0,2)
+						break;
+						
+					default:
+						break;
+				}
+			}
+			
+		}
+	}
+	const ysptp = (v,i,r) =>{
+		// v.manuallyPicPath
+		if(r == 1&&v.manuallyPicPath){
+			ilanarr.value = v.manuallyPicPath.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}else if(r == 2&&v.manuallyMp4Path){
+			ilanarr.value = v.manuallyMp4Path.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}else if(r == 3&&v.tplinkPath){
+			ilanarr.value = v.tplinkPath.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}
+		else{
+			ilanarr.value = [];
+		}
+		
+		listobj.value = v;
+		topbuttontarget.value = r;
+		donghuaopo.value = true;
+	}
+	const fwzlindex = ref(0);
+	const fwzldex = ref(-1);
+	const fwzlarr = ref(0);
+	const zlarr = ref({});
+	const shtab = (e)=>{
+		fwzlindex.value = e;
+		if(e==0){
+			fwzlarr.value = zlarr.value?.care
+		}
+		if(e==1){
+			fwzlarr.value = [];
+		}
+		if(e==2){
+			fwzlarr.value = zlarr.value?.logistics
+		}
+	}
+	const base = genPaths(
+		'/static/index/newindex/curve',
+		'curve_',
+		9,
+		'png',
+		1,
+		false
+	)
+	const blueArray = ref([
+		...base,
+		...[...base].reverse()   // 先拷贝一份再反转，避免修改原 base
+	])
+	const basesmall = genPaths(
+		'/static/index/newindex/curve',
+		'breathe_',
+		9,
+		'png',
+		1,
+		false
+	)
+	const bluesmallArray = ref([
+		...basesmall,
+		...[...basesmall].reverse()   // 先拷贝一份再反转，避免修改原 base
+	])
+	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
+		return Array.from({ length: count }, (_, i) => {
+			const idx = pad
+				? String(i + startIndex).padStart(2, '0')
+				: i + startIndex
+			return `${base}/${prefix}${idx}.${ext}`
+		})
+	}
+</script>
+
+<style scoped lang="less">
+	.swipeservwe{
+		width: 65vw;
+		height: 70vh;
+		position: relative;
+		.btn{
+			width: 2.4vw;
+			height:2.4vw;
+			background: #E9EAED;
+			border-radius: 50%;
+			position: absolute;
+			top: 32vh;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			z-index: 99;
+			image{
+				width: 80%;
+				height: 80%;
+			}
+		}
+		.les{
+			left: 0;
+		}
+		.ris{
+			right: 0;
+		}
+		.swiper{
+			width: 100%;
+			height: 100%;
+			.swper{
+				width: 100%;
+				height: 100%;
+				position: relative;
+			}
+		}
+	}   
+	.lanbt{
+		width: 8.2vw;
+		height: 3.3vw;
+		background: #EDEDEF;
+		border-radius: 1.6vw;
+		font-weight: 400;
+		font-size: 1.6vw;
+		color: #888888;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid #EDEDEF; 
+		background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+		border: 1px solid rgba(3,133,250,0.34);
+		color: #0385FA;
+	}
+	.huibt{
+		width: 8.2vw;
+		height: 3.3vw;
+		background: #EDEDEF;
+		border-radius: 1.6vw;
+		font-weight: 400;
+		font-size: 1.6vw;
+		color: #888888;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid #EDEDEF; 
+		border: 1px solid rgba(3,133,250,0.34);
+		color: #999;
+	}
+	
+	
+	
+	.photo-father {
+		width: 100%;
+		height: 1100rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		position: relative;
+		margin-top: 0rpx;
+		
+		.timedjs{
+			position: absolute;
+			width: 7vw;
+			right: 4vw;
+			top: 2vw;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			>text{
+				font-weight: 400;
+				font-size: 1.3vw;
+				color: #666666;
+			}
+		}
+	}
+	.juzhong {
+		position: absolute;
+		top: 0%;
+		left: 50%;
+		transform: translate(-50%, -20%);
+		// 禁止动画阻挡逻辑
+		z-index: -1;
+	}
+	
+	.weight-time {
+		font-weight: 800;
+		font-size: 70rpx;
+		margin-top: 2vw;
+		position: relative;
+		margin-left: -50rpx;
+	}
+	
+	.big-img {
+		margin-top: 40rpx;
+		height: 450rpx;
+		z-index: 10;
+	}
+	
+	.server-name {
+		font-size: 35rpx;
+		margin-right: 10rpx;
+		font-weight: 600;
+		margin-top: 2vw;
+	}
+	
+	.server-bgc {
+		width: 160rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+	
+	}
+	
+	.bgc-img {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+	
+	.bgc-font {
+		color: #fff;
+		z-index: 1;
+	}
+	
+	.states-father {
+		display: flex;
+		margin: 0 20rpx;
+	}
+	
+	.start-button {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to bottom, #009DEF, #0076FF);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 40rpx;
+		color: #fff;
+		font-size: 1.5vw;
+	
+	}
+	
+	.end-button {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to bottom, #FFFFFF, #C8D0D9);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 40rpx;
+		font-size: 1.5vw;
+	}
+	
+	.pao-father {
+		position: absolute;
+		top: 20rpx;
+		right: -110rpx;
+		font-size: 22rpx;
+		width: 100rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #FFFFFF;
+	
+		.pao-img {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+	
+		}
+	}
+	
+	.left-menu {
+		position: absolute;
+		top: 45%;
+		left: 100rpx;
+		transform: translateY(-50%);
+	}
+	
+	.zoom {
+		transform: scale(1.2);
+		transform-origin: bottom left;
+		transition: transform 1s ease;
+	}
+	
+	.left-ball {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+	
+		.left-menu-img {
+			width: 40rpx;
+			height: 40rpx;
+		}
+	}
+	
+	.right-menu {
+		position: absolute;
+		top: 45%;
+		right: 80rpx;
+		transform: translateY(-50%);
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 140rpx;
+	
+		.top-img {
+			width: 140rpx;
+			height: 110rpx;
+			padding: 0 50rpx;
+		}
+	
+		.right-scroll {
+			width: 100%;
+			height: 450rpx;
+		}
+	
+		.white-circle {
+			height: 170rpx;
+			border-radius: 60rpx;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			text-align: center;
+			font-size: 25rpx;
+			width: 100rpx;
+	
+			.right-menu-img {
+				width: 50rpx;
+				height: 50rpx;
+			}
+	
+			.right-menu-name {
+				width: 50rpx;
+			}
+		}
+	}
+	
+	.zhezhao-top {
+		position: absolute;
+		top: 105rpx;
+		left: 0%;
+		width: 120%;
+		height: 120rpx;
+		z-index: 4;
+	}
+	
+	.zhezhao-bottom {
+		position: absolute;
+		bottom: 105rpx;
+		left: 0%;
+		width: 120%;
+		height: 120rpx;
+		z-index: 4;
+	}
+	
+	.zhezhao-left {
+		position: absolute;
+		top: 0rpx;
+		left: 0%;
+		height: 100%;
+		width: 120rpx;
+		background: linear-gradient(to right,
+				rgba(239, 240, 244, 1) 0%,
+				/* #eff0f4 全不透明 */
+				rgba(239, 240, 244, 0) 100%
+				/* #eff0f4 完全透明 */
+			);
+		z-index: 4;
+	}
+	
+	.zhezhao-right {
+		position: absolute;
+		top: 0rpx;
+		right: 0%;
+		height: 100%;
+		width: 120rpx;
+		background: linear-gradient(to left,
+				rgba(239, 240, 244, 1) 0%,
+				/* #eff0f4 全不透明 */
+				rgba(239, 240, 244, 0) 100%
+				/* #eff0f4 完全透明 */
+			);
+		z-index: 4;
+	}
+	
+	.title-card-right {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 10vw;
+		height: 9.4vw;
+		border-radius: 2vw;
+		background-color: #E4EBF4;
+		padding: 1.6vw;
+		margin-right: 1.5vw;
+		border: 2rpx solid #D2DFF0;
+	}
+	
+	.title-card {
+		width: 10vw;
+		height: 9vw;
+		border-radius: 2vw;
+		background-color: #FFFFFF;
+		padding: 1.6vw;
+		position: relative;
+		margin-right: 1.5vw;
+	}
+	
+	.card-bottom {
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 3vw;
+		display: flex;
+	
+		.bottom-img {
+			width: 1.6vw;
+			height: 1.6vw;
+			margin-left: 1.8vw;
+		}
+	
+		.bottom-font {
+			color: #555555;
+			font-size: 1.4vw;
+			margin-left: 0.5vw;
+		}
+	}
+	
+	.card-top {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+	
+		.card-top-left {
+			font-size: 1.8vw;
+			font-weight: 600;
+		}
+	
+		.card-top-right {
+			width: 2vw;
+			height: 2vw;
+			border-radius: 50%;
+			background-color: #F1F2F3;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+	
+			.right-img {
+				width: 0.8vw;
+				height: 0.8vw;
+			}
+		}
+	
+		.card-spec {
+			position: absolute;
+			top: 1.1vw;
+			left: 1.6vw;
+			width: 1.5vw;
+			height: 2vw;
+			// background-color: #0076FF;
+	
+			.line {
+				position: absolute;
+				inset: 0;
+				background: linear-gradient(to bottom right,
+						transparent calc(50% - 1px),
+						#d5d5d5 50%,
+						transparent calc(50% + 1px))
+			}
+	
+			.line-gray {
+				position: absolute;
+				right: -1.1vw;
+				bottom: -0.6vw;
+				color: #888888;
+				font-size: 1.3vw;
+			}
+		}
+	}
+	
+	.title-time {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 15vw;
+		height: 9.5vw;
+		border-radius: 2vw;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	
+		.time-title {
+			font-weight: 600;
+			font-size: 3vw;
+			margin-top: 0.4vw;
+		}
+	
+		.time-date {
+			margin-top: 0.2vw;
+			font-size: 1.3vw;
+			color: #222222;
+		}
+	}
+	
+	.blue-button {
+		margin-top: 0.5vw;
+		width: 7vw;
+		height: 2.5vw;
+		background: linear-gradient(to bottom, #009DEF, #0076FF);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 40rpx;
+		color: #fff;
+		font-size: 28rpx;
+		position: relative;
+	}
+	
+	.name-weight {
+		font-size: 2vw;
+		font-weight: 600;
+		margin: 0.2vw 0;
+	}
+	
+	.message-view {
+		display: flex;
+	
+		.message-shu {
+			width: 3rpx;
+			height: 1.5vw;
+			background-color: #bcc1c7;
+			margin: 0 0.4vw;
+			margin-top: 0.1vw;
+		}
+	
+		.message-img {
+			width: 1.5vw;
+			height: 1.5vw;
+			margin-top: 0.1vw;
+		}
+	}
+	
+	.message-bottom {
+		margin-top: 0.5vh;
+		width: 100%;
+		height: 4vh;
+		display: flex;
+		justify-content: center;
+		.bottom-tags {
+			background-color: #E7F1FF;
+			color: #0084FA;
+			height: 100%;
+			display: flex;
+			align-items: center;
+			padding: 0 0.4vw;
+			border-radius: 0.8vw;
+			font-size: 1.2vw;
+			margin: 0 0.2vw;
+			white-space: nowrap;
+			flex-wrap: nowrap;
+		}
+	}
+	
+	.fixed-card {
+		position: fixed;
+		right: 2.4vw;
+		top: 5.8vh;
+		width: 35vw;
+		height: 28vh;
+		background-color: rgba(239, 246, 255, 0.95);
+		border-radius: 1.5vw;
+		border: 1rpx solid #638DFF;
+		box-shadow: 0 2rpx 6rpx #A0B9FF;
+		display: flex;
+		align-items: center;
+		transition: all 0.5s ease;
+		padding:0 0 0 1.5vw;
+		.fixed-card-left {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-right:1.2vw;
+			.card-left-img {
+				width: 12vw;
+				height: 8vw;
+			}
+		}
+	
+		.big-time {
+			font-weight: 600;
+			font-size: 2.8vw;
+		}
+	
+		.icon-people {
+			display: flex;
+			margin: 0.3vw 0;
+			color: #555555;
+	
+			.people-img {
+				width: 1.5vw;
+				height: 1.5vw;
+				margin-right: 0.3vw;
+				margin-top: 0.1vw;
+			}
+		}
+	
+		.icon-button {
+			display: flex;
+			margin-top: 1vw;
+			font-size: 1.5vw;
+			width: 18.5vw;
+			justify-content: space-around;
+			.button-left {
+				width: 8.5vw;
+				height: 3.3vw;
+				background-color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 1.2vw;
+				border: 1rpx solid #C7D2E4;
+				color: #333333;
+			}
+	
+			.button-right {
+				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;
+				background: linear-gradient(to bottom, #fff, #D1EAFF);
+			}
+		}
+	}
+	
+	.left-open {
+		position: absolute;
+		left: -1.5vw;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 3vw;
+		height: 5vw;
+		border: 1rpx solid #B8C4DA;
+		background-color: #F2F7FD;
+		z-index: 999;
+		border-radius: 3vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		transition: all 0.5s ease;
+	
+		.open-img {
+			width: 3vw;
+			height: 3vw;
+		}
+	}
+	
+	
+	
+	
+	
+	.noarray {
+		width: 90%;
+		height: 100%;
+		// background-color: red;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	
+		.noarray-img {
+			margin-top: -200rpx;
+			width: 350rpx;
+			height: 350rpx;
+		}
+	
+	}
+	
+	.noarray-font {
+		margin-top: -60rpx;
+		color: #888888;
+		font-size: 25rpx;
+	}
+	.mengban {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		background: RGBA(239, 240, 244, 0.55);
+	}
+	.photowall {
+		position: fixed;
+		top: 54%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 80vw;
+		height: 83%;
+		border-radius: 30rpx;
+		background-color: #fff;
+		transition: all 0.3s;
+		z-index: 9990;
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+		padding: 0 90rpx;
+		.photowall-title {
+			margin-top: 50rpx;
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			margin-bottom: 50rpx;
+	
+			.photowall-name {
+				font-size: 38rpx;
+				// font-weight: 600;
+			}
+	
+			.photowall-left {
+				color: #888888;
+			}
+	
+			.photowall-right {
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+		}
+	
+		.photowall-other {
+			width: 76vw;
+			height: 62vh;
+			display: flex;
+			margin-top: 20rpx;
+			flex-wrap: wrap;
+			.photowall-other-one {
+				width: 22vw;
+				height: 430rpx;
+				margin-right: 3vw;
+				margin-bottom: 0%;
+				border-radius: 30rpx;
+				display:flex;
+				position: relative;
+				video{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+	.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: 29.5vw;
+			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%;
+				}
+				view{
+					text-align: center;
+					font-weight: 400;
+					font-size: 0.7vw;
+					color: #555;
+					width: 100%;
+				}
+			}
+			.act{
+				background: #F2F8FF;
+				border: 1px solid rgba(1,125,233,0.43);
+				text{
+					color: #017DE9;
+				}
+			}
+		}
+		.spiw{
+			width: 14vw;
+			height: 2vw;
+			display: flex;
+			justify-content: space-around;
+			margin-top: 2.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;
+			}
+		}
+	}
+</style>
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index 8a1fb41..2b57cfe 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -164,19 +164,19 @@
 
 <style scoped lang="less">
 	.zkadd {
-		width: 9vw;
+		width: 4vw;
 		height: 100%;
 		display: inline-flex;
 		justify-content: flex-end;
 		position: absolute;
 		top: 0;
-		right: -9vw;
+		right: -4vw;
 		view:active{
 			background:rgba(85, 166, 249, 1) !important;
 			color: #FFFFFF !important;
 		}
 		>view {
-			width: 3.6vw;
+			width: 4vw;
 			height: 100%;
 			font-weight: 400;
 			font-size: 1.3vw;
@@ -365,9 +365,10 @@
 		.imge{
 			width: 8vw;
 			height: 7vw;
-			padding: 0.2vw;
+			padding: 0.5vw;
 			margin: 0.3vw auto 0.25vw;
-			background: #fff;
+			background: #f5f5f5;
+			border-radius: 1.1vw;
 			>image {
 				width: 100%;
 				height: 100%;
diff --git a/pages/NursingNew/component/pleasetake/common/medetails.vue b/pages/NursingNew/component/pleasetake/common/medetails.vue
index 6fe1ff6..80550ea 100644
--- a/pages/NursingNew/component/pleasetake/common/medetails.vue
+++ b/pages/NursingNew/component/pleasetake/common/medetails.vue
@@ -21,9 +21,9 @@
 							物料编码
 							<text>{{objtake?.materialNo}}</text>
 						</view>
-						<view style="margin-left: 2.5vw;">
+						<view style="margin-left: 2.5vw;width: 20vw;">
 							规格型号
-							<text style="white-space: nowrap;">{{objtake?.specificationModel}}</text>
+							<text >{{objtake?.specificationModel}}</text>
 						</view>
 					</view>
 					<view>
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 6eb9c2b..537a0f8 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 = {};
 			}
@@ -821,7 +819,8 @@
 	const emit = defineEmits(['swip'])
 	const clickmenu = (index : number) => { 
 		menutarget.value = index
-		let data = filteredMenu(2)[index]
+		let data = filteredMenu(2)[index];
+		console.log(data)
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null);
@@ -848,7 +847,7 @@
 	const zlfunc = (nuId)=>{
 		let data = {
 			nuId:nuId,
-			elderId:elderId
+			// elderId:elderId
 		}
 		queryAll(data).then(res=>{
 			console.log(res)
@@ -1028,16 +1027,15 @@
 	const getmenu = () => {
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
-			// console.log(leftMenuArray.value)
-			filteredMenu(2).forEach((element : any, index : number) => {
-				if (element.nuId === uni.getStorageSync('NUall').nuId) {
+			let arr = filteredMenu(2);
+			arr.forEach((element : any, index : number) => {
+				if (element.nuId == uni.getStorageSync('NUall').nuId) {
 					menutarget.value = index;
 					clickmenu(index)
 				}
 				if(element.readList==null){
 					element.flag = false
-				}
-				if(element.readList.length>0){
+				}else if(element.readList.length>0){
 					element.readList.forEach(k=>{
 						if(k.type=='pdd'){
 							element.flag = true
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 2bd51c9..cf7298d 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -654,7 +654,7 @@
 				<scroll-view scroll-x="true" class="middle-Y" :scroll-left="Invoiscroll" scroll-with-animation>
 					<view class="middle-Y-father">
 						<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
-							:style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
+							:style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:`` }"
 							@click="clickmiddle(i)">
 							<view :class="v.status<2?`up-tags-target`: `up-tags`">
 								{{v.status_dictText}}
@@ -1512,7 +1512,7 @@
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		showvalue.value.jianhuobtn = false;
-		Invoiscroll.value = (index - 2) * 172;
+		Invoiscroll.value = (index - 1) * 172;
 		if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
 			showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
 			showvalue.value.num = showvalue.value.maxnum;
@@ -2546,7 +2546,7 @@
 				margin-left: 5%;
 
 				.middle-Y {
-					width: 98%;
+					width: 96%;
 					height: 100%;
 					margin-left: 2%;
 					// margin-right: 2%;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b69203d..206e2a8 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/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index 45034d8..0b053b8 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -177,7 +177,6 @@
 					type.value = a.find(item=>
 						item.unit == props.caigouobj.wlUnits
 					);
-					console.log(props.caigouobj.wlUnits,type.value)
 				}else{
 					type.value = a.find(item=>
 						item.multiUnitType == props.caigouobj.multiUnitType
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index e701684..cf41fd4 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -136,6 +136,7 @@
 		let absy = Math.abs(y - pageY.value)
 		if (absy > 30 && absx+10<absy&& absx<70) {
 			if(v.zk==false){
+				v.scrollleft = 1
 				 setTimeout(()=>{
 					v.scrollleft = 0
 				 },20)
@@ -460,6 +461,7 @@
 				>image {
 					width: 100%;
 					height: 100%;
+					border-radius: 1.1vw;
 				}
 			}
 		}
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 464a970..ff93a0b 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -120,7 +120,6 @@
 	 }
 	 
 	 const addcartory =(e:any)=>{
-	 	console.log(`eeeeeeeeeee`,e)
 	 	 caigouobj.value = e;
 		 
 	 	 addflag.value = true;
@@ -173,7 +172,6 @@
 		const delindex =()=>{
 			let delstr = delobj.value.id;
 			deleteQgInfoById(delstr).then(res=>{
-				
 				if(res.success){
 					uni.showToast({
 						icon:res.success?'success':'none',
@@ -247,7 +245,17 @@
 					wlParamInfo:v.wlMaterialNo,
 				 }
 				queryShoppingCartList(forms).then(res => { 
-					let obj = res.result.records[0];
+					let obj = {};
+					if(res.result.records.length>1){
+						res.result.records.forEach(item=>{
+							if(item.id==v.id){
+								obj = item
+							}
+						})
+					}else{
+						obj = res.result.records[0];
+					}
+					
 					 InvoicingList.value.forEach((item,i)=>{
 					 	if(item.id == obj.id){
 							obj.flag = v.flag;
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" />
diff --git a/static/index/newindex/states/les.png b/static/index/newindex/states/les.png
new file mode 100644
index 0000000..8fa75d5
Binary files /dev/null and b/static/index/newindex/states/les.png differ
diff --git a/static/index/newindex/states/ris.png b/static/index/newindex/states/ris.png
new file mode 100644
index 0000000..10c785d
Binary files /dev/null and b/static/index/newindex/states/ris.png differ
diff --git a/static/shouye/ck/c0.png b/static/shouye/ck/c0.png
index 0daf148..eec4cf1 100644
Binary files a/static/shouye/ck/c0.png and b/static/shouye/ck/c0.png differ
diff --git a/static/shouye/ck/h0.png b/static/shouye/ck/h0.png
index f3ebfc6..13c1687 100644
Binary files a/static/shouye/ck/h0.png and b/static/shouye/ck/h0.png differ
diff --git a/static/shouye/ck/j0.png b/static/shouye/ck/j0.png
index ca4c8e8..d215b0c 100644
Binary files a/static/shouye/ck/j0.png and b/static/shouye/ck/j0.png differ
diff --git a/static/shouye/ck/p0.png b/static/shouye/ck/p0.png
index 5e7c1ff..0e495b9 100644
Binary files a/static/shouye/ck/p0.png and b/static/shouye/ck/p0.png differ
diff --git a/static/shouye/ck/q0.png b/static/shouye/ck/q0.png
index dbacb72..5e7139e 100644
Binary files a/static/shouye/ck/q0.png and b/static/shouye/ck/q0.png differ
diff --git a/static/shouye/ck/t0.png b/static/shouye/ck/t0.png
index a709ade..83f788b 100644
Binary files a/static/shouye/ck/t0.png and b/static/shouye/ck/t0.png differ
diff --git a/static/shouye/ck/w0.png b/static/shouye/ck/w0.png
index 09717d3..9ed7a10 100644
Binary files a/static/shouye/ck/w0.png and b/static/shouye/ck/w0.png differ
diff --git a/static/shouye/sy/f0.png b/static/shouye/sy/f0.png
index 71597af..f1a6bab 100644
Binary files a/static/shouye/sy/f0.png and b/static/shouye/sy/f0.png differ
diff --git a/static/shouye/sy/g0.png b/static/shouye/sy/g0.png
index 8c54c36..9b6e01a 100644
Binary files a/static/shouye/sy/g0.png and b/static/shouye/sy/g0.png differ
diff --git a/static/shouye/sy/h0.png b/static/shouye/sy/h0.png
index f3ebfc6..13c1687 100644
Binary files a/static/shouye/sy/h0.png and b/static/shouye/sy/h0.png differ
diff --git a/static/shouye/sy/l0.png b/static/shouye/sy/l0.png
index f54a6ea..4bf954a 100644
Binary files a/static/shouye/sy/l0.png and b/static/shouye/sy/l0.png differ
diff --git a/static/shouye/sy/n0.png b/static/shouye/sy/n0.png
index 707957b..70f6688 100644
Binary files a/static/shouye/sy/n0.png and b/static/shouye/sy/n0.png differ
diff --git a/static/shouye/sy/y0.png b/static/shouye/sy/y0.png
index 732799e..c8e17c6 100644
Binary files a/static/shouye/sy/y0.png and b/static/shouye/sy/y0.png differ
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index cb24fb3..0f26729 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -570,7 +570,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index 3c0ae68..aab70ef 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };