From 3ed39da6013fdfd373a2e52929e8f02e526c84b6 Mon Sep 17 00:00:00 2001
From: sjf1256754123 <33301030+sjf1256754123@users.noreply.github.com>
Date: Sat, 15 Feb 2020 14:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/fillIn/fillIn.vue | 25 +++++++++++++++++++++----
 pages/index/index.vue   |  4 ----
 utils/request.js        |  4 ++--
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue
index 5f347d0..09a6bfd 100644
--- a/pages/fillIn/fillIn.vue
+++ b/pages/fillIn/fillIn.vue
@@ -385,14 +385,31 @@
 		},
 		
 		onLoad(option) {
-			this.id = option.id || ''
-			if(option.id){
-				this.getInfo(option.id)
-			}
+			// this.id = option.id || ''
+			// if(option.id){
+			// 	this.getInfo(option.id)
+			// }
+			this.getOrg()
 		},
 		
 		
 		methods: {
+			getOrg(){
+				const data = {
+					params: {
+						pageNum: 1,
+						pageSize: 1000000
+					}
+				}
+				this.$http.get(`/sict-ncov/org/page`, data).then(res => {
+					const d = res.data
+					if (d.code == 1) {
+						console.log(d)
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
 			// 获取信息
 			getInfo(id){
 				// this.$http.get(`/ewell-gastric-cancer-data/report/selectReportBySampleId?id=${id}`).then(res => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6d834b2..c8f5e2a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -61,11 +61,7 @@
 							userInfo.avatarUrl = obj.avatarUrl
 						}
 						this.$store.dispatch('user/setInfo', Object.assign(obj, userInfo))
-
 						this.$store.dispatch('user/setToken', d.result)
-						this.getFamilyRelation()
-						this.getEliminate()
-						this.getNotice2()
 					}
 				}).catch(err => {
 					console.log(err)
diff --git a/utils/request.js b/utils/request.js
index dca64f6..74207bd 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -10,8 +10,8 @@
 import store from '../store'
 export default class Request {
     config = {
-      baseUrl: 'https://health.sh-sict.com/gastric-api',
-	  // baseUrl: 'http://139.9.163.126/gastric-api',
+      baseUrl: 'https://health.sh-sict.com/ncov-api',
+	  // baseUrl: 'http://139.9.163.126/ncov-api',
       header: {
         'content-type': 'application/json;charset=UTF-8',
       },
-- 
2.22.0