diff --git a/pages.json b/pages.json
index 50e3da6..dc759ad 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,149 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/homepage/homepage",
+			"style": {
+				"navigationBarTitleText": "泉医到家",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+				// "enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/shopping/shopping", //商城
+			"style": {
+				"navigationBarTitleText": "医路优品",
+				"navigationBarBackgroundColor": "#ffffff",
+				"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+				"enablePullDownRefresh": true //设置参数为true
+			}
+		}, {
+			"path": "pages/user/user",
+			"style": {
+				"navigationBarTitleText": "个人信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#4C7BC9" ,//背景颜色
+				"navigationBarTextStyle": "white"
+				
+			}
+		},{
+			"path": "pages/Personal/Personal",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/information/information",
+			"style": {
+				"navigationBarTitleText": "完善个人信息",
+				"navigationBarBackgroundColor": "#ffffff", //背景颜色
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/disease/disease",
+			"style": {
+				"navigationBarTitleText": "疾病类型选择",
+				"navigationBarBackgroundColor": "#ffffff", //背景颜色
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/doctorslist/doctorslist",
+			"style": {
+				"navigationBarTitleText": "预约医生",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/appointmenttime/appointmenttime",
+			"style": {
+				"navigationBarTitleText": "预约时间",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		}, {
+			"path": "pages/InformationFilling/InformationFilling",
+			"style": {
+				"navigationBarTitleText": "信息确认与填写",
+				"navigationBarBackgroundColor": "#ffffff", //背景颜色
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/startup/startup",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/register/register",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/ProductList/ProductList", //商品列表
+			"style": {
+				"navigationBarTitleText": "医路优品",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff",
+				"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+				"enablePullDownRefresh": true //设置参数为true
+			}
+		}, {
+			"path": "pages/CommodityDetails/CommodityDetails",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/nursestation/nursestation",
+			"style": {
+				"navigationBarTitleText": "护理站详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		
+		}, {
+			"path": "pages/site/site",
+			"style": {
+				"navigationBarTitleText": "附近护理站",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff", //背景颜色
+				"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+				"enablePullDownRefresh": true //设置参数为true
+			}
+		}, {
+			"path": "pages/appointment/appointment",
+			"style": {
+				"navigationBarTitleText": "选择时间",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		
+		}, {
+			"path": "pages/detail/detail",
+			"style": {
+				"navigationBarTitleText": "护理站简介",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		}, {
+			"path": "pages/medicine/medicine",
+			"style": {
+				"navigationBarTitleText": "就医",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},{
 			"path": "pages/modifyAddress/modifyAddress",
 			"style": {
 				"navigationBarTitleText": "修改地址",
@@ -12,60 +155,6 @@
 			}
 		
 		},
-		{
-			"path": "pages/InformationFilling/InformationFilling",
-			"style": {
-				"navigationBarTitleText": "信息填写与确认",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
-		
-		{
-			"path": "pages/nursestation/nursestation",
-			"style": {
-				"navigationBarTitleText": "护理站详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-
-		},
-		{
-			"path": "pages/appointmenttime/appointmenttime",
-			"style": {
-				"navigationBarTitleText": "预约时间",
-				"enablePullDownRefresh": false
-			}
-		},
-		
-		
-		{
-			"path": "pages/shopping/shopping",
-			"style": {
-				"navigationBarTitleText": "医路优品",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-
-		},
-		{
-			"path": "pages/site/site",
-			"style": {
-				"navigationBarTitleText": "附近护理站",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
-
-
-		// {
-		// 	"path": "pages/information/information",
-		// 	"style": {
-		// 		"navigationBarTitleText": "请完善个人信息",
-		// 		"enablePullDownRefresh": false,
-		// 		"navigationBarBackgroundColor": "#ffffff"
-		// 	}
-		// },
 		{
 			"path": "pages/Doctordetails/Doctordetails",
 			"style": {
@@ -73,107 +162,6 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-		}, {
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-				// "enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/register/register",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/site/site",
-			"style": {
-				"navigationBarTitleText": "附近护理站",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		}, {
-			"path": "pages/doctorslist/doctorslist",
-			"style": {
-				"navigationBarTitleText": "预约医生",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		},
-		// {
-		// 	"path": "pages/appointment/appointment",
-		// 	"style": {
-		// 		"navigationBarTitleText": "选择时间",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		{
-			"path": "pages/homepage/homepage",
-			"style": {
-				"navigationBarTitleText": "泉医到家",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/CommodityDetails/CommodityDetails",
-			"style": {
-				"navigationBarTitleText": "商品详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		},
-
-		// {
-		// 	"path": "pages/homepage/homepage",
-		// 	"style": {
-		// 		"navigationBarTitleText": "商品详情",
-		// 		"enablePullDownRefresh": false,
-		// 		"navigationBarBackgroundColor": "#ffffff"
-		// 	}
-		// },
-		{
-			"path": "pages/startup/startup",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/Personal/Personal",
-			"style": {
-				"navigationBarTitleText": "个人中心",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/shopping/shopping",
-			"style": {
-				"navigationBarTitleText": "医路优品",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/ProductList/ProductList",
-			"style": {
-				"navigationBarTitleText": "特医食品",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/startup/startup",
-			"style": {
-				"navigationBarTitleText": "泉医到家",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		},
-		{
-			"path": "pages/medicine/medicine",
-			"style": {
-				"navigationBarTitleText": "就医",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
 		}
 	],
 	"globalStyle": {
@@ -194,13 +182,6 @@
 				"selectedIconPath": "static/homepagews.png",
 				"text": "首页"
 
-			},
-			{
-				"pagePath": "pages/shopping/shopping",
-				"iconPath": "static/shoppingw.png",
-				"selectedIconPath": "static/shoppings.png",
-				"text": "商城"
-
 			},
 			{
 				"pagePath": "pages/Personal/Personal",