diff --git a/App.vue b/App.vue
index ea9eff2..dc7413f 100644
--- a/App.vue
+++ b/App.vue
@@ -1,16 +1,10 @@
-
-<style lang="scss">
-	@import "uview-ui/index.scss";
-</style>
+<script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
 		}
 	}
 </script>
@@ -18,4 +12,54 @@
 <style lang="scss">
 	/*每个页面公共css */
 	@import "uview-ui/index.scss";
+
+	.app {
+		background-color: #F4F5F7;
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		color: #000000;
+
+		.cards {
+			width: 94%;
+			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
+			background-color: #fff;
+			position: absolute;
+			top: 3%;
+			left: 3%;
+			display: flex;
+			justify-content: space-evenly;
+			flex-wrap: wrap;
+			padding: 40rpx 0 200rpx 0;
+			border-radius: 25rpx;
+
+			.item {
+				width: 43%;
+				height: 300rpx;
+				margin-bottom: 40rpx;
+				border-radius: 25rpx;
+				position: relative;
+
+				.title {
+					width: 70%;
+					text-align: center;
+					font-size: 46rpx;
+					color: #FCFCFC;
+					position: absolute;
+					top: 58%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					position: absolute;
+					top: 20%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+		}
+	}
 </style>
diff --git a/api/baseurl.js b/api/baseurl.js
index 7f01d55..ff0cce3 100644
--- a/api/baseurl.js
+++ b/api/baseurl.js
@@ -1,2 +1,2 @@
-var baseurl = "http://192.168.16.94:8080";
+var baseurl = "http://192.168.16.94:8081";
 export default baseurl
diff --git a/api/disease/index.js b/api/disease/index.js
new file mode 100644
index 0000000..ed3c3ac
--- /dev/null
+++ b/api/disease/index.js
@@ -0,0 +1,8 @@
+import request from "../request.js"
+
+export function getDiseaseInfo() {
+	return request({
+		url: `/nurseApplet/login/getDiseaseInfo`,
+		method: 'GET'
+	})
+}
diff --git a/api/information/index.js b/api/information/index.js
new file mode 100644
index 0000000..4c16425
--- /dev/null
+++ b/api/information/index.js
@@ -0,0 +1,29 @@
+import request from "../request.js"
+
+//区街道list
+export function getRegionAndStreetInfo() {
+	return request({
+		url: `/nurseApplet/login/getRegionAndStreetInfo`,
+		method: 'GET'
+	})
+}
+
+
+
+//完善信息登录
+export function information(data) {
+	return request({
+		url: `/nurseApp/login/information`,
+		method: 'POST',
+		data
+	})
+}
+
+
+//查询护理类型信息
+export function getNurseType() {
+	return request({
+		url: `/nurseApplet/login/getNurseTypeInfo`,
+		method: 'GET'
+	})
+}
diff --git a/api/request.js b/api/request.js
index 4742cda..50765d6 100644
--- a/api/request.js
+++ b/api/request.js
@@ -2,6 +2,9 @@ import baseurl from './baseurl.js'
 
 var request = function(config) {
 	return new Promise((resolve, rejected) => {
+		uni.showLoading({
+			title: ''
+		});
 		uni.request({
 			url: baseurl + config.url,
 			data: config.data,
@@ -25,6 +28,7 @@ var request = function(config) {
 				// 	})
 				// } else {
 				// if (res.data.success) {
+				uni.hideLoading();
 				resolve(res.data)
 				// } else {
 				// 	uni.showToast({
@@ -35,6 +39,7 @@ var request = function(config) {
 				// }
 			},
 			fail(err) {
+				uni.hideLoading();
 				rejected(err)
 			}
 		})
diff --git a/manifest.json b/manifest.json
index 6d00163..5b8053d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,9 +17,7 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {
-            "Geolocation" : {}
-        },
+        "modules" : {},
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -42,14 +40,21 @@
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "",
-                        "appkey_android" : ""
+                        "appkey_android" : "b38c6aa0cb9a6323f48b05ea6462aed5"
                     }
                 },
                 "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "android" ],
+                        "appkey_ios" : "",
+                        "appkey_android" : "b38c6aa0cb9a6323f48b05ea6462aed5"
+                    },
                     "system" : {
-                        "__platform__" : [ "ios", "android" ]
+                        "__platform__" : [ "android" ]
                     }
-                }
+                },
+                "push" : {},
+                "payment" : {}
             },
             "splashscreen" : {
                 "androidStyle" : "default",
@@ -84,5 +89,16 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "amap" : {
+                    "key" : "08e138f3f5e8595453526cbbeed38124",
+                    "securityJsCode" : "e50d5cf4e75c0a2b3f5cbfcc96cc4d8f",
+                    "serviceHost" : ""
+                }
+            }
+        }
+    }
 }
diff --git a/pages.json b/pages.json
index 607e65f..e71e35a 100644
--- a/pages.json
+++ b/pages.json
@@ -3,73 +3,54 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-	{
-	    "path" : "pages/diagnosis/diagnosis",
-	    "style" :
-	    {
-	        "navigationBarTitleText": "诊疗结果",
-	        "enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#ffffff" //背景颜色
-	    }
-
-	},
-	{
-		"path": "pages/InformationFilling/InformationFilling",
-		"style": {
-			"navigationBarTitleText": "信息填写与确认",
-			"enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#ffffff" //背景颜色
-		}
-	},
-
-	{
-	    "path" : "pages/AppointmentRecord/AppointmentRecord",
-	    "style" :
-	    {
-	        "navigationBarTitleText": "预约记录及结果",
-	        "enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#ffffff" //背景颜色
-	    }
-
-	},
-
-	{
-		"path": "pages/detail/detail",
-		"style": {
-			"navigationBarTitleText": "护理站简介",
-			"enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#ffffff" //背景颜色
-		}
-	},
 		{
-		    "path" : "pages/nursestation/nursestation",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "济南护万家护理有限公司",
-		        "enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-		    }
-
+			"path": "pages/diagnosis/diagnosis",
+			"style": {
+				"navigationBarTitleText": "诊疗结果",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
 		},
 		{
-			"path": "pages/site/site",
+			"path": "pages/InformationFilling/InformationFilling",
 			"style": {
-				"navigationBarTitleText": "附近护理站",
+				"navigationBarTitleText": "信息填写与确认",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
 		},
 
 		{
-		    "path" : "pages/appointmenttime/appointmenttime",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "预约时间",
-		        "enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#ffffff" //背景颜色
-		    }
-
-		},{
+			"path": "pages/AppointmentRecord/AppointmentRecord",
+			"style": {
+				"navigationBarTitleText": "预约记录及结果",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		},
+		{
+			"path": "pages/detail/detail",
+			"style": {
+				"navigationBarTitleText": "护理站简介",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		},
+		{
+			"path": "pages/information/information",
+			"style": {
+				"navigationBarTitleText": "请完善个人信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/Doctordetails/Doctordetails",
+			"style": {
+				"navigationBarTitleText": "医生信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "",
@@ -89,29 +70,34 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
-		},{
-		    "path" : "pages/appointment/appointment",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "选择时间",
-		        "enablePullDownRefresh": false
-		    }
-
-		},
-		{
-			"path": "pages/detail/detail",
+		}, {
+			"path": "pages/doctorslist/doctorslist",
 			"style": {
-				"navigationBarTitleText": "护理站简介",
+				"navigationBarTitleText": "预约医生",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+				"navigationBarBackgroundColor": "#ffffff"
 			}
 		}, {
+			"path": "pages/appointment/appointment",
+			"style": {
+				"navigationBarTitleText": "选择时间",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
 			"path": "pages/homepage/homepage",
 			"style": {
 				"navigationBarTitleText": "泉医到家",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		}, {
+			"path": "pages/disease/disease",
+			"style": {
+				"navigationBarTitleText": "疾病信息选择",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}, {
 			"path": "pages/CommodityDetails/CommodityDetails",
 			"style": {
@@ -121,28 +107,13 @@
 			}
 		},
 		{
-		    "path" : "pages/appointmenttime/appointmenttime",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "预约时间",
-		        "enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#ffffff" //背景颜色
-		    }
-
-		},
-		{
-			"path": "pages/homepage/homepage",
+			"path": "pages/appointmenttime/appointmenttime",
 			"style": {
-				"navigationBarTitleText": "商品详情",
+				"navigationBarTitleText": "预约时间",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/startup/startup",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
+
 		}, {
 			"path": "pages/Personal/Personal",
 			"style": {
@@ -171,17 +142,16 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		},
+		{
+			"path": "pages/medicine/medicine",
+			"style": {
+				"navigationBarTitleText": "就医",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}
-        ,{
-            "path" : "pages/diagnosis/diagnosis",
-            "style" :
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 63064d0..b89d76c 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -8,12 +8,6 @@
 				<swiper-item>
 					<image style='width:100%;height:750rpx' src="../../static/spjtcs.png" mode=""></image>
 				</swiper-item>
-				<swiper-item>
-					<image style='width:100%;height:750rpx' src="../../static/spjtcs.png" mode=""></image>
-				</swiper-item>
-				<swiper-item>
-					<image style='width:100%;height:750rpx' src="../../static/spjtcs.png" mode=""></image>
-				</swiper-item>
 			</swiper>
 		</uni-swiper-dot>
 		<view class="Commodity common">
@@ -115,10 +109,6 @@
 				//轮播内容
 				info: [{
 					content: '内容 A'
-				}, {
-					content: '内容 B'
-				}, {
-					content: '内容 C'
 				}],
 				current: 0, //轮播初始下标
 				mode: 'dot', //轮播点样式
@@ -141,19 +131,7 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		position: relative;
-		color: #000000;
-
 		.mask {
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			background-color: #000000;
-			background: rgba(0, 0, 0, 0.6);
-
 			.PurchasePage {
 				position: fixed;
 				top: 40%;
diff --git a/pages/Doctordetails/Doctordetails.vue b/pages/Doctordetails/Doctordetails.vue
new file mode 100644
index 0000000..4c8c15f
--- /dev/null
+++ b/pages/Doctordetails/Doctordetails.vue
@@ -0,0 +1,104 @@
+<template>
+	<view class="app">
+		<view class="info">
+			<view class="image">
+			</view>
+			<view class="name">
+				某某某
+			</view>
+			<view class="position">
+				主任医师
+			</view>
+			<view class="border">
+
+			</view>
+			<view class="text">
+				熟悉呼吸系统疾病的诊治，尤其擅 长肺栓塞、肺动脉高压和慢性气道疾 病的研究。
+			</view>
+		</view>
+		<view class="price">
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		padding-top: 20rpx;
+
+		.price {
+			width: 94%;
+			height: 105rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			margin: 0 auto;
+			margin-top: 15rpx;
+		}
+
+		.info {
+			width: 94%;
+			height: 651rpx;
+			margin: 0 auto;
+			background: #FFFFFF;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			position: relative;
+			font-size: 36rpx;
+
+			.text {
+				width: 90%;
+				line-height: 67rpx;
+				position: absolute;
+				left: 5%;
+				top: 263rpx;
+				text-indent: 1em;
+			}
+
+			.border {
+				width: 90%;
+				margin: 0 auto;
+				height: 1rpx;
+				background: #D8D4D4;
+				position: absolute;
+				left: 5%;
+				top: 209rpx;
+			}
+
+			.position {
+				font-size: 35rpx;
+				color: #969394;
+				position: absolute;
+				left: 264rpx;
+				top: 122rpx;
+			}
+
+			.name {
+				position: absolute;
+				left: 264rpx;
+				top: 68rpx;
+			}
+
+			.image {
+				width: 147rpx;
+				height: 150rpx;
+				background: #BFBFBF;
+				border-radius: 25rpx;
+				position: absolute;
+				left: 74rpx;
+				top: 32rpx;
+			}
+		}
+
+	}
+</style>
diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index 1c7d31a..2ffce85 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -36,49 +36,12 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
-
 		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			position: absolute;
-			top: 3%;
-			left: 3%;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 200rpx 0;
-			border-radius: 25rpx;
-
 			.item {
-				width: 43%;
 				height: 295rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
 				.title {
 					width: 80%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
 					top: 60%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
 				}
 			}
 		}
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 1900988..c055b4b 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -71,11 +71,6 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
-
 		.productlist {
 			width: 100%;
 			margin: 0 auto;
diff --git a/pages/disease/disease.vue b/pages/disease/disease.vue
new file mode 100644
index 0000000..7e73e73
--- /dev/null
+++ b/pages/disease/disease.vue
@@ -0,0 +1,155 @@
+<template>
+	<view class="app">
+		<view style="height: 20rpx;background-color: #F4F5F7;">
+		</view>
+		<view class="items">
+			<view class="item"
+				:style="disease.find(e => e.id == item.id)?'background-color: #4C7BC9;color: #ffffff;':''"
+				v-for='(item,index) in diseaselist' :key="index" @tap='choicedisease(item)'>
+				{{item.diseaseName}}
+			</view>
+			<view class="other">
+				<span>其他:</span>
+				<!-- <input type="text"> -->
+				<u-input type="text" placeholder='请填写' />
+			</view>
+			<view class="btn" @tap='goinformation'>
+				提交
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getDiseaseInfo
+	} from '@/api/disease/index.js'
+	export default {
+		data() {
+			return {
+				diseaselist: [], //疾病列表
+				disease: [{ //选择的疾病list
+					id: 9999,
+					diseaseName: '无'
+				}],
+			};
+		},
+		methods: {
+			//选择疾病
+			choicedisease(item) {
+				if (this.disease.findIndex(e => e.id == item.id) == -1) {
+					this.disease.push(item)
+				} else {
+					this.disease = this.disease.filter(e => e.id != item.id)
+				}
+				if (this.disease.length > 1) {
+					console.log(this.disease.length)
+					this.disease = this.disease.filter(e => e.id != 9999)
+				}
+				console.log(this.disease)
+			},
+			//获取疾病列表
+			diseaseinfo() {
+				getDiseaseInfo().then(res => {
+					this.diseaselist = res.data;
+					this.diseaselist.unshift({
+						id: 9999,
+						diseaseName: '无'
+					})
+				})
+			},
+			//跳转回信息完善页面
+			goinformation() {
+				uni.$emit('disease', {
+					disease: JSON.stringify(this.disease)
+				})
+				uni.navigateBack({
+					delta: 1
+				});
+			}
+		},
+		onLoad(options) { //开局方法和传参接受
+			this.diseaseinfo()
+			//传参相等
+			this.disease = JSON.parse(options.diseaseInfoList)
+			console.log(JSON.parse(options.diseaseInfoList))
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100%;
+		padding-bottom: 70rpx;
+
+		.btn {
+			width: 217rpx;
+			height: 68rpx;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 68rpx;
+			margin: 100rpx 0 0 60%;
+		}
+
+		.items {
+			width: 90%;
+			margin: 0 auto;
+			text-align: center;
+			color: #000000;
+
+			.other {
+				margin: 0 auto;
+				height: 93rpx;
+				display: flex;
+				background-color: #fff;
+				border-radius: 20rpx;
+				width: 100%;
+				box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				margin: 20rpx auto;
+				line-height: 93rpx;
+
+				view {
+					height: 93rpx;
+					font-size: 32rpx;
+					line-height: 93rpx;
+				}
+
+				span {
+					display: inline-block;
+					line-height: 93rpx;
+					height: 93rpx;
+					width: 30%;
+					font-size: 32rpx;
+				}
+
+				::v-deep .u-input__input {
+					height: 93rpx;
+					font-size: 32rpx;
+				}
+
+				::v-deep .uni-input-wrapper {
+					height: 93rpx;
+					line-height: 93rpx;
+				}
+
+				::v-deep .u-input {
+					width: 70%;
+					height: 93rpx;
+					line-height: 93rpx;
+				}
+			}
+
+			.item {
+				width: 100%;
+				height: 93rpx;
+				background: #ffffff;
+				box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				border-radius: 20rpx;
+				margin: 20rpx auto;
+				line-height: 93rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/doctorslist/doctorslist.vue b/pages/doctorslist/doctorslist.vue
new file mode 100644
index 0000000..e3a5133
--- /dev/null
+++ b/pages/doctorslist/doctorslist.vue
@@ -0,0 +1,111 @@
+<template>
+	<view class="app">
+		<view class="visual">
+			<view class="department">
+				<view class="item" v-for="(item,index) in departmentlist" :key="index"
+					:class="aindex == index ?'departmentitem':''">
+					{{item.name}}
+				</view>
+			</view>
+			<view class="list">
+				<view class="information">
+					<view class="image">
+					</view>
+					<view class="name">
+						某某某
+					</view>
+				</view>
+				<view class="information">
+					<view class="image">
+					</view>
+					<view class="name">
+						某某某
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				aindex: 1,
+				departmentlist: [{
+						name: '内科',
+					},
+					{
+						name: '外科',
+					},
+					{
+						name: '皮肤科',
+					},
+				],
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		.visual {
+			text-align: center;
+			width: 94%;
+			margin: 0 auto;
+			background-color: #F4F5F7;
+			padding-top: 20rpx;
+			display: flex;
+
+			.list {
+				width: 72%;
+				background: #FFFFFF;
+				box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				border-radius: 0px 20rpx 20rpx 0px;
+				padding-bottom: 100rpx;
+
+				.information {
+					width: 90%;
+					position: relative;
+					margin: 37rpx auto 0;
+					padding-bottom: 60rpx;
+					border-bottom: 1rpx solid #D8D4D4;
+
+					.name {
+						font-size: 36rpx;
+						position: absolute;
+						left: 45%;
+						top: 10%;
+					}
+
+					.image {
+						width: 135rpx;
+						height: 138rpx;
+						background: #BFBFBF;
+						border-radius: 25rpx;
+						margin-left: 6%;
+					}
+				}
+			}
+
+			.department {
+				width: 28%;
+
+				.item {
+					line-height: 100rpx;
+					width: 100%;
+					height: 100rpx;
+					background: #ffffff;
+					box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+					border-radius: 20rpx 0px 0px 20rpx;
+					margin-bottom: 6rpx;
+				}
+
+				.departmentitem {
+					background: #4C7BC9;
+					color: #ffffff;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index a4352f6..7548e43 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -7,7 +7,7 @@
 					护理站
 				</view>
 			</view>
-			<view class="expert item">
+			<view class="expert item" @tap='gomedicine'>
 				<image src="../../static/zhuanjia.png" mode=""></image>
 				<view class="title">
 					就医
@@ -34,38 +34,35 @@
 			<view style="width:56% ;">
 			</view>
 		</view>
+
+
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-
-			};
+			return {};
+		},
+		methods: {
+			//跳转就医页面
+			gomedicine() {
+				uni.navigateTo({
+					url: '/pages/medicine/medicine'
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
+		// background-color: #F4F5F7;
+		// width: 100%;
+		// height: 100vh;
+		// position: relative;
 
 		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			position: absolute;
-			top: 3%;
-			left: 3%;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 0 0;
-			border-radius: 25rpx;
 
 			.smallitem {
 				width: 30%;
@@ -96,34 +93,6 @@
 				}
 			}
 
-			.item {
-				width: 43%;
-				height: 310rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
-				.title {
-					width: 80%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
-					top: 55%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-			}
-
 			.knowledge {
 				background-color: #E1AE3C;
 			}
diff --git a/pages/information/information.vue b/pages/information/information.vue
new file mode 100644
index 0000000..3f26395
--- /dev/null
+++ b/pages/information/information.vue
@@ -0,0 +1,343 @@
+<template>
+	<view class="app">
+		<u-mask :show="usershow" class='mask'>
+			<view class="information">
+				<image src="../../static/information.png" mode=""></image>
+				<view class="title">
+					请完善个人信息
+				</view>
+				<view class="cancel">
+					取消
+				</view>
+				<view class="determine">
+					去完善
+				</view>
+			</view>
+		</u-mask>
+		<view class="" style="background-color: #F4F5F7;height: 20rpx;width:100%">
+		</view>
+		<view class="userinfo info">
+			<view class="item">
+				<span>姓名:</span>
+				<u-input v-model="query.patientName" type="text" placeholder='' maxlength='5' />
+			</view>
+			<view class="item">
+				<span>电话:</span>
+				<u-input v-model="query.phone" maxlength='11' type="text" placeholder='' />
+			</view>
+			<view class="item">
+				<span>身份证号:</span>
+				<u-input v-model="query.cardNo" type="text" placeholder='' maxlength='18' />
+			</view>
+			<view class="item" @tap='areashow=true'>
+				<span>所属区域:</span>
+				<view>{{address}}</view>
+			</view>
+			<view class="item">
+				<span>详细地址:</span>
+				<u-input v-model="query.address" type="text" placeholder='' />
+			</view>
+			<view class="item" @tap='getAddress()'>
+				<span>所在位置:</span>
+				<view></view>
+				<!-- <u-input type="text" placeholder='' /> -->
+			</view>
+		</view>
+		<u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
+			:list="arealist" @confirm="areaconfirm"></u-select>
+		<view class="info">
+			<view class="service">
+				<view class="title">
+					所属服务
+				</view>
+				<view class="Multiplechoice">
+					<view :class="query.nurseTypeIdList.find(e => e == item.id)?'choices':'choice'"
+						v-for="(item,index) in getNurseTypelist" :key="item.id" @tap="addnurseType(item)">
+						{{item.nurseTypeName}}
+					</view>
+					<view @tap="godisease()" :class="query.diseaseInfoList.length>0?'choices':'choice'"
+						v-for="(item,index) in medicalcarelist" :key="item.id">
+						{{item.nurseTypeName}}
+					</view>
+				</view>
+			</view>
+			<u-button type="primary" style='width:30%;float: right;margin-top: 50rpx;' @tap='informationinfo'>提交
+			</u-button>
+		</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		getRegionAndStreetInfo,
+		getNurseType,
+		information
+	} from '@/api/information/index.js'
+	export default {
+		data() {
+			return {
+				usershow: false, //完善信息开关
+				arealist: [], //区街道list
+				areashow: false, //经纬度开关
+				getNurseTypelist: [], //护理类型数组
+				medicalcarelist: [], //医疗护理数组
+				address: '', //页面所属区域
+				query: { //信息请求数组
+					patientName: "",
+					cardNo: "",
+					phone: "",
+					address: "",
+					areaCode: "",
+					nurseTypeIdList: [],
+					diseaseInfoList: [],
+				}
+			};
+		},
+		methods: {
+			//提交信息
+			informationinfo() {
+				information(this.query).then(res => {
+					if (res.code == 200) {
+						this.$refs.uToast.show({
+							title: '完善信息成功',
+							type: 'success',
+							url: '',
+							duration: '1500'
+						})
+						setInterval(() => {
+							//TODO 
+							uni.switchTab({
+								url: '/pages/homepage/homepage',
+							})
+						}, 1500);
+					} else if (res.code == 500) {
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error',
+							url: ''
+						})
+					}
+				})
+			},
+			//获取所在位置
+			getAddress() {
+				uni.chooseLocation({
+					success: function(res) {
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+						console.log('经度：' + res.longitude);
+					}
+				});
+			},
+			//护理类型请求
+			getNurseTypeInfo() {
+				getNurseType().then(res => {
+					this.medicalcarelist = res.data.filter(e => e.nurseTypeName == '医疗护理')
+					this.getNurseTypelist = res.data.filter(e => e.nurseTypeName != '医疗护理')
+				})
+			},
+			//区街道
+			areaInfo() {
+				getRegionAndStreetInfo().then(res => {
+					//区下无街道添加一个空街道
+					res.data.forEach(e => {
+						if (e.children.length == 0) {
+							e.children.push({
+								areaCode: "",
+								areaName: "暂无街道",
+								children: null,
+								id: '',
+							})
+						}
+					})
+					this.arealist = res.data;
+				})
+			},
+			//区街道选择
+			areaconfirm(e) {
+				this.query.areaCode = e[e.length - 1].value
+				this.address = e[0].label + '-' + e[1].label
+			},
+			//点击所需服务
+			addnurseType(item) {
+				if (this.query.nurseTypeIdList.findIndex(e => e == item.id) == -1) {
+					this.query.nurseTypeIdList.push(item.id)
+				} else {
+					this.query.nurseTypeIdList = this.query.nurseTypeIdList.filter(e => e != item.id)
+				}
+			},
+			godisease() {
+				uni.navigateTo({
+					url: `/pages/disease/disease?diseaseInfoList=${JSON.stringify(this.query.diseaseInfoList)}`
+				})
+			},
+		},
+		//进入界面加载
+		onLoad() {
+			this.areaInfo()
+			this.getNurseTypeInfo();
+		},
+		//带参返回
+		onShow() {
+			let that = this
+			uni.$on('disease', function(data) {
+				that.query.diseaseInfoList = JSON.parse(data.disease)
+				if (that.query.diseaseInfoList.length > 0) {
+					that.medicalcarelist.forEach(e => {
+						if (that.query.nurseTypeIdList.findIndex(el => el == e.id) == -1) {
+							that.query.nurseTypeIdList.push(e.id)
+						} else {
+							that.query.nurseTypeIdList = that.query.nurseTypeIdList.filter(ele => ele != e
+								.id)
+						}
+					})
+				}
+			})
+		}
+	}
+</script>
+<style lang="scss">
+	.app {
+		.service {
+			width: 90%;
+			margin: 0 auto;
+			padding-bottom: 15rpx;
+
+			.Multiplechoice {
+				font-size: 32rpx;
+				color: #FFFFFF;
+				width: 100%;
+
+				.choices {
+					background: #4C7BC9;
+					display: inline-block;
+					text-align: center;
+					line-height: 70rpx;
+					width: 190rpx;
+					height: 70rpx;
+					border-radius: 26rpx;
+					margin: 30rpx 30rpx 0 0;
+				}
+
+				.choice {
+					display: inline-block;
+					text-align: center;
+					line-height: 70rpx;
+					width: 190rpx;
+					height: 70rpx;
+					background: #BFBFBF;
+					border-radius: 26rpx;
+					margin: 30rpx 30rpx 0 0;
+				}
+			}
+
+			.title {
+				font-size: 36rpx;
+				padding-top: 36rpx;
+			}
+		}
+
+		.info {
+			width: 94%;
+			margin: 0 auto 20rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding-bottom: 5rpx;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+		}
+
+
+		.userinfo {
+			.item {
+				width: 90%;
+				margin: 0 auto;
+				height: 120rpx;
+				line-height: 120rpx;
+				border-bottom: 1rpx solid #D8D4D4;
+				display: flex;
+
+				view {
+					height: 120rpx;
+					font-size: 32rpx;
+					line-height: 120rpx;
+				}
+
+				span {
+					display: inline-block;
+					line-height: 120rpx;
+					height: 120rpx;
+					width: 30%;
+					font-size: 32rpx;
+				}
+
+				::v-deep .u-input__input {
+					height: 120rpx;
+					font-size: 32rpx;
+				}
+
+				::v-deep .uni-input-wrapper {
+					height: 120rpx;
+					line-height: 120rpx;
+				}
+
+				::v-deep .u-input {
+					width: 70%;
+					height: 120rpx;
+					line-height: 120rpx;
+				}
+			}
+
+			.item:nth-child(6) {
+				border: 0;
+			}
+		}
+
+		.mask {
+			.information {
+				width: 70%;
+				height: 400rpx;
+				margin: 50% auto;
+				background: #FFFFFF;
+				border-radius: 30rpx;
+				text-align: center;
+				color: #FFFFFF;
+				position: relative;
+
+				.determine,
+				.cancel {
+					width: 200rpx;
+					height: 70rpx;
+					border-radius: 26rpx;
+					font-size: 34rpx;
+					line-height: 70rpx;
+					position: absolute;
+					top: 74%;
+				}
+
+				.determine {
+					background: #4C7BC9;
+					right: 36rpx;
+				}
+
+				.cancel {
+					background: #C5BFBF;
+					left: 36rpx;
+				}
+
+				.title {
+					font-size: 42rpx;
+					margin-top: 40rpx;
+					color: #000000;
+				}
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					margin: 10% 0 0 0;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a9ef3b2..6ffa40e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -258,10 +258,6 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		position: relative;
-		height: 100vh;
-		width: 100%;
 		font-family: DengXian;
 		color: #C3C1C1;
 		font-weight: 400;
diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue
new file mode 100644
index 0000000..dff6624
--- /dev/null
+++ b/pages/medicine/medicine.vue
@@ -0,0 +1,49 @@
+<template>
+	<view class="app">
+		<view class="cards">
+			<view class="item" style="background: #4C7BC9;" @tap='godoctorslist'>
+				<image src="../../static/yuyue.png" mode=""></image>
+				<view class="title" style="font-size: 42rpx;">
+					预约医生
+				</view>
+			</view>
+			<view class="item" style="background-color: #E1AE3C;">
+				<image src="../../static/chaxun.png" mode=""></image>
+				<view class="title" style="font-size: 42rpx;">
+					查看结果
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		methods: {
+			// 跳转预约医生界面
+			godoctorslist() {
+				uni.navigateTo({
+					url: '/pages/doctorslist/doctorslist'
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		.cards {
+			padding: 40rpx 0 500rpx 0;
+
+			.item {
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index efe1255..f89c1b3 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -62,10 +62,6 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		position: relative;
-		height: 100vh;
-		width: 100%;
 		font-family: DengXian;
 		color: #C3C1C1;
 		font-weight: 400;
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index 9bf2153..05256f9 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -51,51 +51,11 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
+		// background-color: #F4F5F7;
+		// width: 100%;
+		// height: 100vh;
+		// position: relative;
 
-		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			position: absolute;
-			top: 3%;
-			left: 3%;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 200rpx 0;
-			border-radius: 25rpx;
-
-			.item {
-				width: 43%;
-				height: 300rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
-				.title {
-					width: 70%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
-					top: 58%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-			}
-		}
+		
 	}
 </style>
diff --git a/static/chaxun.png b/static/chaxun.png
new file mode 100644
index 0000000..0629232
Binary files /dev/null and b/static/chaxun.png differ
diff --git a/static/information.png b/static/information.png
new file mode 100644
index 0000000..44addf7
Binary files /dev/null and b/static/information.png differ
diff --git a/static/yuyue.png b/static/yuyue.png
new file mode 100644
index 0000000..a7ed0e7
Binary files /dev/null and b/static/yuyue.png differ