diff --git a/agentApp/pages.json b/agentApp/pages.json
index 335ef02..ac55744 100644
--- a/agentApp/pages.json
+++ b/agentApp/pages.json
@@ -1,177 +1,139 @@
 {
-	
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-	{
-	    "path" : "pages/allpages/index",
-	    "style" :                                                                                    
-	    {
-	        "navigationBarTitleText": "",
-			"navigationBarBackgroundColor": "#1783FF",
-			"navigationBarTextStyle": "white"
-	       // "enablePullDownRefresh": false
-			
-	    }
-	    
-	},
-		{
-		    "path" : "pages/user-login/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "用户登录",
+	"pages": [{ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+			"path": "pages/allpages/index",
+			"style": {
+				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#1783FF",
 				"navigationBarTextStyle": "white"
-		       // "enablePullDownRefresh": false
-				
-		    }
-		    
+			}
 		},
 		{
-		    "path" : "pages/agent-login/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "代理登录",
+			"path": "pages/user-login/index",
+			"style": {
+				"navigationBarTitleText": "用户登录",
 				"navigationBarBackgroundColor": "#1783FF",
 				"navigationBarTextStyle": "white"
-		       // "enablePullDownRefresh": false
-				
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/index/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "代理主页",
-		        "navigationBarBackgroundColor": "#1783FF",
-		        "navigationBarTextStyle": "white"
-		    }
-		}
-		,{
-		    "path" : "pages/cash/cash",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "代理提现",
-		        "navigationBarBackgroundColor": "#fff",
-		        "navigationBarTextStyle": "black"
-		    }
-		}
-		,{
-		    "path" : "pages/cashdetail/cashdetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "代理提现",
-		        "navigationBarBackgroundColor": "#fff",
-		        "navigationBarTextStyle": "black"
-		    }
-		}
-		,{
-		    "path" : "pages/history/history",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "代理提现历史",
-		        "navigationBarBackgroundColor": "#fff",
-		        "navigationBarTextStyle": "black"
-		    }
-		    
-		},
-		
-		{
-			"path" : "pages/payment/payment",
-			"style" : 
-			{
-				"navigationBarTitleText" : "扫码",
+			}
+		},
+		{
+			"path": "pages/agent-login/index",
+			"style": {
+				"navigationBarTitleText": "代理登录",
+				"navigationBarBackgroundColor": "#1783FF",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/agent-index/index",
+			"style": {
+				"navigationBarTitleText": "代理主页",
+				"navigationBarBackgroundColor": "#1783FF",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/cash/cash",
+			"style": {
+				"navigationBarTitleText": "代理提现",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/cashdetail/cashdetail",
+			"style": {
+				"navigationBarTitleText": "代理提现",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/history/history",
+			"style": {
+				"navigationBarTitleText": "代理提现历史",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/payment/payment",
+			"style": {
+				"navigationBarTitleText": "扫码",
 				"navigationBarBackgroundColor": "#ededed",
 				"navigationBarTextStyle": "black"
 			}
 		},
-		
 		{
-			"path" : "pages/merchant-login/index",
-			"style" :                                                                                    
-			{
-			    "navigationBarTitleText": "商户登录",
+			"path": "pages/merchant-login/index",
+			"style": {
+				"navigationBarTitleText": "商户登录",
 				"navigationBarBackgroundColor": "#F52F3E",
 				"navigationBarTextStyle": "white"
-					
 			}
-			    
 		},
 		{
-			"path" : "pages/merchant-index/index",
-			"style" :                                                                                    
-			{
-			    "navigationBarTitleText": "商户主页",
+			"path": "pages/merchant-index/index",
+			"style": {
+				"navigationBarTitleText": "商户主页",
 				"navigationBarBackgroundColor": "#F52F3E",
 				"navigationBarTextStyle": "white"
-					
 			}
-			    
 		},
 		{
-			"path" : "pages/user-orders/user-orders",
-			"style" : 
-			{
-				"navigationBarTitleText" : "主页",
-				"enablePullDownRefresh" : false
+			"path": "pages/user-orders/user-orders",
+			"style": {
+				"navigationBarTitleText": "主页",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/withdrawal-history/withdrawal-history",
-			"style" : 
-			{
-				"navigationBarTitleText" : "提现历史",
-				"enablePullDownRefresh" : false
+			"path": "pages/withdrawal-history/withdrawal-history",
+			"style": {
+				"navigationBarTitleText": "提现历史",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/withdrawal-management/withdrawal-management",
-			"style" : 
-			{
-				"navigationBarTitleText" : "提现管理",
-				"enablePullDownRefresh" : false
+			"path": "pages/withdrawal-management/withdrawal-management",
+			"style": {
+				"navigationBarTitleText": "提现管理",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/queuing-information/queuing-information",
-			"style" : 
-			{
-				"navigationBarTitleText" : "用户排队信息",
+			"path": "pages/queuing-information/queuing-information",
+			"style": {
+				"navigationBarTitleText": "用户排队信息",
 				"navigationBarBackgroundColor": "#fff",
 				"navigationBarTextStyle": "black"
 			}
 		},
 		{
-			"path" : "pages/account-opened/account-opened",
-			"style" : 
-			{
-				"navigationBarTitleText" : "用户提现",
-				"enablePullDownRefresh" : false
+			"path": "pages/account-opened/account-opened",
+			"style": {
+				"navigationBarTitleText": "用户提现",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/merchant-withdrawal-management/merchant-withdrawal-management",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/merchant-withdrawal-management/merchant-withdrawal-management",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/merchant-withdrawal-history/merchant-withdrawal-history",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/merchant-withdrawal-history/merchant-withdrawal-history",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 		}
-	
-		
 	],
-	
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uView",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	}
-}
+}
\ No newline at end of file
diff --git a/agentApp/pages/index/index.vue b/agentApp/pages/agent-index/index.vue
similarity index 100%
rename from agentApp/pages/index/index.vue
rename to agentApp/pages/agent-index/index.vue
diff --git a/agentApp/pages/agent-login/index.vue b/agentApp/pages/agent-login/index.vue
index 7510c81..27726dc 100644
--- a/agentApp/pages/agent-login/index.vue
+++ b/agentApp/pages/agent-login/index.vue
@@ -125,7 +125,7 @@
 				}).then(data => {
 					uni.setStorageSync('agent_token', data.token)
 					uni.navigateTo({
-						url: '/pages/index/index'
+						url: '/pages/agent-index/index'
 					});
 				})
 			}
diff --git a/agentApp/pages/allpages/index.vue b/agentApp/pages/allpages/index.vue
index e0276c4..852ee64 100644
--- a/agentApp/pages/allpages/index.vue
+++ b/agentApp/pages/allpages/index.vue
@@ -37,7 +37,7 @@
 					break;
 					case 2:
 					uni.navigateTo({
-						url: '/pages/index/index'
+						url: '/pages/agent-index/index'
 					});
 					break;
 					case 3: