From 1252d9b212367dbbcb5314b1fa30a79ad2def679 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 30 Jan 2026 17:32:40 +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/public/newgame/sxy-Timeing.vue      |   2 +-
 component/public/severcard.vue                | 117 ++++++---
 manifest.json                                 |   4 +-
 pages/NursingNew/component/index.vue          |   3 +-
 .../component/leftcontent/serveswipe.vue      | 232 ++++++++++++++----
 .../component/leftcontent/sxy-Timeing.vue     |   2 +-
 static/index/newindex/leftmenu/openleft.png   | Bin 2044 -> 2465 bytes
 static/index/newindex/leftmenu/openright.png  | Bin 0 -> 2466 bytes
 static/index/newindex/states/cardbg.png       | Bin 0 -> 11223 bytes
 static/index/newindex/states/lesd.png         | Bin 0 -> 1168 bytes
 static/index/newindex/states/risd.png         | Bin 0 -> 1161 bytes
 unpackage/dist/dev/.nvue/pages/camera.js      |   2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js  |   2 +-
 13 files changed, 268 insertions(+), 96 deletions(-)
 create mode 100644 static/index/newindex/leftmenu/openright.png
 create mode 100644 static/index/newindex/states/cardbg.png
 create mode 100644 static/index/newindex/states/lesd.png
 create mode 100644 static/index/newindex/states/risd.png

diff --git a/component/public/newgame/sxy-Timeing.vue b/component/public/newgame/sxy-Timeing.vue
index 891c9ec..9577406 100644
--- a/component/public/newgame/sxy-Timeing.vue
+++ b/component/public/newgame/sxy-Timeing.vue
@@ -132,7 +132,7 @@ export default {
           // clearInterval(this.timerTwo);
           // clearInterval(this.timer);
         }
-		if(flag == this.timeoutDuration){
+		if(flag >= this.timeoutDuration+2 && this.isDown == false){
 			clearInterval(this.timerTwo);
 			clearInterval(this.timer);
 			this.$emit('timeend')
diff --git a/component/public/severcard.vue b/component/public/severcard.vue
index edbfbe1..b069db0 100644
--- a/component/public/severcard.vue
+++ b/component/public/severcard.vue
@@ -1,24 +1,33 @@
 <template>
 	<view v-if="flag">
 		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}">
-			<view class="btn les" @click="swip(-1)" v-if="plsbuy.length>1" >
+			<view class="cardbg">
+				<image src="/static/index/newindex/states/cardbg.png" class="caimg"></image>
+				<view class="left-open" @click="openleft = !openleft">
+					<image  class="open-img" :src="openleft?'/static/index/newindex/states/lesd.png':'/static/index/newindex/states/risd.png'" />
+				</view>
+			</view>
+			<view class="btn les" @click="swip(-1)" v-if="plsbuy.length>1">
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`"
 					style="transform: rotate(180deg);" />
 			</view>
-			<view class="btn ris" @click="swip(1)"v-if="plsbuy.length>1" >
+			<view class="btn ris" @click="swip(1)" v-if="plsbuy.length>1">
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
 			</view>
-			<view class="bots" v-if="plsbuy.length>1" >
-				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"></view>
+			<view class="bots" v-if="plsbuy.length>1">
+				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
+					:style="v?.chaoshitime?'background:red':''" @click="change({detail:{current:i}})"></view>
 			</view>
 			<swiper class="swiper" :circular="true" :indicator-dots="false" easing-function="easeInOutCubic"
 				:autoplay="false" :interval="3000" :duration="500" :current="current" @change="change">
 				<swiper-item v-for="(qcobj,i) in plsbuy" :key="i" class="swper">
 					<view class="fixed-card-left">
-						<image class="card-left-img"  v-if="qcobj.izPackage=='Y' "src="/static/zlb.png" mode="aspectFill" />
-						<image class="card-left-img"  v-if="qcobj.izPackage=='N'" :src="qcobj?.previewFile? serverUrl + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`"
+						<image class="card-left-img" v-if="qcobj.izPackage=='Y' " src="/static/zlb.png"
 							mode="aspectFill" />
-						<view >
+						<image class="card-left-img" v-if="qcobj.izPackage=='N'"
+							:src="qcobj?.previewFile? serverUrl + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`"
+							mode="aspectFill" />
+						<view>
 							{{qcobj.directiveName}}
 						</view>
 					</view>
@@ -29,7 +38,8 @@
 								<!--  - {{qcobj.endTime?.slice(11, 16) }} -->
 							</view>
 							<view>
-								<timeing v-if="current==i&&qcobj?.izStart=='Y'" :initTime="djstinme" :timeoutDuration="Number(qcobj.timeoutDuration)" @timeend="timeend"></timeing>
+								<timeing v-if="current==i&&qcobj?.izStart=='Y'" :initTime="djstinme"
+									:timeoutDuration="Number(qcobj.timeoutDuration)*60" @timeend="timeend"></timeing>
 							</view>
 						</view>
 						<view class="names">
@@ -56,13 +66,10 @@
 							</view>
 						</view>
 					</view>
-					
+
 				</swiper-item>
 			</swiper>
-			<view class="left-open" @click="openleft = !openleft">
-				<image :style="openleft?{}:{transform: `rotate(180deg)`}" class="open-img"
-					src="/static/index/newindex/leftmenu/openleft.png" />
-			</view>
+			
 		</view>
 
 		<tanchuang :show="open>0" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang>
@@ -114,8 +121,10 @@
 			timeacde()
 		}
 	}
-	const timeend = () =>{
+	const timeend = () => {
 		// 结束超时
+		console.log('倒计时到了')
+		plsbuy.value.splice(current.value, 1)
 		firstgetqueryCgdList()
 	}
 	const djstinme = ref(0)
@@ -129,18 +138,36 @@
 		console.log(times, '当前时间戳')
 		console.log(Math.round(djs / 1000), '倒计时时间戳')
 		djstinme.value = Math.round(djs / 1000)
+		if (djstinme.value < 0) {
+			plsbuy.value[current.value].chaoshitime = true
+		}
 	}
 	const plsbuy = ref([])
 	const firstgetqueryCgdList = () => {
+		form.nuId=uni.getStorageSync('nuId');
 		queryOrderlist(form).then(res => {
 			plsbuy.value = res.result.records
+			if(plsbuy.value.length==0){
+				flag.value = false;
+			}
 			plsbuy.value.forEach((item, i) => {
-				console.log(item)
-				if (item.izStart == 'Y'&&flag.value == false) {
+				
+				if (item.izStart == 'Y' && flag.value == false) {
 					openleft.value = true;
 					flag.value = true;
 					current.value = i;
-					change({detail:{current:current.value}})
+					if (current.value > plsbuy.value.length - 1) {
+						current.value += -1
+						change({ detail: { current: current.value } })
+					} else {
+						change({ detail: { current: current.value } })
+					}
+				}
+				let timestampMs = new Date(item.endTime).getTime();
+				let times = new Date().getTime();
+				let djs = timestampMs - times;
+				if (djs < 0) {
+					item.chaoshitime = true
 				}
 			})
 			// clickLeftMenu(0,res.result.records[0])
@@ -208,23 +235,20 @@
 <style lang="less" scoped>
 	.left-open {
 		position: absolute;
-		left: -1.5vw;
+		left: 0.75vw;
 		top: 50%;
 		transform: translateY(-50%);
-		width: 3vw;
-		height: 5vw;
-		border: 1rpx solid #B8C4DA;
-		background-color: #F2F7FD;
+		width: 0.5vw;
+		height: 1.5vw;
 		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;
+			width: 0.5vw;
+			height: 1.5vw;
 		}
 	}
 
@@ -234,21 +258,32 @@
 		top: 2vh;
 		width: 35vw;
 		height: 17.5vw;
-		background-color: rgba(239, 246, 255, 0.95);
 		border-radius: 1.5vw;
-		border: 1rpx solid #638DFF;
-		box-shadow: 0 2rpx 6rpx #A0B9FF;
 		transition: all 0.5s ease;
 		z-index: 999;
+		background:rgba(239, 246, 255, 0.6);
+
+		.cardbg {
+			width: 36.5vw;
+			height: 18.5vw;
+			position: absolute;
+			top: -0.5vw;
+			right: -0.5vw;
+			.caimg{
+				width: 100%;
+				height: 100%;
+			}
+		}
+
 		.bots {
 			width: 15vw;
 			position: absolute;
 			height: 30rpx;
-			bottom: 1.6vw;
+			bottom:2vw;
 			left: 0;
 			display: flex;
 			justify-content: center;
-		
+
 			view {
 				width: 1.3vw;
 				height: 0.6vw;
@@ -256,41 +291,43 @@
 				border-radius: 0.2vw;
 				margin: 0.7vw;
 			}
-		
+
 			.dot {
 				background: #0193F4;
 			}
 		}
-		
+
 		.btn {
 			width: 2.4vw;
 			height: 2.4vw;
-			background: #F8F8F8;
 			border-radius: 50%;
 			position: absolute;
-			top:6.4vw;
+			top: 50%;
+			transform: translateY(-50%);
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			z-index: 99;
-		
+
 			image {
 				width: 60%;
 				height: 60%;
 			}
 		}
-		
+
 		.les {
 			left: 0.5vw;
 		}
-		
+
 		.ris {
 			right: 0.5vw;
 		}
-		.swiper{
+
+		.swiper {
 			width: 100%;
 			height: 100%;
-			.swper{
+
+			.swper {
 				width: 100%;
 				height: 100%;
 				position: relative;
@@ -304,6 +341,8 @@
 			flex-direction: column;
 			align-items: center;
 			margin: 0 2vw;
+			position: relative;
+			top: -1vw;
 
 			.card-left-img {
 				width: 9vw;
diff --git a/manifest.json b/manifest.json
index 2f7b35d..bba4ca7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.0.027",
-    "versionCode" : 10027,
+    "versionName" : "1.0.028",
+    "versionCode" : 10028,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 2f6fdc9..0345b4f 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -279,7 +279,7 @@
 		 
 			
 				
-	<severcard ref="severcards"></severcard>
+	<!-- <severcard ref="severcards"></severcard> -->
 </template>
 
 <script setup lang="ts">
@@ -638,7 +638,6 @@
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
-		severcards.value.firstgetqueryCgdList()
 		inits(data.nuId)
 		hlylhq(data.nuId,data.elderInfo?.id)
 		zlfunc(data.nuId,data.elderInfo?.id)
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index 2d8ff36..e2ea7d9 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -1,6 +1,15 @@
 <template>
 	<view>
 		<view class="swipeservwe">
+			<view class="swper" v-if="plsbuy.length==0">
+				<view class="photo-father">
+					<image class="big-img"  style="width: 550rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
+					<view class="juzhong" style=" filter:grayscale(60%)" >
+						<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="true" :loop="true"
+							:interval="120" />
+					</view>
+				</view>
+			</view>
 			<view class="btn les" @click="swip(-1)" v-if="plsbuy.length>1">
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`"
 					style="transform: rotate(180deg);" />
@@ -9,7 +18,7 @@
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
 			</view>
 			<view class="bots" v-if="plsbuy.length>1">
-				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"></view>
+				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''" :style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view>
 			</view>
 			<swiper class="swiper" :circular="true" :indicator-dots="false" easing-function="easeInOutCubic"
 				:autoplay="autoplay" :interval="3000" :duration="500" :current="current" @change="change">
@@ -20,9 +29,9 @@
 							<donghua :width="`1000rpx`" :height="`700rpx`" :links="blueArray" :playing="current==i"
 								:loop="true" :interval="120" />
 						</view>
-						<view class="timedjs">
+						<view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'" >
 							<text>服务倒计时</text>
-							<timeing v-if="current==i&&indexmessage?.izStart=='Y'" :initTime="djstinme" :timeoutDuration="Number(indexmessage.timeoutDuration)" @timeend="timeend"></timeing>
+							<timeing :initTime="djstinme" :timeoutDuration="Number(indexmessage.timeoutDuration)*60" @timeend="timeend"></timeing>
 						</view>
 						<view class="weight-time">
 							<view>
@@ -44,13 +53,15 @@
 						</view>
 						<view class="cardbox" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'||indexmessage.flag">
 							<scroll-view scroll-y="true" class="scrollcard" @touchmove.stop>
-								<view class="itemcard" v-for="(v,i) in zlarr" :key='i' :class="v.flag?'act':''" @click="zldex(v)">
-									<image :src="!v.flag?`/static/index/newindex/states/xs.png`:'/static/index/newindex/states/xsz.png'" />
-									<text>强直屈曲洗手</text>
-									<view v-if="i>2">(大体重)</view>
-									<!-- <image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
-											<text >{{v.directiveName?.substring(0,4)}}</text>
-											<view>{{v.directiveName?.substring(4,12)}}</view> -->
+								<view class="itemcard" v-for="(v,s) in indexmessage.servebao"  :class="{'act':v.flag,'last':v.last}"  :key='s' @click="zldex(v,indexmessage.servebao,s)">
+									<view class="brcard">
+										<view class="bgs" v-if="v.last">
+											<image src="/static/index/newtarget.png" mode=""></image>
+										</view> 
+									</view>
+									<image :src="!v.flag? serverUrl + v.immediateFile: serverUrl + v.immediateFileFocus" />
+									<text>{{v.match[0]}}</text>
+									<view v-if="v.match[1]" style="position: relative;z-index: 2;">({{v.match[1]}})</view>
 								</view>
 							</scroll-view>
 						</view>
@@ -107,14 +118,14 @@
 							</view>
 							<view @click="errmsgclk(1,1,indexmessage)">
 								<view class="left-ball"
-									:style="indexmessage?.mp3File!=''?' ':'opacity: 0.4'">
+									:style="indexmessage?.mp3File!=''&&indexmessage.izPackage!='Y'?' ':'opacity: 0.4'">
 									<image class="left-menu-img"
 										:src="'/static/index/newindex/leftmenu/left'+1+'.png'" />
 								</view>
 							</view>
 							<view  @click="errmsgclk(2,1,indexmessage)" >
 								<view class="left-ball"
-									:style="indexmessage?.mp4File!=''?' ':'opacity: 0.4'">
+									:style="indexmessage?.mp4File!=''&&indexmessage.izPackage!='Y'?' ':'opacity: 0.4'">
 									<image class="left-menu-img"
 										:src="'/static/index/newindex/leftmenu/left'+2+'.png'" />
 								</view>
@@ -141,7 +152,7 @@
 									</view>
 								</view>
 								<view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;" @click="zhixing(2,indexmessage)">
-									<view class="white-circle">
+									<view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''">
 										<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
 										<view class="right-menu-name">
 											协助执行
@@ -255,10 +266,10 @@
 			</view>
 		</view>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
+		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  style="left: 44%;"/>
 
 
-
-		<severcard ref="severcards" style="display: none;"></severcard>
+		<severcard ref="severcards" ></severcard>
 	</view>
 </template>
 
@@ -278,8 +289,13 @@
 	const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const current = ref(0)
 	const autoplay = ref(false)
+	const severcards = ref<InstanceType<typeof ChildComponent>>()
 	const init = (e) => {
-		firstgetqueryCgdList(e)
+		firstgetqueryCgdList(e);
+		setTimeout(()=>{
+			console.log(111)
+			severcards.value.firstgetqueryCgdList()
+		},120)
 	}
 	defineExpose({
 		init
@@ -305,10 +321,14 @@
 		console.log(timestampMs,'结束时间戳')
 		console.log(times,'当前时间戳')
 		console.log(Math.round(djs/1000),'倒计时时间戳')
-		djstinme.value = Math.round(djs/1000)
+		djstinme.value = Math.round(djs/1000);
+		if(djstinme.value<0){
+			plsbuy.value[current.value].chaoshitime = true
+		}
 	}
 	const timeend = () =>{
 		// 结束超时
+		plsbuy.value.splice(current.value,1)
 		firstgetqueryCgdList(form.nuId)
 	}
 	const swip = (e) => {
@@ -337,11 +357,13 @@
 	const zdxzdex = ref(0)
 	const zdxzarr = ref(0)
 	const zhixing = (e,indexmessage) => {
-		if (indexmessage.value?.izStart == 'Y' && e == 1) {
-			uni.showToast({
-				title: '服务中不能转单！',
-				icon: 'none'
-			})
+		if (indexmessage?.izStart == 'Y' ) {
+			errmsg.value = (e==1?"服务中不能转单执行！":'服务中不能协助执行！')
+			openerror.value = true
+			return
+		}else{
+			errmsg.value ='敬请期待~'
+			openerror.value = true
 			return
 		}
 		queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
@@ -446,6 +468,39 @@
 				}
 			})
 		}
+	}
+		function splitString(str) {
+			let result = [];
+			let remainingStr = str;
+			let regex = /([^（(]*)[（(]([^）)]+)[）)]/;
+			while (regex.test(remainingStr)) {
+				let match = remainingStr.match(regex);
+				if (match) {
+					// 添加括号前的部分（去掉空白）
+					if (match[1]?.trim()) {
+						result.push(match[1].trim());
+					}
+					if (match[2]?.trim()) {
+						result.push(match[2].trim());
+					}
+					remainingStr = remainingStr.replace(match[0], '')?.trim();
+				}
+			}
+			if (remainingStr?.trim()) {
+				result.push(remainingStr?.trim());
+			}
+			return result;
+		}
+	const clickLeftMenu = (index : any, item : object) => {
+		queryOrderInfoList({ mainId: item.id }).then(res => {
+			if (res.result.length > 0) {
+				res.result.forEach((item,i)=>{
+					item.flag = false;
+					item.match = splitString(item.directiveName) 
+				})
+				 plsbuy.value[index].servebao = res.result
+			} 
+		})
 	}
 	// const indexmessage = ref({});
 	const firstgetqueryCgdList = (nuId) => {
@@ -453,18 +508,27 @@
 		queryOrderList(form).then(res => { 
 			console.log(res.result.records)
 			if (res.result.records.length > 0) {
-				res.result.records.forEach(item=>{
-					item.flag = false 
+				res.result.records.forEach((item,l)=>{
+					item.flag = false ;
+					item.servebao = [];
+					let timestampMs = new Date(item.endTime).getTime();
+					let times  = new Date().getTime();
+					let djs = timestampMs -  times;
+					if(djs<0){
+						item.chaoshitime = true
+					}
+					if(item.izPackage=='Y'){
+						clickLeftMenu(l,item)
+					}
 				})
 				plsbuy.value = res.result.records;
 				change({detail:{current:current.value}})
-				// indexmessage.value = res.result.records[0]
-				// clickLeftMenu(0,res.result.records[0])
 			} else {
 				plsbuy.value = [];
 			}
 		})
 	}
+	
 	const submit = () => {
 		let sub = "";
 		ilanarr.value.forEach(item => {
@@ -584,7 +648,6 @@
 			});
 		}
 	}
-	const severcards = ref<InstanceType<typeof ChildComponent>>()
 	const start = (v) => {
 		if (v.izStart != 'N') { return }
 		startOrder({ id: v.id }).then(res => {
@@ -592,6 +655,7 @@
 			if (res.success) {
 				v.izStart = "Y";
 				severcards.value.firstgetqueryCgdList()
+				timeacde()
 			} else {
 
 
@@ -611,7 +675,7 @@
 			if (res.success) {
 				open.value = 0;
 				endobj.value = {};
-				// severcards.value.firstgetqueryCgdList()
+				severcards.value.firstgetqueryCgdList()
 				firstgetqueryCgdList(uni.getStorageSync('nuId'))
 			} else {
 
@@ -622,8 +686,28 @@
 	const errmsg = ref('')
 	const openerror = ref(false);
 	const errmsgclk = (e, k, indexmessage) => {
+		console.log(e, k, indexmessage)
 		if (k == 1) {
-			if (indexmessage.value?.izStart == 'Y') {
+			if(indexmessage.izPackage=='Y'&&e==0){
+				
+				if(indexmessage.flag||indexmessage.izStart == 'Y'){
+						let last = indexmessage.servebao.find(item => item.last === true);
+						console.log(last)
+						if(!!last){
+							errmsg.value = last?.serviceContent==''?'暂无数据':last?.serviceContent
+							openerror.value = true;
+						}else{
+							errmsg.value = indexmessage?.serviceContent
+							openerror.value = true;
+						}
+				}else{
+					errmsg.value = indexmessage?.serviceContent
+					openerror.value = true;
+				}
+				
+			}
+			
+			if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') {
 				switch (e) {
 					case 0:
 						if (indexmessage?.serviceContent == '') { return }
@@ -685,9 +769,33 @@
 	const fwzlindex = ref(0);
 	const fwzldex = ref(-1);
 	const fwzlarr = ref(0);
-	const zlarr = ref([{ flag: false }, { flag: false }, { flag: false }, { flag: false }, { flag: false }, { flag: false }, { flag: false }, { flag: false }, { flag: false }]);
-	const zldex = (e) => {
+	const fwzlbobj = ref({})
+	const zldex = (e,f,k) => {
 		e.flag = !e.flag
+		if(e.flag){
+			e.last = true;
+			f.forEach((item,i)=>{
+				if(k!=i){
+					item.last = false;
+				}
+			})
+		}else{
+			if(e.last == false){return}
+			e.last = false;
+			let arr = []
+			f.forEach((item,i)=>{
+				if(item.flag){
+					arr.push(i)
+				}
+			})
+			if(arr.length==0){
+				
+			}else{
+				f[arr[arr.length-1]].last = true;
+				fwzlbobj.value = f[arr.length-1]
+			}
+		}
+		
 	}
 
 	const base = genPaths(
@@ -839,16 +947,17 @@
 			right: 1.5vw;
 		}
 
-		.swiper {
-			width: 100%;
-			height: 100%;
-
-			.swper {
-				width: 100%;
-				height: 100%;
-				position: relative;
-			}
-		}
+		
+		
+	}
+	.swiper {
+		width: 100%;
+		height: 100%;
+	}
+	.swper {
+		width: 100%;
+		height: 100%;
+		position: relative;
 	}
 
 	.lanbt {
@@ -917,7 +1026,7 @@
 		top: 15%;
 		left: 50%;
 		transform: translate(-50%, -25%);
-		z-index: -1;
+		z-index: 1;
 	}
 
 	.cardbox {
@@ -948,17 +1057,18 @@
 			.itemcard {
 				width: 11.2vw;
 				height: 8vw;
-				background: rgba(255,255,255,0.5);
-				border-radius: 1.6vw;
 				margin: 1.2vw 1.5vw 0 0vw;
 				display: inline-block;
-				border: 2rpx solid #DCDCDC;
 				text-align: center;
+				position: relative;
+				overflow: hidden;
 
 				image {
 					width: 3.3vw;
 					height: 3.3vw;
 					margin: 0.8vw auto 0vw;
+					position: relative;
+					z-index: 2;
 				}
 
 				text {
@@ -971,6 +1081,8 @@
 					width: 100%;
 					text-overflow: ellipsis;
 					overflow: hidden;
+					position: relative;
+					z-index: 2;
 				}
 
 				view {
@@ -982,11 +1094,33 @@
 				}
 
 			}
-
+			.brcard{
+				width: 11.2vw;
+				height: 8vw;
+				border-radius: 1.6vw;
+				border: 2rpx solid #DCDCDC;
+				position: absolute;
+				top: 0vw;
+				bottom:0vw; 
+				background: rgba(255,255,255,0.5);
+				z-index: 0;
+			}
+			.bgs{
+				width: 11.2vw;
+				height: 8vw;
+				position: absolute;
+				top: -1.05vw;
+				left:-0.15vw; 
+				image{
+					width: 103%;
+					height: 105%;
+				}
+			}
 			.act {
-				background: rgba(255,255,255,0.6);
-				border: 2rpx dashed #0089FE;
-
+				.brcard{
+					background: rgba(255,255,255,0.6);
+					border: 2rpx dashed #0089FE;
+				}
 				text,
 				view {
 					color: #017DE9;
diff --git a/pages/NursingNew/component/leftcontent/sxy-Timeing.vue b/pages/NursingNew/component/leftcontent/sxy-Timeing.vue
index a24037e..843e0ea 100644
--- a/pages/NursingNew/component/leftcontent/sxy-Timeing.vue
+++ b/pages/NursingNew/component/leftcontent/sxy-Timeing.vue
@@ -137,7 +137,7 @@ export default {
           // clearInterval(this.timerTwo);
           // clearInterval(this.timer);
         }
-		if(flag == this.timeoutDuration&&this.isDown == false){
+		if(flag >= this.timeoutDuration+2 && this.isDown == false){
 			clearInterval(this.timerTwo);
 			clearInterval(this.timer);
 			this.$emit('timeend')
diff --git a/static/index/newindex/leftmenu/openleft.png b/static/index/newindex/leftmenu/openleft.png
index 0a47d8bdad2cc2b71d79862b58d890b4d53deb73..4002c55a8d6be26898ac03aef405d7c76240cdcc 100644
GIT binary patch
literal 2465
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

literal 2044
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
a^M3=lqDPJBar>_T0000<MNUMnLSTY&)W-|}

diff --git a/static/index/newindex/leftmenu/openright.png b/static/index/newindex/leftmenu/openright.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e03160cd6d90bd75fac31fd8d3b4f2de7bc875b
GIT binary patch
literal 2466
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

literal 0
HcmV?d00001

diff --git a/static/index/newindex/states/cardbg.png b/static/index/newindex/states/cardbg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2259fadbb588ca64ec34c2310005114b13a81a6d
GIT binary patch
literal 11223
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

literal 0
HcmV?d00001

diff --git a/static/index/newindex/states/lesd.png b/static/index/newindex/states/lesd.png
new file mode 100644
index 0000000000000000000000000000000000000000..954b599e72fd72ee9f49cbb3c0084a6ad4014f01
GIT binary patch
literal 1168
zcmaJ=O=uid93M%nYqStGD8@s_2|@+m%$u2=k2hqS{g}io&BkTB+JK;)dGj_Il9@N1
zd2u&EF%<=CMG%UhD6zp)3qqlS;GrHYqF%&{n2X>+ER}fipiqc!lHJ%t=)lbTnE&th
z|NXztH|L){Ix;>Y2*T0&tlQ%2{rnv(9O2)We|hYAzC6yR7uYG<VO=jJLM5O+5$ln+
zNLs`T*3N!MCIw;Wt+2ho78-L7rjhLBHgYdYI9d=Ur+SHpmkASnvKYoC>94P@OJW$5
zq|-(NHj)}y3TM|-a%z3Pjn|hk3Z$tM;$+X^1QB7L*o#);%;}Y+Jzj_J^J_&C_e|Jw
zN!k~+&}fP^ni3JoD!>qGqJ?DQV_S!&W<4WnP%{*$DXIlD=oD2)x5fS=affNpaa!(7
z-yJ`dq$S1@M^U=nuH4mSnl36TLMZ3ZG{7xDwiYw52jXmEz~GV$r(wcE8jCrj=hIbI
zlDOFYD59j%I3SL*ey(`dl%AI;stlDV%0t_;&RC25FXK?_ti6^HrA0Ejnqpp(&cp!B
z(|31Axgl5MJeP*NF5Zeu@oGe3R(DGh|04%s-~_m+>zWQhVEPE~lMg&(Xh1gutOfz<
z@E#cO9ELB#Vnx@D>WqtARh@xVx29Gty=I%PYE&T{VC!+lycm;#?~wcMV=H&XI<=H|
zjHYc$R|bvHT%wF-OEeKRLsm8M_~|eXXg7O0FVcR@E=j{zNHCMqNZiY^6CR?#wvcLA
z76#BXA@Hms0-lX9Fnr&}2wH}Zu++x~cVutBQTYvzA{mHrR1HJ3<NLrgO$?A<)PNsY
zHs}=XB1E<qSg<20T%wXU&K-?3xZ>TJZx1Ge9}Z@V#C)JqJ~@pCUeBlQQr)ezd)xl)
z-QB67C%^utJbb3|`=3*1pZM(N=;&_uTJwt=q*WMwap-E{#I5f?WyfBaE?;@@+(mWt
z`hCAW_2t~in?K#!*!lOplkY!r@udq&;o7CY>#x2uTps@Ma`&IH*EZJ6<C|MQG`9<z
zTe!K+_n$Pkk8N&Ely5)uwz09(`u1|+k1M~<dSe%qokuG-XFsmr`_Wwa-1&#WyX})7
b3ililZv1>4ec+5=&DGYY=iSe%XWsY^t9yN6

literal 0
HcmV?d00001

diff --git a/static/index/newindex/states/risd.png b/static/index/newindex/states/risd.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7162fff0525ffd1f0fafef451199a0a54988a2c
GIT binary patch
literal 1161
zcmaJ>O>Epm6n01`ZO}>xMWyWljhu>Zq}m?;tnD#bO1j=98?otXcOmJi*fX<PE9)QZ
zNp=${2muv^3*v;}QgNUcBm_4^1sv!BkT{eRAcSapsKlj3LWlzb#>sBzA*v;N{@(Y!
z@4b1?Z#0*mDNLW376hSCUvyi1Ji_0Z!-x3y!jF$V$A{yry2{#dmkqp>3JWCmDX53u
z8f{UJY`ypmofm}3i$Q0Vtu~%@a2(2BZX*xFgrfyv{>(7(@H%C{r)xn}7VljBQUn1h
ziz}rDY$O%h3l_Ii+TLF7;O%vch<N5HFh6uSK}eYghG9R-oMBnq<#qTx-&RDhYr@vc
z;-0A0MiW%xlmaBH5{6I%7LuutZ5^7LbsA_;D=AP@R7=vJW2la9gV7^$hbiegEw?su
z$5&;s$5`Sh%3v^%2f7@mYl?~x$~iPm;ucc26)|rpMcM3_!KE2agM<Zf1ad~tk2hFZ
z<YM=t2$M!*pE$}!x#C$<hF+qmGE~Aa4{g^vV=el>j03H+&Q?N|7R};~6!R<T&W^!6
zefM{i8*(+yxisMS;`QAaZ-g{rb+;_?6PX0WA=uD$O@|UOeI)UfFL|h>NxDg}N(k!m
z8W{5&gg49usJVt&bCIj6HHcuvUeIl;W>>7UR<%0D)}xGh5vF6`0rx$^mhOvnDk=3?
zoOa^4KQ4r3FJ^JpixZ%gWK{#jl^`PVAe+lCX)k7%rokp9wKNXFZkC<k00p*%)RJXk
z37RI9Jj+0mXCo|?eBZ_hS|uN0afB!LWN)uf`3{dF8H;gL4MVf*`;uvzSVF#`Nj|Y`
zscYB<M7BpP*cBBnQOOJEo<bUL@#@T{`<=lT`@KaY-cTv;oPQP@cX-#mS9cdW!=L=0
z2Y(-(lz;8LKYiuhW0!=l-&~&f{iXhiw;yz0{$b+Mt9R#qd;R<BUo+o5bo1QP{Ug`D
z{d8t$;%1?_d04K3j~`#UdZW!AU0T1@{$qOS;alyK7q1-qP@FC96fTRWiaS%6#S6vH
zC*Kh(;Q7}+yKTtT>&@-LBmaK&LGghlrS{g7M^FB#gD)npow_@x%|3Dc#*{E|NLV?4
WeCqTso1f%AhkA9{{pjoqulxrLHFDqp

literal 0
HcmV?d00001

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
 };