diff --git a/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue b/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue
index 79996ea..60de911 100644
--- a/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue
+++ b/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue
@@ -473,6 +473,7 @@
 			};
 		},
 		onShow() {
+<<<<<<< HEAD
 			wx.enableAlertBeforeUnload({
 						 message: "是否确认退出详情页面？",
 						 success: function (res) {
@@ -494,6 +495,8 @@
 			//1 设为优秀案例 swyxal
 			// 常错词 ccc
 			// 校准 xz
+=======
+>>>>>>> dev
 			this.intention=false;
 			this.kehuyixiangcenterindex=0;
 			this.buildingID = uni.getStorageSync('buildingID').id;
@@ -526,14 +529,14 @@
 		// 在组件实例被从页面节点树移除时执行
 		destroyed: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
 		// 销毁实例
 		onUnload: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
@@ -748,10 +751,27 @@
 					// 播放监听
 					console.log('播放!');
 					this.audioPlay = true;
+					wx.enableAlertBeforeUnload({
+					 message: "是否确认退出详情页面？",
+					 success: function (res) {
+					   console.log("方法注册成功：", res);
+					 },
+					 fail: function (errMsg) {
+					   console.log("方法注册失败：", errMsg);
+					 },
+					});
 				});
 			},
 			onPause(){
 				this.innerAudioContext.onPause(() => {
+					  wx.disableAlertBeforeUnload({
+					        success:function(res){
+					          console.log(res)
+					        },
+					        fail:function(e){
+					          console.log(e)
+					        }
+					      });
 					// 暂停监听
 					console.log('暂停播放!');
 					this.audioPlay = false
diff --git a/pages/learning/Thefulltext/index.vue b/pages/learning/Thefulltext/index.vue
index b4230c0..52d8109 100644
--- a/pages/learning/Thefulltext/index.vue
+++ b/pages/learning/Thefulltext/index.vue
@@ -212,15 +212,15 @@
 			},30000)
 		},
 		onShow: function() {
-			wx.enableAlertBeforeUnload({
-						 message: "是否确认退出详情页面？",
-						 success: function (res) {
-						   console.log("方法注册成功：", res);
-						 },
-						 fail: function (errMsg) {
-						   console.log("方法注册失败：", errMsg);
-						 },
-			});
+			// wx.enableAlertBeforeUnload({
+			// 			 message: "是否确认退出详情页面？",
+			// 			 success: function (res) {
+			// 			   console.log("方法注册成功：", res);
+			// 			 },
+			// 			 fail: function (errMsg) {
+			// 			   console.log("方法注册失败：", errMsg);
+			// 			 },
+			// });
 			this.initRecord();
 			
 			let pages = getCurrentPages();
@@ -244,14 +244,14 @@
 		destroyed: function() {
 			clearTimeout(this.timer)
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
 		// 销毁实例
 		onUnload: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
@@ -279,20 +279,37 @@
 					// console.log(res)
 				})
 			},
-			onPlay(){
-				this.innerAudioContext.onPlay(() => {
-					// 播放监听
-					console.log('播放!');
-					this.audioPlay = true;
-				});
-			},
-			onPause(){
-				this.innerAudioContext.onPause(() => {
-					// 暂停监听
-					console.log('暂停播放!');
-					this.audioPlay = false
+		onPlay(){
+			this.innerAudioContext.onPlay(() => {
+				// 播放监听
+				console.log('播放!');
+				this.audioPlay = true;
+				wx.enableAlertBeforeUnload({
+				 message: "是否确认退出详情页面？",
+				 success: function (res) {
+				   console.log("方法注册成功：", res);
+				 },
+				 fail: function (errMsg) {
+				   console.log("方法注册失败：", errMsg);
+				 },
 				});
-			},
+			});
+		},
+		onPause(){
+			this.innerAudioContext.onPause(() => {
+				  wx.disableAlertBeforeUnload({
+				        success:function(res){
+				          console.log(res)
+				        },
+				        fail:function(e){
+				          console.log(e)
+				        }
+				      });
+				// 暂停监听
+				console.log('暂停播放!');
+				this.audioPlay = false
+			});
+		},
 			onCanplay() {
 			    this.innerAudioContext.onCanplay((callback) => {  
 			        console.log("缓冲回调",this.innerAudioContext.duration);  
diff --git a/pages/learning/Thefulltext/index2.vue b/pages/learning/Thefulltext/index2.vue
index c862f53..5dd3614 100644
--- a/pages/learning/Thefulltext/index2.vue
+++ b/pages/learning/Thefulltext/index2.vue
@@ -242,15 +242,15 @@
 			},30000)
 		},
 		onShow: function() {
-			wx.enableAlertBeforeUnload({
-						 message: "是否确认退出详情页面？",
-						 success: function (res) {
-						   console.log("方法注册成功：", res);
-						 },
-						 fail: function (errMsg) {
-						   console.log("方法注册失败：", errMsg);
-						 },
-			});
+			// wx.enableAlertBeforeUnload({
+			// 			 message: "是否确认退出详情页面？",
+			// 			 success: function (res) {
+			// 			   console.log("方法注册成功：", res);
+			// 			 },
+			// 			 fail: function (errMsg) {
+			// 			   console.log("方法注册失败：", errMsg);
+			// 			 },
+			// });
 			this.initRecord();
 			
 			if(this.stateisshow==2){
@@ -279,14 +279,14 @@
 		destroyed: function() {
 			clearTimeout(this.timer)
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
 		// 销毁实例
 		onUnload: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
@@ -320,10 +320,27 @@
 					// 播放监听
 					console.log('播放!');
 					this.audioPlay = true;
+					wx.enableAlertBeforeUnload({
+					 message: "是否确认退出详情页面？",
+					 success: function (res) {
+					   console.log("方法注册成功：", res);
+					 },
+					 fail: function (errMsg) {
+					   console.log("方法注册失败：", errMsg);
+					 },
+					});
 				});
 			},
 			onPause(){
 				this.innerAudioContext.onPause(() => {
+					  wx.disableAlertBeforeUnload({
+					        success:function(res){
+					          console.log(res)
+					        },
+					        fail:function(e){
+					          console.log(e)
+					        }
+					      });
 					// 暂停监听
 					console.log('暂停播放!');
 					this.audioPlay = false
diff --git a/pages/mine/details.vue b/pages/mine/details.vue
index 8df1ee9..9e2b79a 100644
--- a/pages/mine/details.vue
+++ b/pages/mine/details.vue
@@ -271,6 +271,7 @@
 			this.stateisshow=options.stateisshow;
 		},
 		onShow() {
+<<<<<<< HEAD
 			wx.enableAlertBeforeUnload({
 						 message: "是否确认退出详情页面？",
 						 success: function (res) {
@@ -286,6 +287,14 @@
 			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
@@ -318,14 +327,14 @@
 		// 在组件实例被从页面节点树移除时执行
 		destroyed: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
 		// 销毁实例
 		onUnload: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
@@ -412,15 +421,32 @@
 					url: '/pages/learning/Keywordsearch?customerId='+this.customerId +"&status="+this.status +"&skpl="+"1"
 				})
 			},
-			onPlay(){
+onPlay(){
 				this.innerAudioContext.onPlay(() => {
 					// 播放监听
 					console.log('播放!');
 					this.audioPlay = true;
+					wx.enableAlertBeforeUnload({
+					 message: "是否确认退出详情页面？",
+					 success: function (res) {
+					   console.log("方法注册成功：", res);
+					 },
+					 fail: function (errMsg) {
+					   console.log("方法注册失败：", errMsg);
+					 },
+					});
 				});
 			},
 			onPause(){
 				this.innerAudioContext.onPause(() => {
+					  wx.disableAlertBeforeUnload({
+					        success:function(res){
+					          console.log(res)
+					        },
+					        fail:function(e){
+					          console.log(e)
+					        }
+					      });
 					// 暂停监听
 					console.log('暂停播放!');
 					this.audioPlay = false
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index 2c85430..de68bfb 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -523,6 +523,7 @@
 			this.stateisshow=options.stateisshow;
 		},
 		onShow() {
+<<<<<<< HEAD
 			wx.enableAlertBeforeUnload({
 			 message: "是否确认退出详情页面？",
 			 success: function (res) {
@@ -552,6 +553,14 @@
 			// 常错词 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;
@@ -580,14 +589,14 @@
 		// 在组件实例被从页面节点树移除时执行
 		destroyed: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
 		// 销毁实例
 		onUnload: function() {
 			//暂停
-			this.innerAudioContext.pause()
+			// this.innerAudioContext.pause()
 			// 销毁
 			this.innerAudioContext.destroy();
 		},
@@ -1046,10 +1055,27 @@
 					// 播放监听
 					console.log('播放!');
 					this.audioPlay = true;
+					wx.enableAlertBeforeUnload({
+					 message: "是否确认退出详情页面？",
+					 success: function (res) {
+					   console.log("方法注册成功：", res);
+					 },
+					 fail: function (errMsg) {
+					   console.log("方法注册失败：", errMsg);
+					 },
+					});
 				});
 			},
 			onPause(){
 				this.innerAudioContext.onPause(() => {
+					  wx.disableAlertBeforeUnload({
+					        success:function(res){
+					          console.log(res)
+					        },
+					        fail:function(e){
+					          console.log(e)
+					        }
+					      });
 					// 暂停监听
 					console.log('暂停播放!');
 					this.audioPlay = false