diff --git a/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue b/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue
index 60de911..c7a4004 100644
--- a/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue
+++ b/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue
@@ -473,16 +473,6 @@
 			};
 		},
 		onShow() {
-<<<<<<< HEAD
-			wx.enableAlertBeforeUnload({
-						 message: "是否确认退出详情页面？",
-						 success: function (res) {
-						   console.log("方法注册成功：", res);
-						 },
-						 fail: function (errMsg) {
-						   console.log("方法注册失败：", errMsg);
-						 },
-			});
 			let newmenulist= uni.getStorageSync('weapp_session_Menu_data');
 			this.permissions.commonly1=newmenulist.bjgw;
 			// this.permissions.commonly2=newmenulist.jdwxbj;
@@ -495,8 +485,7 @@
 			//1 设为优秀案例 swyxal
 			// 常错词 ccc
 			// 校准 xz
-=======
->>>>>>> dev
+
 			this.intention=false;
 			this.kehuyixiangcenterindex=0;
 			this.buildingID = uni.getStorageSync('buildingID').id;
diff --git a/pages/mine/details.vue b/pages/mine/details.vue
index 9e2b79a..d151b78 100644
--- a/pages/mine/details.vue
+++ b/pages/mine/details.vue
@@ -271,31 +271,10 @@
 			this.stateisshow=options.stateisshow;
 		},
 		onShow() {
-<<<<<<< HEAD
-			wx.enableAlertBeforeUnload({
-						 message: "是否确认退出详情页面？",
-						 success: function (res) {
-						   console.log("方法注册成功：", res);
-						 },
-						 fail: function (errMsg) {
-						   console.log("方法注册失败：", errMsg);
-						 },
-			});
-
 			let newmenulist= uni.getStorageSync('weapp_session_Menu_data');
 			this.permissions.commonly2=newmenulist.jdwxbj;
 			this.permissions.commonly3=newmenulist.swyxal;
 			this.permissions.commonly4=newmenulist.ccc;
-
-=======
-			this.Menulist = uni.getStorageSync('weapp_session_Menu_data');
-			this.Menulist.forEach(item=>{
-				if(item.name=='标记有效无效接待'){
-					this.Menulistisshow=true;
-				}
-			})
->>>>>>> dev
-			
 			//1 接待无效标记 jdwxbj
 			//1 设为优秀案例 swyxal
 			// 常错词 ccc
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index de68bfb..97f31dc 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -523,22 +523,6 @@
 			this.stateisshow=options.stateisshow;
 		},
 		onShow() {
-<<<<<<< HEAD
-			wx.enableAlertBeforeUnload({
-			 message: "是否确认退出详情页面？",
-			 success: function (res) {
-			   console.log("方法注册成功：", res);
-			 },
-			 fail: function (errMsg) {
-			   console.log("方法注册失败：", errMsg);
-			 },
-		   });
-			// this.Menulist = uni.getStorageSync('weapp_session_Menu_data');
-			// this.Menulist.forEach(item=>{
-			// 	if(item.name=='标记有效无效接待'){
-			// 		this.Menulistisshow=true;
-			// 	}
-			// })
 			
 			let newmenulist= uni.getStorageSync('weapp_session_Menu_data');
 			this.permissions.commonly1=newmenulist.bjgw;
@@ -552,15 +536,6 @@
 			//1 设为优秀案例 swyxal
 			// 常错词 ccc
 			// 校准 xz
-			
-=======
-			this.Menulist = uni.getStorageSync('weapp_session_Menu_data');
-			this.Menulist.forEach(item=>{
-				if(item.name=='标记有效无效接待'){
-					this.Menulistisshow=true;
-				}
-			})
->>>>>>> dev
 			this.intention=false;
 			this.kehuyixiangcenterindex=0;
 			this.buildingID = uni.getStorageSync('buildingID').id;