Merge remote-tracking branch 'origin/master'

src/assets/css/sczpfyy.css

@@ -556,6 +556,7 @@
 	border-radius: 2px;
 	overflow: hidden;
 	display: flex;
+	height:550px
 }
 
 .fyynew-detail-photo .fyynew-detail-region img {
@@ -568,19 +569,20 @@
 
 .fyynew-detail-text {
 	position: absolute;
-	bottom: 20px;
-	left: 20px;
-	right: 20px
+	bottom: 30px;
+	left: 30px;
+	right: 30px
 }
 
 .fyynew-detail {
-	position: relative
+	position: relative;
+	padding:10px
 }
 
 .fyynew-detail-title {
 	position: absolute;
-	top: 30px;
-	right: -10px;
+	top: 40px;
+	right: 0;
 	text-align: center;
 	padding: 10px 30px;
 	background: rgba(5, 200, 175, 0.6);
@@ -598,8 +600,8 @@
 	text-align: center;
 	color: #ffffff;
 	position: absolute;
-	top: 30px;
-	left: 20px
+	top: 40px;
+	left: 30px
 }
 
 .fyynew-detail-text h4 {
@@ -623,12 +625,9 @@
 	color: #999
 }
 
-@media (min-width: 360px) {
-	/*.fyynew-detail {
-		margin-top: 30px
-	}*/
-	.fyynew-detail-region {
-		height: 520px;
+@media (min-height: 812px) {
+	.fyynew-detail-photo .fyynew-detail-region{
+		height: 680px;
 	}
 }
 
@@ -655,6 +654,9 @@
 	body {
 		font-size: 15px
 	}
+	.fyynew-detail-photo .fyynew-detail-region {
+		height:380px
+	}
 }
 
 .fyy-annotation {

src/projects/business/views/Common/Health/TemperatureInfo.vue

@@ -1,10 +1,10 @@
 <template>
-	<div>
+	<div style="height:100%">
 		<common @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
 
-		<div class="mui-content fyy-detail-content mui-fullscreen">
-			<div class="mui-content-padded fyynew-detail">
+		<div class="mui-content fyy-detail-content">
+			<div class="fyynew-detail">
 				<div class="fyynew-detail-photo">
 					<div class="fyynew-detail-region">
 						<img :src="detail.faceImage">

src/projects/business/views/Common/Health/TemperatureRecord.vue

@@ -4,6 +4,11 @@
 		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
 
 		<div class="mui-content">
+			<div class="fyy-temper-date">
+				<a href="" class="mui-col-xs-5">2020-03-19</a>
+				<span class="mui-col-xs-2">至</span>
+				<a href="" class="mui-col-xs-5">2020-03-19</a>
+			</div>	
 			<div class="mui-content-padded">
 				<ul class="mui-table-view openfyy-list">
 					<li v-for="(item,index) in recordList" @click="goToPage(item.id)" class="mui-table-view-cell mui-media flew-sp">
@@ -155,6 +160,7 @@
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style scoped>
 </style>