diff --git a/pages.json b/pages.json
index 1d8133d..8f6266e 100644
--- a/pages.json
+++ b/pages.json
@@ -7,10 +7,9 @@
 			"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
-<<<<<<< HEAD
-	"pages": [{
-			"path": "pages/Friend/violationreporting",
-=======
+
+
+
 	"pages": [
 		{
 			"path": "pages/index",
@@ -20,6 +19,9 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			 		"path": "pages/Friend/violationreporting"
+				},
 		{
 			"path" : "pages/post/postInfo/postInfo",
 			"style" :
@@ -36,7 +38,7 @@
 		},
 		{
 			"path": "pages/signln/harvestaddress",
->>>>>>> fc6726a74b5811cc7e918233ea3a847aadb88d7d
+
 			"style": {
 				"navigationBarTitleText": "违规举报",
 				"navigationStyle": "custom"
@@ -64,13 +66,13 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/signln/harvestaddress",
-			"style": {
-				"navigationBarTitleText": "收货地址",
-				"navigationStyle": "custom"
-			}
-		},
+		// {
+		// 	"path": "pages/signln/harvestaddress",
+		// 	"style": {
+		// 		"navigationBarTitleText": "收货地址",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
 
 		{
 			"path": "pages/signln/successfulexchange",
@@ -79,21 +81,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-<<<<<<< HEAD
-			"path": "pages/index",
-			"style": {
-				"navigationBarTitleText": "若依移动端框架",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
-=======
-			"path": "pages/signln/signid",
-			"style": {
-				"navigationBarTitleText": "签到任务",
-				"navigationStyle": "custom"
->>>>>>> fc6726a74b5811cc7e918233ea3a847aadb88d7d
-			}
-		},
+
 		{
 			"path": "pages/signln/signiddetails",
 			"style": {
@@ -317,4 +305,5 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
+
 }