Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/leftcontent/serveswipe.vue

@@ -7,6 +7,9 @@
 			<view class="btn ris" @click="swip(1)">
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
 			</view>
+			<view class="bots">
+				<view v-for="(v,i) in 5" :key='i' :class="current==i?'dot':''"></view>
+			</view>
 			<swiper class="swiper" :circular="true" :indicator-dots="false"
 			easing-function="easeInOutCubic"
 			 :autoplay="autoplay" :interval="3000" :duration="500" :current="current" @change="change">
@@ -23,9 +26,10 @@
 					 	<view class="weight-time">
 					 		<view v-if="indexmessage?.startTime">
 					 			{{ indexmessage?.startTime.slice(11, 16)  }} 
-					 			-
-					 			{{ indexmessage?.endTime.slice(11, 16) }}
 					 		</view>
+							<view>
+								10:00
+							</view>
 					 		<view style="height: 5vw;" >
 					 		</view>
 					 		<view class="pao-father" >
@@ -35,19 +39,39 @@
 					 			</view>
 					 		</view>
 					 	</view>
+						<view class="cardbox" v-if="i==0">
+							<view class="shadow"></view>
+							<scroll-view scroll-y="true"  class="scrollcard">
+								<view style="width: 100%;height: 3.5vw;"></view>
+									<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>(大体重)</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>
+							</scroll-view>
+						</view>
+						<!-- https://www.focusnu.com/nursingunit101/sys/common/static/temp/1_1760592730764.png -->
+						<view class="big-img" v-else>
+							<!-- <image v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
+								:src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`"
+								 mode="aspectFill"/> -->
+								 <image :src="`/static/zhiniaoku.png`"
+								 :style="!indexmessage?.previewFile?'width: 450rpx':''"
+								 	 mode="aspectFill"/>
+						</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">
+					 		<view class="server-name" >
-					 			{{ indexmessage?.directiveName }} 
+					 			{{ indexmessage?.directiveName?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)">
@@ -59,8 +83,8 @@
 					 				结束服务
 					 			</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);'">
@@ -176,7 +200,7 @@
 	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 autoplay = ref(false)
 	const change = (e)=>{
 		console.log(e.detail.current)
 		console.log(current.value)
@@ -184,17 +208,14 @@
 	}
 	const swip = (e)=>{
 		if(current.value==0&&e==-1){
+			current.value = 4
 			return
 		}
 		if(current.value==4&&e==1){
+			current.value = 0
 			return
 		}
 		current.value+=e;
-		autoplay.value = false;
-		setTimeout(()=>{
-			autoplay.value = true;
-		},3000)
-		console.log(current.value)
 	}
 	const form = reactive({
 		pageNo: 1,
@@ -433,19 +454,11 @@
 	const fwzlindex = ref(0);
 	const fwzldex = ref(-1);
 	const fwzlarr = ref(0);
-	const zlarr = ref({});
+	const zlarr = ref([{flag:false},{flag:false},{flag:false},{flag:false},{flag:false},{flag:false},{flag:false},{flag:false},{flag:false}]);
-	const shtab = (e)=>{
+	const zldex = (e) =>{
-		fwzlindex.value = e;
+		e.flag = !e.flag
-		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_',
@@ -485,6 +498,25 @@
 		width: 65vw;
 		height: 70vh;
 		position: relative;
+		.bots{
+			width: 60%;
+			position: absolute;
+			height: 30rpx;
+			bottom: 0;
+			left: 20%;
+			display: flex;
+			justify-content: center;
+			view{
+				width: 1.3vw;
+				height: 0.6vw;
+				background: #DCDCDC;
+				border-radius: 0.2vw;
+				margin: 0.7vw;
+			}
+			.dot{
+				background: #0193F4;
+			}
+		}
 		.btn{
 			width: 2.4vw;
 			height:2.4vw;
@@ -564,7 +596,7 @@
 			position: absolute;
 			width: 7vw;
 			right: 4vw;
-			top: 2vw;
+			top: 0vw;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
@@ -583,7 +615,73 @@
 		// 禁止动画阻挡逻辑
 		z-index: -1;
 	}
+	.cardbox{
+		width:40vw;
+		height:35vh;
+		position: relative;
+		top: -5vh;
+		z-index: 55;
+		left: 2vw;
+		.shadow{
+			width: 100%;
+			height: 5.5vw;
+			position: absolute;
+			left: 0;
+			top: -1.5vw;
+			border-radius:0 0 25% 25%;
+			filter: blur(14rpx);
+			background: linear-gradient(to bottom, RGBA(239, 240, 244, 1), RGBA(239, 240, 244, 1));
+			z-index: 55;
+		}
+		.scrollcard{
+			width:42vw;
+			height:35vh;
+			position: relative;
 			
+				.itemcard{
+					width: 11.2vw;
+					height: 7.8vw;
+					background: #F8F8F8;
+					border-radius: 1.6vw;
+					margin: 1.2vw 1.5vw 0 0vw;
+					display: inline-block;
+					border: 1px solid #F8F8F8;
+					text-align: center;
+					image{
+						width: 2.4vw;
+						height: 2.4vw;
+						margin: 1.4vw auto 0vw;
+					}
+					text{
+						display: block;
+						text-align: center;
+						font-weight: 400;
+						font-size: 1.4vw;
+						color: #666666;
+						width: 100%;
+						white-space: nowrap;
+						width: 100%;
+						text-overflow: ellipsis;
+						overflow: hidden;
+					}
+					view{
+						text-align: center;
+						font-weight: 400;
+						font-size: 1.1vw;
+						color: #555;
+						width: 100%;
+					}
+					
+				}
+				.act{
+					background: #fff;
+					border: 1px dashed rgba(1,125,233,0.43);
+					text,view{
+						color: #017DE9;
+					}
+				}
+		}
+	}
 	.weight-time {
 		font-weight: 800;
 		font-size: 70rpx;
@@ -593,16 +691,19 @@
 	}
 	
 	.big-img {
-		margin-top: 40rpx;
 		height: 450rpx;
-		z-index: 10;
+		z-index: 100;
+		image{
+			width: 100%;
+			height: 100%;
+		}
 	}
 	
 	.server-name {
 		font-size: 35rpx;
 		margin-right: 10rpx;
 		font-weight: 600;
-		margin-top: 2vw;
+		margin-top: 1vw;
 	}
 	
 	.server-bgc {

pages/procurement/components/carditem.vue

@@ -89,6 +89,9 @@
 	const serverUrl = ref('')
 	onMounted(() => {
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
+		setTimeout(()=>{
+			console.log(serverUrl.value+props.InvoicingList[0].materialImg)
+		},3000)
 	})
 	const caigouobj = ref({})
 	const addcar = (v : any,i:number) => {

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

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