diff --git a/manifest.json b/manifest.json
index b14d530..e9579a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,7 @@
 {
     "name" : "若依移动端",
-<<<<<<< HEAD
     "appid" : "__UNI__9F2C9D7",
-=======
     "appid" : "__UNI__9285214",
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
     "description" : "",
     "versionName" : "1.1.0",
     "versionCode" : "100",
diff --git a/pages.json b/pages.json
index 60ca896..6abce93 100644
--- a/pages.json
+++ b/pages.json
@@ -21,22 +21,12 @@
 			}
 		},
 		{
-<<<<<<< HEAD
 			"path": "pages/Friend/Interactivemessage",
 			"style": {
 				"navigationBarTitleText": "互动消息",
 				"navigationStyle": "custom"
-=======
-			 		"path": "pages/Friend/violationreporting"
-				},
-		{
-			"path" : "pages/post/postInfo/postInfo",
-			"style" :
-			{
-				"navigationBarTitleText" : "话题详情"
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
-			}
-		},
+				}},
+
 		{
 			"path": "pages/Friend/addfruebd",
 			"style": {
@@ -45,39 +35,20 @@
 			}
 		},
 		{
-<<<<<<< HEAD
-			"path": "pages/communication/addfriends",
-			"style": {
-				"navigationBarTitleText": "添加好友",
-				"navigationStyle": "custom"
-			}
-		},
-
-		{
-			"path": "pages/signln/signid",
-			"style": {
-				"navigationBarTitleText": "签到任务",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Friend/violationreporting",
-=======
 			"path": "pages/signln/harvestaddress",
 
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 			"style": {
 				"navigationBarTitleText": "违规举报",
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/signln/harvestaddress",
-			"style": {
-				"navigationBarTitleText": "地址",
-				"navigationStyle": "custom"
-			}
-		},
+		// {
+		// 	"path": "pages/signln/harvestaddress",
+		// 	"style": {
+		// 		"navigationBarTitleText": "地址",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
 		{
 			"path": "pages/post/postInfo/postInfo",
 			"style": {
@@ -107,15 +78,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-<<<<<<< HEAD
-=======
-		// {
-		// 	"path": "pages/signln/harvestaddress",
-		// 	"style": {
-		// 		"navigationBarTitleText": "收货地址",
-		// 		"navigationStyle": "custom"
-		// 	}
-		// },
+
 
 		{
 			"path": "pages/signln/successfulexchange",
@@ -327,12 +290,7 @@
 			"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",
@@ -357,8 +315,8 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
-<<<<<<< HEAD
-}
-=======
 
 }
+
+
+
diff --git a/pages/common/postview/index.vue b/pages/common/postview/index.vue
index 965442a..bf7d06b 100644
--- a/pages/common/postview/index.vue
+++ b/pages/common/postview/index.vue
@@ -54,11 +54,11 @@
 				    <!-- 靠左对齐 -->
 					<view class="">
 						<view class="p-item">
-<<<<<<< HEAD
+
 						    <!-- <image style="width: 40rpx; height: 40rpx;" src="../static/images/icon/tu2-9.png" mode=""></image> -->
-=======
+
 						    <image style="width: 40rpx; height: 40rpx;" src="../../../static/images/icon/tu2-9.png" mode=""></image>
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+
 						    <text class="count">{{ postValue.transmitCount }}</text>
 						</view>
 					</view>
diff --git a/permission.js b/permission.js
index 453440d..7c268f4 100644
--- a/permission.js
+++ b/permission.js
@@ -1,6 +1,6 @@
 import { getToken } from "@/utils/auth";
 
-<<<<<<< HEAD
+
 // // 登录页面
 // const loginPage = "/pages/loginInfo/login";
 
@@ -10,7 +10,7 @@ import { getToken } from "@/utils/auth";
 //   "/pages/register",
 //   "/pages/common/webview/index",
 // ];
-=======
+
 // 登录页面
 const loginPage = "/pages/login";
 
@@ -20,7 +20,7 @@ const whiteList = [
   "/pages/register",
   "/pages/common/webview/index",
 ];
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+
 
 // // 检查地址白名单
 // function checkWhite(url) {