From 65414517b04220102589de1b54640728344f7395 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Fri, 8 Nov 2024 18:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=87=E8=8A=B1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_user/dingshi.vue            | 20 ++++++++++----------
 page_user/lanya.vue              | 23 +++++++++++++----------
 pages/index/index.vue            |  4 ++--
 pages/myorder/index.vue          |  2 +-
 pages/myorder/returned/index.vue |  8 +++-----
 5 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/page_user/dingshi.vue b/page_user/dingshi.vue
index b4f5da3..753cf7d 100644
--- a/page_user/dingshi.vue
+++ b/page_user/dingshi.vue
@@ -301,16 +301,16 @@
 					switch (options.type) {
 						case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED:
 							if (!options.result) {
-								uni.showModal({
-									title: '很抱歉提醒你！',
-									content: '小程序与设备异常断开',
-									showCancel: false,
-									//是否显示取消按钮
-									success: function(res) {
-										uni.hideLoading()
-										uni.removeStorage({key:'device_key'})
-									}
-								})
+								// uni.showModal({
+								// 	title: '很抱歉提醒你！',
+								// 	content: '小程序与设备异常断开',
+								// 	showCancel: false,
+								// 	//是否显示取消按钮
+								// 	success: function(res) {
+								// 		uni.hideLoading()
+								// 		uni.removeStorage({key:'device_key'})
+								// 	}
+								// })
 							}
 							break;
 						case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
diff --git a/page_user/lanya.vue b/page_user/lanya.vue
index 99c6686..96eaa86 100644
--- a/page_user/lanya.vue
+++ b/page_user/lanya.vue
@@ -105,7 +105,7 @@
 						// 	name: that.name
 						// })
 					}
-				}, 2000)
+				}, 5000)
 			},
 			methods:{
 				// 获取用户信息
@@ -135,6 +135,9 @@
 								icon: 'success',
 								duration: 3000
 							})
+							setTimeout(()=>{
+								uni.navigateBack()
+							},2000)
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -172,7 +175,7 @@
 						}
 						uni.hideLoading()
 						that.flag = true
-					 }, 2000)
+					 }, 5000)
 				 },
 
 				// 获取附近蓝牙设备列表
@@ -183,15 +186,15 @@
 							// 	connected: options.result
 							// })
 							if (!options.result) {
-								uni.showModal({
-									title: '很抱歉提醒你！',
-									content: '小程序与设备异常断开',
-									showCancel: false,
-									//是否显示取消按钮
-									success: function(res) {
+								// uni.showModal({
+								// 	title: '很抱歉提醒你！',
+								// 	content: '小程序与设备异常断开',
+								// 	showCancel: false,
+								// 	//是否显示取消按钮
+								// 	success: function(res) {
 										
-									}
-								})
+								// 	}
+								// })
 							}
 							break
 						case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 410cac3..a439f3e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -391,7 +391,7 @@
 							name: that.name
 						})
 					}
-				}, 2000)
+				}, 10000)
 			},
 			// 连接超时提示
 			getchao(){
@@ -901,7 +901,7 @@
 									name: that.name
 								})
 							}
-						}, 2000)
+						}, 10000)
 						that.getchao()
 					}else{
 						uni.showToast({
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index 89ee5a4..ac8c392 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -347,7 +347,7 @@
 							'isStart': false
 						});
 						this.seachflag = true
-				}, 2000)
+				},5000)
 				// }
 			},
 			// 点击隐藏没有设备提示
diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue
index 2ae34eb..977b4fc 100644
--- a/pages/myorder/returned/index.vue
+++ b/pages/myorder/returned/index.vue
@@ -288,11 +288,9 @@
 						wx.closeBLEConnection({
 							deviceId: this.deviceId,
 						})
-						// setTimeout(()=>{
-						// 	uni.navigateTo({
-						// 		url:'/page_user/wifijoint/index?sn=' + this.storeId
-						// 	})
-						// },1500)
+						setTimeout(()=>{
+							uni.navigateBack()
+						},2000)
 					} else {
 						uni.showToast({
 							title: res.msg,