From 36e793b2c7117750ad2c07a0c723a75e785f36b4 Mon Sep 17 00:00:00 2001
From: sjf1256754123 <33301030+sjf1256754123@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/fillIn/fillIn.vue | 37 ++++++++++++++++++++-----------------
 pages/index/index.vue   |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue
index aac92e2..46ee164 100644
--- a/pages/fillIn/fillIn.vue
+++ b/pages/fillIn/fillIn.vue
@@ -118,7 +118,7 @@
 		data() {
 			return {
 				id:'',
-				radio:['食管癌','胃癌','结直肠肿瘤','炎症性肠病','其它器官恶性肿瘤（如乳腺、卵巢等其它器官）'],
+				radio:[],
 				shanghaiList:[
 					{
 						label:'是否离沪',
@@ -296,7 +296,7 @@
 						placeholder:'请输入所在部门',
 						type:'input',
 					},
-					{
+					{  
 						label:'职务',
 						required:true,
 						value:'position',
@@ -306,7 +306,7 @@
 					},
 					{
 						label:'员工姓名',
-						required:true,
+						required:true, 
 						value:'name',
 						titleClass:'title',
 						placeholder:'请输入员工姓名',
@@ -321,7 +321,7 @@
 						type:'input',
 					},
 					{
-						label:'国籍',
+						label:'国籍',  
 						required:true,
 						value:'nationality',
 						titleClass:'title',
@@ -329,33 +329,25 @@
 						opts:[{value:'a',label:'中国'},{value:'b',label:'其它'}]
 					},
 					{
-						label:'身份证号',
+						label:'身份证号/护照号',
 						required:true,
 						value:'idCard',
 						titleClass:'title',
-						placeholder:'请输入身份证号',
+						placeholder:'请输入身份证号/护照号',
 						type:'input',
 					},
 					{
 						label:'户籍地址',
 						required:true,
-						value:'relativesGastricAge',
+						value:'householdAddress',
 						titleClass:'title',
 						placeholder:'请输入户籍地址',
 						type:'input',
 					},
-					{
-						label:'护照号',
-						required:true,
-						value:'relativesGastricAge',
-						titleClass:'title',
-						placeholder:'请输入护照号',
-						type:'input',
-					},
 					{
 						label:'在沪居住（暂住）地址',
 						required:true,
-						value:'relativesGastricAge',
+						value:'residenceAddress', 
 						titleClass:'title',
 						placeholder:'请输入地址',
 						type:'input',
@@ -377,7 +369,18 @@
 						type:'date'
 					}
 				],
-				form:{}
+				form:{
+					orgId:'',
+					department:'',
+					position:'',
+					name:'',
+					phone:'',
+					nationality:'',
+					idCard:'',
+					householdAddress:'',
+					residenceAddress:'',
+					planReturnDate:''
+				}
 			}
 		},
 		
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8b17a22..6d834b2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -52,7 +52,7 @@
 			},
 			// 获取用户信息
 			getUserInfo(code) {
-				this.$http.post(`/ewell-gastric-cancer-user/wechat/user/auth/api?code=${code}`).then(res => {
+				this.$http.post(`/sict-ncov/user/auth?code=${code}`).then(res => {
 					const d = res.data
 					if (d.code == 1) {
 						let userInfo = d.object
-- 
2.22.0