diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index 5c0799a..4b00e7c 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -120,7 +120,7 @@
 	var ble = null;
 	var these = null;
 	var eventChannel = null;
-	var searchTime=null;
+	
 	export default {
 		data() {
 			return {
@@ -525,8 +525,8 @@
 						return;
 					}
 				}
-				clearTimeout(searchTime);
-				searchTime=setTimeout(()=>{
+			
+			
 					
 					ble.StopSearch().finally(() => {
 					
@@ -559,7 +559,7 @@
 						});
 					});
 					
-				},800);
+				
 			
 			},
 			isItemLink: function(item, index) {
diff --git a/pages/common/allType/index.vue b/pages/common/allType/index.vue
index b43abbc..7715b24 100644
--- a/pages/common/allType/index.vue
+++ b/pages/common/allType/index.vue
@@ -114,11 +114,10 @@
 				uni.switchTab({
 					url: '/pages/common/index/index',
 					success: (res) => {
-						res.eventChannel.emit('index', {
-							data: item
-						});
+					 let eventChannel = this.getOpenerEventChannel();
+					  eventChannel.emit('index', item);						  				
 					}
-				})
+				});
 			}
 
 		},
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index b6b2598..ebfe61c 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -343,15 +343,30 @@
 			// 所有分享,所有类型
 			handleshareClick(item) {
 				this.showshare = false; // 关闭弹窗
+				var that=this;
 				switch (item.action) {
 					case 'type':
 						uni.navigateTo({
-							url: '/pages/common/allType/index'
+							url: '/pages/common/allType/index',
+							events:{
+								index(data){									
+								if(data && data.id){
+									that.tabs.find((v,i)=>{										
+										if(v.id===data.id){
+											that.switchTab(v,i);
+											return true;
+										}
+										return false;
+									})
+								}
+								}
+							}
 						});
 						break;
 					case 'share':
 						uni.navigateTo({
-							url: "/pages/common/allShare/index"
+							url: "/pages/common/allShare/index",
+							
 						})
 						break;
 				}
@@ -739,6 +754,7 @@
 			}
 		},
 		onLoad() {
+			debugger;
 			console.error("首页加载");
 			this.getTab()
 			this.downCallback();