Merge branch 'master' of http://139.9.163.126/gitlab/jinfeng/epidemic

# Conflicts:
#	pages/fillIn/fillIn.vue

pages/fillIn/fillIn.vue

@@ -2011,7 +2011,6 @@
 				}
 				// 复选框展示和隐藏
 				if (type === 'pickerMore') {
-					console.log(evt)
 					let val = evt.detail.value;
 					const showList = item.showList
 					if (showList && showList.length > 0) {
@@ -2032,7 +2031,6 @@
 
 			},
 			isShowChild() {
-				console.log(this.form['returnToWork'])
 				this.list[10].hidden = this.form['returnToWork'] == 'a'
 			},
 
@@ -2045,7 +2043,6 @@
 			},
 			// 更新下拉框绑定的表单内容
 			updatePickerVal(event, item) {
-				console.log(event)
 				const opts = item.opts
 				const prop = item.value
 				const val = event.detail.value
@@ -2066,7 +2063,6 @@
 			},
 			// 提交信息
 			formSubmit() {
-				console.log(this.form)
 				let flag = true
 				let msg = ''
 				for (let i = 0; i < this.list.length; i++) {

pages/index/index.vue

@@ -6,6 +6,7 @@
 				<button class="btnSecurity" type="primary" @click="security">安保测温</button>
 				<button class="btnSecurity" type="primary" @click="fillInDay">每日填报</button>
 				<image class="img" src="../../static/22.jpg" mode="" ></image>
+				{{option.userId?option.userId:'无'}}
 				<view class="tips">
 					入园请向门卫出示健康码
 				</view>
@@ -19,9 +20,15 @@
 		components: {},
 		name: "home",
 		data() {
-			return {};
+			return {
+				option:{
+					userId:''
+				}
+			};
 		},
 		onLoad: function(option) {
+			console.log(option)
+			this.option = option
 			let that = this
 			// #ifdef MP-WEIXIN 
 			wx.login({

pages/security/security.vue

@@ -34,7 +34,7 @@
 			};
 		},
 		onLoad: function(option) {
-			
+			console.log(option)
 		},
 		onShow() {},
 		methods: {
@@ -51,7 +51,6 @@
 				}).catch(err => {
 					console.log(err)
 				})
-				
 			},
 			// 体温异常
 			abnormal() {