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

component/public/newgame/sxy-Timeing.vue

@@ -34,7 +34,7 @@ export default {
     initTime: {
       // 初始时间
       type: Number,
-      default: 10,
+      default:3600,
     },
     // isDown: {
     //   // 是否是倒计时
@@ -67,10 +67,6 @@ export default {
     this.cycle();
   },
   methods: {
-	  chongzhi(){
-		  this.initTime = 185
-		  this.cycle();
-	  },
     OneCycle(n) {
       // 一次翻页的周期
       let num = 0;
@@ -110,12 +106,12 @@ export default {
 			  }
 			}
 
-        this.faceZindex = num <= 25 ? 1 : 0;
-        this.backZindex = num <= 25 ? 0 : 1;
+        this.faceZindex = num <= 10 ? 1 : 0;
+        this.backZindex = num <= 10 ? 0 : 1;
 
         this.transformInfo = `perspective(500rpx) rotateX(-${(180 * num) / 50}deg)`;
      
-	  }, 20); // 将一秒钟分成50份。
+	  },5); // 将一秒钟分成50份。
     },
     cycle() {
 		let minutes = Math.floor(this.initTime / 60);

pages/NursingNew/component/index.vue

@@ -127,7 +127,7 @@
 			</view>
 		</view>
 		<view class="mengban" v-if="jszlshow" @click="jszlshow = false" ></view>
-		<serveswipe></serveswipe>
+		<serveswipe ref="serves"></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"
@@ -959,7 +959,7 @@
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
 		severcards.value.firstgetqueryCgdList()
-		firstgetqueryCgdList(data.nuId);
+		inits(data.nuId)
 		hlylhq(data.nuId,data.elderInfo?.id)
 		zlfunc(data.nuId,data.elderInfo?.id)
 		emit('swip')
@@ -1329,6 +1329,11 @@
 	
 		}
 	}
+	
+	const serves = ref<InstanceType<typeof ChildComponent>>();
+	const inits = (e) =>{
+		serves.value.init(e); 
+	}
 	const tagtarget = ref(-1);
 	const detail = ref("")
 	const leftnumber = ref(2.2)

pages/NursingNew/component/leftcontent/serveswipe.vue

@@ -8,14 +8,15 @@
 				<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 v-for="(v,i) in plsbuy" :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">
-				<swiper-item v-for="(indexmessage,i) in 5" :key="i" class="swper">
+				<swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper">
 					 <view class="photo-father" >
-					 	<view class="juzhong" style="margin-left: -30rpx;" :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}">
+						 <!-- {filter: `grayscale(60%)`} -->
+					 	<view class="juzhong"  :style="indexmessage?.startTime?{}:''">
 					 		<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
 					 			:interval="120" />
 					 	</view>
@@ -24,11 +25,9 @@
 							<timeing ></timeing>
 						</view>
 					 	<view class="weight-time">
-					 		<view v-if="indexmessage?.startTime">
-					 			{{ indexmessage?.startTime.slice(11, 16)  }} 
-					 		</view>
 							<view>
-								10:00
+								{{ indexmessage?.startTime.slice(11, 16)  }} 
+								<text style="font-size: 1.4vw;font-weight: 400;">|&nbsp; 30分钟</text>
 							</view>
 					 		<view style="height: 5vw;" >
 					 		</view>
@@ -39,14 +38,15 @@
 					 			</view>
 					 		</view>
 					 	</view>
-						<view class="cardbox" v-if="i==0">
-							<view class="shadow"></view>
+						<view class="big-img"  v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='N'">
+								<image :src="`/static/zlb.png`"  :style=" 'width: 450rpx' "  mode="aspectFill"/>
+						</view>
+						<view class="cardbox" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'">
 							<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> 
+										<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> -->
@@ -54,21 +54,29 @@
 							</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':''"
+						<view class="big-img"  v-if="indexmessage.izPackage=='N' ">
+							<image  :style="!indexmessage?.previewFile?'width: 450rpx':'width: 650rpx'"
 								: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"/>
+								 mode="aspectFill"/>
+								<!-- <image :src="`/static/zhiniaoku.png`"
+								 :style="!indexmessage?.previewFile?'width: 450rpx':'width: 650rpx'"
+								 	 mode="aspectFill"/> -->
 						</view>
 					 	
 					 	
 						
 						<view style="display: flex;align-items: center; ">
 					 		<view class="server-name" >
-					 			{{ indexmessage?.directiveName?indexmessage?.directiveName:'一级压疮防护' }} 
+					 			{{ indexmessage?.directiveName }} 
 					 		</view>
+							<view style="width: 6.5vw;height: 2vw;margin-left: 1vw;position: relative;" v-if="indexmessage?.categoryName">
+								<image src="/static/index/newindex/wendu/bgc.png" mode="aspectFill" 
+								style="width: 100%;height: 100%;position: relative;z-index: 0; margin-top: 0.4vw;"></image>
+								<view class="bgc-font"  
+								 style="top: 0;left: 0;padding-left:0.65vw;width: 100%;height: 100%;z-index: 2;position: absolute;line-height:2.9vw;font-size: 1.1vw;">
+									{{indexmessage?.categoryName }}
+								</view>
+							</view>
 					 	</view>
 						
 						
@@ -134,8 +142,7 @@
 						
 								</view>
 							</view>
-							<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`"
-								@click="scrollTop > (55* rightMenu.length) ? scrollTop = (55* rightMenu.length) : scrollTop += 115 " />
+							<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`"  />
 						</view>
 					 		
 					 </view>
@@ -194,16 +201,19 @@
 	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(false)
+	const init = (e)=>{
+		firstgetqueryCgdList(e)
+	}
+	defineExpose({
+		init
+	})
 	const change = (e)=>{
-		console.log(e.detail.current)
-		console.log(current.value)
 		current.value = e.detail.current
 	}
 	const swip = (e)=>{
@@ -248,15 +258,18 @@
 		})
 	}
 	const plsbuy = ref([])
+	// const indexmessage = ref({});
 	const firstgetqueryCgdList = (nuId) => {
 		form.nuId = nuId;
 		queryOrderList(form).then(res => {
 			console.log(form)
+			console.log(res.result.records)
 			if(res.result.records.length>0){
-				indexmessage.value = res.result.records[0]
+				plsbuy.value = res.result.records
+				// indexmessage.value = res.result.records[0]
 				// clickLeftMenu(0,res.result.records[0])
 			}else{
-				indexmessage.value = {};
+				plsbuy.value = [];
 			}
 		})
 	}
@@ -498,6 +511,7 @@
 		width: 65vw;
 		height: 70vh;
 		position: relative;
+		background-color: #F2F3F8;
 		.bots{
 			width: 60%;
 			position: absolute;
@@ -612,12 +626,11 @@
 		top: 0%;
 		left: 50%;
 		transform: translate(-50%, -20%);
-		// 禁止动画阻挡逻辑
 		z-index: -1;
 	}
 	.cardbox{
 		width:40vw;
-		height:35vh;
+		height:34vh;
 		position: relative;
 		top: -5vh;
 		z-index: 55;
@@ -640,25 +653,24 @@
 			
 				.itemcard{
 					width: 11.2vw;
-					height: 7.8vw;
+					height: 8vw;
 					background: #F8F8F8;
 					border-radius: 1.6vw;
 					margin: 1.2vw 1.5vw 0 0vw;
 					display: inline-block;
-					border: 1px solid #F8F8F8;
+					border: 2px solid #F8F8F8;
 					text-align: center;
 					image{
-						width: 2.4vw;
-						height: 2.4vw;
-						margin: 1.4vw auto 0vw;
+						width: 3.3vw;
+						height: 3.3vw;
+						margin: 0.8vw auto 0vw;
 					}
 					text{
 						display: block;
 						text-align: center;
 						font-weight: 400;
-						font-size: 1.4vw;
+						font-size: 1.3vw;
 						color: #666666;
-						width: 100%;
 						white-space: nowrap;
 						width: 100%;
 						text-overflow: ellipsis;
@@ -667,7 +679,7 @@
 					view{
 						text-align: center;
 						font-weight: 400;
-						font-size: 1.1vw;
+						font-size: 1vw;
 						color: #555;
 						width: 100%;
 					}
@@ -675,7 +687,7 @@
 				}
 				.act{
 					background: #fff;
-					border: 1px dashed rgba(1,125,233,0.43);
+					border: 2px dashed rgba(1,125,233,0.43);
 					text,view{
 						color: #017DE9;
 					}
@@ -691,8 +703,9 @@
 	}
 	
 	.big-img {
-		height: 450rpx;
+		height: 550rpx;
 		z-index: 100;
+		margin-top: -100rpx;
 		image{
 			width: 100%;
 			height: 100%;
@@ -760,7 +773,7 @@
 	
 	.pao-father {
 		position: absolute;
-		top: 20rpx;
+		top: -20rpx;
 		right: -110rpx;
 		font-size: 22rpx;
 		width: 100rpx;

pages/NursingNew/index.vue

@@ -256,7 +256,7 @@
 
 			let back = [
 				{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'hldy_ql' },
-				{ name: '智慧物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' },
+				{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' },
 				{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', type: 'back' }
 			]
 			arrlist.value.push(...back);