diff --git a/pages.json b/pages.json
index c85702f..a1b4976 100644
--- a/pages.json
+++ b/pages.json
@@ -211,22 +211,22 @@
 				// ... 分包A的其他页面  
 			]
 		},
-		{
-			"root": "pages_adminSet", // 分包A的根目录  
-			"pages": [
-				{
-					"path": "shgl",
-					"style": {
-						"navigationBarTitleText": "上传",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				}
+		// {
+		// 	"root": "pages_adminSet", // 分包A的根目录  
+		// 	"pages": [
+		// 		{
+		// 			"path": "shgl",
+		// 			"style": {
+		// 				"navigationBarTitleText": "上传",
+		// 				"enablePullDownRefresh": false,
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		}
 			
 				
-				// ... 分包A的其他页面  
-			]
-		},
+		// 		// ... 分包A的其他页面  
+		// 	]
+		// },
 		{
 			"root": "page_user",
 			"pages": [{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 97e7e0f..c5f3611 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1069,7 +1069,13 @@
 				this.$nextTick(() => {
 					this.initScroll();
 				});
-			}
+			},
+			showdevice(newValue, oldValue) {
+				console.log('showdevice变化了', newValue, oldValue);
+			},
+			deviceIndex(newValue, oldValue) {
+				console.log('deviceIndex变化了', newValue, oldValue);
+			},
 
 		},
 
@@ -1134,9 +1140,9 @@
 				}
 
 			}
-			setTimeout(() => {
-				this.$store.commit('SET_SHOWTIPS', true);
-			}, 500)
+			// setTimeout(() => {
+			// 	this.$store.commit('SET_SHOWTIPS', true);
+			// }, 500)
 		},
 		onShow() {
 			this.timestare()
@@ -1208,7 +1214,8 @@
 									that.longitude = lb.longitude;
 									that.deviceGps.latitude = lb.latitude;
 									that.deviceGps.longitude = lb.longitude;
-									console.log(that.areaInfo, 'that.areaInfo');
+									// console.log(that.areaInfo, 'that.areaInfo');
+									console.log('进入了1111111111111');
 									that.getArea()
 									if (that.qParam != 'null' && that.showagre == false) {
 										let qParam = that.qParam
@@ -1279,6 +1286,8 @@
 
 			} else {
 				this.getinfo()
+				
+				
 			}
 
 		},
@@ -1288,7 +1297,7 @@
 			if (this.timers) {
 				clearInterval(this.timers);
 				this.timers = null;
-				console.log('定时器已清除');
+				console.log('定时器已清除1');
 			}
 			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
 			xBlufi.notifyStartDiscoverBle({
@@ -1300,7 +1309,7 @@
 			if (this.timers) {
 				clearInterval(this.timers);
 				this.timers = null;
-				console.log('定时器已清除');
+				console.log('定时器已清除2');
 			}
 			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
 			xBlufi.notifyStartDiscoverBle({
@@ -1312,7 +1321,7 @@
 			if (this.timers) {
 				clearInterval(this.timers);
 				this.timers = null;
-				console.log('定时器已清除');
+				console.log('定时器已清除3');
 			}
 			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
 			xBlufi.notifyStartDiscoverBle({
@@ -4382,18 +4391,25 @@
 			getinfo() {
 				if (uni.getStorageSync('token')) {
 					this.$u.get("/getAppInfo").then((res) => {
-
+					
 						if (res.code == 200) {
 							this.$store.commit('SET_USERID', res.user.userId);
 							this.userinfo = res.user
-
+							setTimeout(()=>{
+								console.log(this.userinfo.balance,this.deviceIndex,this.showdevice,'this.userinfo.balancethis.userinfo.balancethis.userinfo.balance');
+								if(this.userinfo.balance!=0&&this.deviceIndex==1&&this.showdevice==true){
+									this.taploadmask(1)
+								}
+								
+							},300)
 						} else {
-							setTimeout(() => {
-								this.getinfo()
-							}, )
-
+							// setTimeout(() => {
+							// 	this.getinfo()
+							// }, 200)
+					
 						}
 					});
+				
 
 
 				}
@@ -4430,11 +4446,10 @@
 					this.gps.sn = this.sn
 				}
 				
-
 				this.$u.get('/app/area/info?', this.gps).then((res) => {
 					// this.showmap = true
 					if (res.code === 200) {
-
+				
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
 						// console.log(polylines,'polylinespolylinespolylines');
@@ -4445,11 +4460,11 @@
 						setTimeout(() => {
 							let abb = this.cleanedText()
 							console.log(abb.length, 'cleanedTextcleanedTextcleanedText');
-
+				
 							// 计算滚动时间，基于文本宽度
 							this.duration = abb.length * 0.3; // 50 px/s 的速度
 						}, 200)
-
+				
 						this.polyline.push(polylines)
 						console.log();
 						// console.log(this.areaInfo, 'areaInfoareaInfo');
@@ -4460,14 +4475,14 @@
 						this.getParking()
 						if (uni.getStorageSync('token')) {
 							this.getisInOrder()
-
+				
 						}
 						const hasShownPopup = uni.getStorageSync('hasShownPopup');
 						console.log(hasShownPopup, 'hasShownPopup');
-
+				
 						if (hasShownPopup === '' || hasShownPopup === null) {
 							console.log('1111111111');
-
+				
 							this.showTips = true;
 							this.startCountdown();
 							uni.setStorageSync('hasShownPopup', true);
@@ -4476,7 +4491,7 @@
 							this.showTips = uni.getStorageSync('hasShownPopup');
 							console.log(this.showTips, 'this.showTips');
 							this.startCountdown();
-
+				
 						}
 						if (this.sn) {
 							setTimeout(()=>{
@@ -4490,7 +4505,7 @@
 							},800)
 						
 						}
-
+				
 						// if(!hasShownPopup){
 						// 	console.log(typeof(hasShownPopup),'hasShownPopuphasShownPopup');
 						// 	this.showTips=uni.getStorageSync('hasShownPopup')
@@ -4498,7 +4513,7 @@
 						// 	this.showTips=true
 						// 	uni.setStorageSync('hasShownPopup', true);
 						// }
-
+				
 						// this.$store.commit('SET_SHOWTIPS', true);
 						// console.log(this.polyline);
 					} else {
@@ -4511,6 +4526,7 @@
 				}).catch(error => {
 					console.error("Error fetching area data:", error);
 				});
+			
 			},
 
 			convertBoundaryToPolyline(boundary) {