From 0007cf28bd6686244435947aea06cc773545981b Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Thu, 5 Dec 2024 14:36:26 +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

---
 pages/index/index.vue            | 11 ++++-------
 pages/myorder/index.vue          | 10 ++++++++--
 pages/myorder/returned/index.vue |  7 ++++++-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index a439f3e..8956175 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -355,7 +355,7 @@
 				this.datalist = ''
 				this.mac = ''
 				this.ver_data = {}
-				uni.navigateTo({
+				uni.reLaunch({
 					url:'/pages/myorder/index'
 				})
 			},
@@ -391,7 +391,7 @@
 							name: that.name
 						})
 					}
-				}, 10000)
+				}, 5000)
 			},
 			// 连接超时提示
 			getchao(){
@@ -460,7 +460,7 @@
 								}
 							})
 						}
-					},
+					}
 				})
 			},
 			// 获取用户信息
@@ -901,7 +901,7 @@
 									name: that.name
 								})
 							}
-						}, 10000)
+						}, 5000)
 						that.getchao()
 					}else{
 						uni.showToast({
@@ -974,8 +974,6 @@
 					url: '/page_user/jiaoshui'
 				})
 			},
-
-
 			// 获取附近蓝牙设备列表
 			funListenDeviceMsgEvent: function(options) {
 				switch (options.type) {
@@ -1005,7 +1003,6 @@
 								if (device.name.slice(5, 17) == this.mac) {
 									this.deviceId = device.deviceId
 									this.name = device.name
-									// console.log(device.name,this.mac,'222');
 									this.devicesList.push(device)
 									let uniqueDevicesList = Array.from(new Set(this.devicesList))
 									this.devicesList = uniqueDevicesList;
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index ac8c392..8bf314e 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
 		<u-navbar title="设备录入" :border-bottom="false" :background="bgc" title-size='38' title-color='#000'
-			back-icon-color="#000" height='50'></u-navbar>
+			back-icon-color="#000" height='50' :custom-back="btnfanahui"></u-navbar>
 		<view class="title">
 			<text>设备录入列表</text>
 			<!-- <text style="font-size: 28rpx;width: 160rpx;height: 60rpx;border-radius: 20rpx;background-color: #7FAD76;text-align: center;color: #fff;line-height: 60rpx;margin-top: 20rpx;" @click="btnkzt">控制台</text> -->
@@ -132,6 +132,12 @@
 					url:'/page_user/wifijoint/index' 
 				})
 			},
+			// 点击返回上一级
+			btnfanahui(){
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+			},
 			// 扫码sn
 			scanQRCode(item) {
 				this.snname = item.name
@@ -312,7 +318,7 @@
 			createBLEConnections(e) {
 				let Bluetoothmac = e.name.substring(5)
 				this.devicesLists = []
-				uni.navigateTo({
+				uni.reLaunch({
 					url:'/pages/myorder/returned/index?mac='+Bluetoothmac
 				})
 			},
diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue
index 977b4fc..b0f90ab 100644
--- a/pages/myorder/returned/index.vue
+++ b/pages/myorder/returned/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="添加设备" :border-bottom="false" :background="bgc" title-color='#262B37' title-size='38'
-			height='50'></u-navbar>
+			height='50' :custom-back="btns"></u-navbar>
 		<view class="iptbox" @click="backpage()">
 
 			<input type="text" class="ips" v-model="mac" placeholder=" " style="margin-left: 32rpx;" 
@@ -170,6 +170,11 @@
 
 		},
 		methods: {
+			btns(){
+				uni.reLaunch({
+					url:'/pages/myorder/index'
+				})
+			},
 			confirm(e) {
 				// console.log(e);
 				this.banben = e[0].label