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 @@