diff --git a/pages.json b/pages.json
index 1c26e95..272062b 100644
--- a/pages.json
+++ b/pages.json
@@ -7,14 +7,7 @@
 			"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "若依移动端框架",
@@ -23,20 +16,18 @@
 			}
 		},
 		{
-<<<<<<< HEAD
+
 			"path": "pages/Friend/Interactivemessage",
 			"style": {
 				"navigationBarTitleText": "互动消息",
 				"navigationStyle": "custom"
-=======
-			 		"path": "pages/Friend/violationreporting"
-				},
+			}
+		},
+
 		{
-			"path" : "pages/post/postInfo/postInfo",
-			"style" :
-			{
-				"navigationBarTitleText" : "话题详情"
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+			"path": "pages/post/postInfo/postInfo",
+			"style": {
+				"navigationBarTitleText": "话题详情"
 			}
 		},
 		{
@@ -47,7 +38,6 @@
 			}
 		},
 		{
-<<<<<<< HEAD
 			"path": "pages/communication/addfriends",
 			"style": {
 				"navigationBarTitleText": "添加好友",
@@ -63,10 +53,8 @@
 		},
 		{
 			"path": "pages/Friend/violationreporting",
-=======
 			"path": "pages/signln/harvestaddress",
 
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 			"style": {
 				"navigationBarTitleText": "违规举报",
 				"navigationStyle": "custom"
@@ -108,17 +96,15 @@
 				"navigationStyle": "custom"
 			}
 		},
-<<<<<<< HEAD
-=======
-		// {
-		// 	"path": "pages/signln/harvestaddress",
-		// 	"style": {
-		// 		"navigationBarTitleText": "收货地址",
-		// 		"navigationStyle": "custom"
-		// 	}
-		// },
 
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+		{
+			"path": "pages/signln/harvestaddress",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"navigationStyle": "custom"
+			}
+		},
+
 		{
 			"path": "pages/signln/successfulexchange",
 			"style": {
@@ -126,10 +112,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-<<<<<<< HEAD
-=======
-
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 		{
 			"path": "pages/signln/signiddetails",
 			"style": {
@@ -194,7 +176,7 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": true,
-		        "onReachBottomDistance": 100
+				"onReachBottomDistance": 100
 			}
 		},
 		{
@@ -299,25 +281,19 @@
 				"navigationBarTitleText": "消息通知",
 				"navigationStyle": "custom"
 			}
-		}
-<<<<<<< HEAD
-=======
-		,
+		},
 		{
 			"path": "pages/takeaway/index",
 			"style": {
 				"navigationBarTitleText": "外卖"
 			}
-		}
-		,
+		},
 		{
 			"path": "pages/partJob/index",
 			"style": {
 				"navigationBarTitleText": "兼职"
 			}
 		}
-
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 	],
 	"tabBar": {
 		"color": "#000000",
@@ -325,49 +301,47 @@
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
-			"pagePath": "pages/index",
-			"iconPath": "static/images/tabbar/tu1-2.png",
-			"selectedIconPath": "static/images/tabbar/tu1-1.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/activity/index",
-			"iconPath": "static/images/tabbar/tu1-4.png",
-			"selectedIconPath": "static/images/tabbar/tu1-3.png",
-			"text": "活动"
-		}
-		// , {
-		// 	"pagePath": "pages/work/index",
-		// 	"iconPath": "static/images/tabbar/work.png",
-		// 	"selectedIconPath": "static/images/tabbar/work_.png",
-		// 	"text": "工作台"
-		// }
-		,{
-			"pagePath": "pages/partJob/index",
-		     "iconPath": "static/images/tabbar/tu1-6.png",
-		 	"selectedIconPath": "static/images/tabbar/tu1-5.png",
-		 	"text": "兼职"
-		}
-		,{
-			"pagePath": "pages/takeaway/index",
-		     "iconPath": "static/images/tabbar/tu1-8.png",
-		 	"selectedIconPath": "static/images/tabbar/tu1-7.png",
-		 	"text": "外卖"
-		}
-		, {
-			"pagePath": "pages/mine/index",
-			"iconPath": "static/images/tabbar/tu1-10.png",
-			"selectedIconPath": "static/images/tabbar/tu1-9.png",
-			"text": "我的"
-		}]
+				"pagePath": "pages/index",
+				"iconPath": "static/images/tabbar/tu1-2.png",
+				"selectedIconPath": "static/images/tabbar/tu1-1.png",
+				"text": "首页"
+			}, {
+				"pagePath": "pages/activity/index",
+				"iconPath": "static/images/tabbar/tu1-4.png",
+				"selectedIconPath": "static/images/tabbar/tu1-3.png",
+				"text": "活动"
+			}
+			// , {
+			// 	"pagePath": "pages/work/index",
+			// 	"iconPath": "static/images/tabbar/work.png",
+			// 	"selectedIconPath": "static/images/tabbar/work_.png",
+			// 	"text": "工作台"
+			// }
+			, {
+				"pagePath": "pages/partJob/index",
+				"iconPath": "static/images/tabbar/tu1-6.png",
+				"selectedIconPath": "static/images/tabbar/tu1-5.png",
+				"text": "兼职"
+			}, {
+				"pagePath": "pages/takeaway/index",
+				"iconPath": "static/images/tabbar/tu1-8.png",
+				"selectedIconPath": "static/images/tabbar/tu1-7.png",
+				"text": "外卖"
+			}, {
+				"pagePath": "pages/mine/index",
+				"iconPath": "static/images/tabbar/tu1-10.png",
+				"selectedIconPath": "static/images/tabbar/tu1-9.png",
+				"text": "我的"
+			}
+		]
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
-<<<<<<< HEAD
-}
-=======
 
 }
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+
+
+}
\ No newline at end of file