diff --git a/pages/index/index.vue b/pages/index/index.vue
index fdded916c1bc6fb39f7201f41274fa85779fa842..a957f0b283a6d695e5f951e70a548fb0d97c888e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,9 +2,16 @@
 	<view class="index">
 		<view class="temp">
 			<view class="btnList">
-				<button class="btnStaff" type="primary" @click="staff">首次填报</button>
-				<button class="btnSecurity" type="primary" @click="fillInDay">每日签到</button>
-				<button class="btnSecurity" type="primary" @click="getScancode">安保测温</button>
+				<view class="btnStaff">
+					<image src="../../static/5.png" class="btnStaff2" mode=""></image>
+					<image src="../../static/4.png" class="btnStaff2" @click="staff" mode=""></image>
+					<image src="../../static/3.png" class="btnStaff2" @click="fillInDay" mode=""></image>
+					<image src="../../static/6.png" class="btnStaff2" @click="temperature" mode=""></image>
+				</view>
+				<view class="btnStaff">
+					<image src="../../static/2.png" class="btnStaff2" mode=""></image>
+					<image src="../../static/7.png" class="btnStaff2" @click="getScancode" style="width: 484upx;" mode=""></image>
+				</view>
 				<image class="img" :src="imgSrc" mode="widthFix" @click="modalName = 'Image'">
 				<view class="tips">入园请向门卫出示健康码</view>
 			</view>
@@ -61,6 +68,13 @@
 			}
 		},
 		methods: {
+			temperature(){
+				uni.showToast({
+					icon: 'none',
+					title: '即将上线！'
+				})
+			},
+			
 			getImg(){
 				this.$http.get(`/sict-ncov/user/qrcode`).then(res => {
 					const d = res.data
@@ -85,7 +99,8 @@
 			// 	})
 			// },
 			getScancode(){
-				if(this.$store.state.user.userInfo.roleId == '1003'){
+				console.log(this.$store.state.user.userInfo.roleId)
+				if(this.$store.state.user.userInfo.roleId&&this.$store.state.user.userInfo.roleId == '1003'){
 					var _this = this;
 					// 允许从相机和相册扫码
 					wx.scanCode({
@@ -156,7 +171,8 @@
 		background-image: url('http://139.9.163.126/gastric/static/background.jpg');
 		.btnList{
 			padding-top: 395upx;
-			.btnStaff,.btnSecurity{
+			text-align: center;
+			.btnSecurity{
 				background-color: #92d0f1;
 				color: #FFFFFF;
 				border-radius: 60upx;
@@ -166,6 +182,18 @@
 			.btnSecurity{
 				margin-top:45upx;
 			}
+			.btnStaff{
+				color: #FFFFFF;
+				border-radius: 60upx;
+			}
+			.btnStaff2{
+				text-align: left;
+				display: inline-block;
+				width: 160upx;
+				height: 99upx;
+				background-color: #92d0f1;
+				color: #FFFFFF;
+			}
 			.img{
 				margin-top:45upx;
 				width: 200upx;
diff --git a/pages/security/security.vue b/pages/security/security.vue
index 511c40fc25e1ec440f2de84c5656d81c1ee5b9a0..cdd5b830275b954a445b7b5e65acda279fbf8d08 100644
--- a/pages/security/security.vue
+++ b/pages/security/security.vue
@@ -1,17 +1,35 @@
 <template name="index">
 	<view class="index">
 		<view class="temp">
-			<view class="btnList">
-				<button class="btnNormal" type="primary" @click="normal">体温正常</button>
-				<button class="btnAbnormal" type="primary" @click="abnormal">体温异常</button>
+			<view  v-show="!hiddenFlag">
+				<view class="btnList">
+					<span style="font-weight: bold;color:#fff;font-size: 58upx;">{{obj.userName}}</span>
+					<button class="btnNormal" type="primary" @click="normal">体温正常</button>
+					<button class="btnAbnormal" type="primary" @click="abnormal">体温异常</button>
+				</view>
+				<view v-show="abnormalFlag">
+					<view class="cu-form-group">
+						<view class="title">体温值：</view>
+						<input class="text-left" type="number" :value="form['heat']" name="input" @input="updateInputVal($event,'heat')"></input>
+					</view>
+					<view class="btnList" style="padding-top:5upx;">
+						<button class="btnSubmit" type="primary" @click="submit">提交</button>
+					</view>
+				</view>
 			</view>
-			<view v-show="abnormalFlag">
-				<view class="cu-form-group">
-					<view class="title">体温值：</view>
-					<input class="text-left" type="number" :value="form['heat']" name="input" @input="updateInputVal($event,'heat')"></input>
+			<view  v-show="hiddenFlag" class="tip">
+				<view class="tips">
+					<span style="font-weight: bold;">{{obj.userName}}</span>
+					今日已测温
+				</view>
+				<view class="tips" v-show="obj.heat>0">
+					体温值：<span style="font-weight: bold;">{{obj.heat}}</span>
+				</view>
+				<view class="tips" v-show="obj.notice">
+					提示：<span style="font-weight: bold;">{{obj.notice}}</span>
 				</view>
-				<view class="btnList" style="padding-top: 55upx;">
-					<button class="btnSubmit" type="primary" @click="submit">提交</button>
+				<view class="tips">
+					结果 ：<span style="font-weight: bold;">{{obj.heatNomal?'体温异常':'体温正常'}}</span> 
 				</view>
 			</view>
 		</view>
@@ -29,15 +47,32 @@
 					heatNomal:-1,
 					userId:''
 				},
+				obj:{
+					heat:'',
+					heatNormal:'',
+					notice:''
+				},
+				hiddenFlag:false,
 				temperature:'',
 				abnormalFlag:false
 			};
 		},
 		onLoad: function(option) {
 			this.form.userId = option.userId
+			this.getData()
 		},
 		onShow() {},
 		methods: {
+			getData(){
+				this.$http.get(`/sict-ncov/report/daily/heat?userId=${this.form.userId}`).then(res => {
+					if (res.data.code == 1) {
+						this.obj = res.data.object
+						this.hiddenFlag = this.obj.heatNormal == 1 || this.obj.heatNormal == 0
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
 			// 体温正常
 			normal() {
 				this.form.heatNomal = 0
@@ -45,10 +80,7 @@
 				this.$http.post(`/sict-ncov/report/daily/heat`,this.form).then(res => {
 					const d = res.data
 					if (d.code == 1) {
-						uni.showToast({
-							icon: 'success',
-							title: d.object || d.message
-						})
+						this.getData()
 					}
 				}).catch(err => {
 					console.log(err)
@@ -69,10 +101,7 @@
 				this.$http.post(`/sict-ncov/report/daily/heat`,this.form).then(res => {
 					const d = res.data
 					if (d.code == 1) {
-						uni.showToast({
-							icon: 'none',
-							title: d.object
-						})
+						this.getData()
 					}
 				}).catch(err => {
 					console.log(err)
@@ -96,6 +125,7 @@
 				color: #FFFFFF;
 				border-radius: 60upx;
 				width: 52%;
+				margin-top:75upx;
 				text-align: center;
 			}
 			.btnAbnormal{
@@ -114,5 +144,15 @@
 				border-bottom: 2upx solid #FFFFFF;
 			}
 		}
+		.tip{
+			font-size: 42upx;
+			color: #fff;
+			margin-left:25%;
+			padding-top: 300upx;
+			.tips{
+				text-align: left;
+				margin-top: 30upx;
+			}
+		}
 	}
 </style>
diff --git a/static/2.png b/static/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..010ce1a7b3b1418df24e7c9730644c2b3c60fa89
Binary files /dev/null and b/static/2.png differ
diff --git a/static/3.png b/static/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..646dd2a90dbb201b2e5d25e351ca224a9a353a5b
Binary files /dev/null and b/static/3.png differ
diff --git a/static/4.png b/static/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f156beec2aaf9cc049f5616dc6ce1b7c889c34cd
Binary files /dev/null and b/static/4.png differ
diff --git a/static/5.png b/static/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..278b113c962d9bf4c1cadb171cc5b514958f6e50
Binary files /dev/null and b/static/5.png differ
diff --git a/static/6.png b/static/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..5be82ae70edc080006302b5adc2ef193e1bf6b52
Binary files /dev/null and b/static/6.png differ
diff --git a/static/7.png b/static/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f1bab276c046787ff7825757e58c6ef4a741aca
Binary files /dev/null and b/static/7.png differ