From d3c0b5c916825f5a61738ce193d992df3fff2d62 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 13 May 2022 17:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E4=BA=94=E5=88=86=E9=92=9F=E5=BF=83=E8=B7=B3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/header.vue           | 28 ++++++++++++++++++----------
 src/components/homepage.vue         |  9 ++++++++-
 src/components/kindIntroduction.vue |  8 ++++----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/components/header.vue b/src/components/header.vue
index 56a1331..309cd34 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -5,7 +5,7 @@
 			<!-- logo -->
 			<div class="logo-box">
 				<div class="logo">
-					<img v-if="logoImg!=''" :src="logoImg" style="object-fit: cover;">
+					<img v-if="logoImg!=''" :src="logoImg" style="object-fit: cover;flex-shrink: 0;">
 					<div style="display: flex;flex-direction: column;">
 						<span style="font-size: 33.8px;">{{className}}</span>
 						<!-- <span style="font-size: 33.8px;">都江堰市机关幼儿园</span> -->
@@ -39,17 +39,17 @@
 
 
 		<!-- 首页 -->
-		<homepage v-if="activeIndex==0" @numEv="numEv"></homepage>
+		<homepage v-show="activeIndex==0" @numEv="numEv"></homepage>
 		<!-- 幼儿园介绍 -->
-		<kindIntroduction v-if="activeIndex==1"></kindIntroduction>
+		<kindIntroduction v-show="activeIndex==1"></kindIntroduction>
 		<!-- 宝宝活动 -->
-		<babyActivity v-if="activeIndex==2"></babyActivity>
+		<babyActivity v-show="activeIndex==2"></babyActivity>
 		<!-- 出勤详情 -->
-		<attendanceDetail v-if="activeIndex==3" :current="currentIndex"></attendanceDetail>
+		<attendanceDetail v-show="activeIndex==3" :current="currentIndex"></attendanceDetail>
 		<!-- 宝宝相册 -->
-		<babyAlbum v-if="activeIndex==4"></babyAlbum>
+		<babyAlbum v-show="activeIndex==4"></babyAlbum>
 		<!-- 疫情管理 -->
-		<yiqingmanagement v-if="activeIndex==5"></yiqingmanagement>
+		<yiqingmanagement v-show="activeIndex==5"></yiqingmanagement>
 
 
 		<!-- 底部 -->
@@ -428,11 +428,19 @@
 			},
 			// 获取设备型号(设备id)
 			obtainEv() {
-				let Build = plus.android.importClass("android.os.Build");
-				let serial = Build.SERIAL;
-				this.$storage.set('EquipmentID',Build.SERIAL);
+				// let serial = Build.SERIAL;
 				// this.$storage.set('EquipmentID','B520P2RXM0');
 				// this.$storage.set('EquipmentID','ZSX100873');
+				// this.$storage.set('EquipmentID','YS01M006215190015810005072');
+				// this.$storage.set('EquipmentID','YS01M006214280022020005887');
+				// this.$storage.set('EquipmentID','YS01M006214280022500022555');
+				// this.$storage.set('EquipmentID','YS01M006215190028340008867');
+				// this.$storage.set('EquipmentID','YS01M006215190024770004633');
+				// this.$storage.set('EquipmentID','YS01M006215190025640009192');
+				// this.$storage.set('EquipmentID','YS01M006215190022450002190');
+				// this.$storage.set('EquipmentID','YS01M006215190026450017563');
+				let Build = plus.android.importClass("android.os.Build");
+				this.$storage.set('EquipmentID',Build.SERIAL);
 				this.classCardId = this.$storage.get('EquipmentID');
 				this.weatherEv();
 				this.introduce();
diff --git a/src/components/homepage.vue b/src/components/homepage.vue
index 907b8a8..452d0ff 100644
--- a/src/components/homepage.vue
+++ b/src/components/homepage.vue
@@ -204,7 +204,8 @@
 				diffHeight:'',
 				isNotice:false,
 				classTimer:null,//班级人数心跳事件
-				videoSrc:''//视频地址
+				videoSrc:'',//视频地址
+				swiperTime:null//班级动态心跳事件
 			};
 		},
 		destroyed() {
@@ -214,6 +215,7 @@
 			clearInterval(this.chuTime);
 			// 清除班级人数心跳
 			clearInterval(this.classTimer);
+			clearInterval(this.swiperTime);
 		},
 		methods: {
 			// 获取班级动态视频或图片列表
@@ -541,6 +543,11 @@
 				// 视频
 				this.getVideo();
 			},500)
+			// 清除班级人数心跳
+			clearInterval(this.swiperTime);
+			this.swiperTime = setInterval(()=>{
+				this.getVideo();
+			},1000*6*5)
 			setTimeout(()=>{
 				this.timer = setInterval(()=>{
 					// 宝宝提醒
diff --git a/src/components/kindIntroduction.vue b/src/components/kindIntroduction.vue
index ecf6ae2..45771d6 100644
--- a/src/components/kindIntroduction.vue
+++ b/src/components/kindIntroduction.vue
@@ -13,13 +13,13 @@
 			</div>
 			<div class="introduction-right">
 				<!-- 园区介绍 -->
-				<parkIntroduce v-if="navIndex==0"></parkIntroduce>
+				<parkIntroduce v-show="navIndex==0"></parkIntroduce>
 				<!-- 教师风采 -->
-				<teacherStyle v-if="navIndex==1"></teacherStyle>
+				<teacherStyle v-show="navIndex==1"></teacherStyle>
 				<!-- 新闻动态 -->
-				<newsInformation v-if="navIndex==2"></newsInformation>
+				<newsInformation v-show="navIndex==2"></newsInformation>
 				<!-- 公告信息 -->
-				<noticeInfo v-if="navIndex==3"></noticeInfo>
+				<noticeInfo v-show="navIndex==3"></noticeInfo>
 			</div>
 		</div>