From f13de0eafded9a5a927ae3903cbd80b29251baf4 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Mon, 8 Jul 2024 18:15:10 +0800 Subject: [PATCH] aaa --- common/http.interceptor.js | 4 ++-- page_components/fuwu/index.vue | 12 ++++++++---- page_fenbao/device/index.vue | 4 ++-- page_user/mapditu/index.vue | 1 + pages.json | 9 +++++++++ pages/shouye/index.vue | 31 +++++++++++++------------------ 6 files changed, 35 insertions(+), 26 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index f8c3e2b..dbce9cd 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,8 +20,8 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - // baseUrl: 'http://192.168.2.184:3000/dev-api', - baseUrl: 'https://kg.chuantewulian.cn/prod-api', + baseUrl: 'http://192.168.2.17:3000/dev-api', + // baseUrl: 'https://kg.chuantewulian.cn/prod-api', loadingText: '努力加载中~', loadingTime: 1000, // 设置自定义头部content-type diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue index d4989df..c2dd61a 100644 --- a/page_components/fuwu/index.vue +++ b/page_components/fuwu/index.vue @@ -219,6 +219,7 @@ if (res.code == 200) { this.mac = 'CTKG-' + res.data.mac this.onlineStatus = res.data.onlineStatus + // console.log(this.mac,'期初'); } }) }, @@ -313,8 +314,9 @@ content: '支付的时候请靠近设备并打开蓝牙', success: function(res) { if (res.confirm) { + console.log(that.deviceId,that.name); xBlufi.initXBlufi(1); - xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); + xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); xBlufi.notifyStartDiscoverBle({ 'isStart': true }) @@ -322,11 +324,11 @@ xBlufi.notifyStartDiscoverBle({ 'isStart': false }) - if (this.devicesList.length > 0) { + if (that.devicesList.length > 0) { xBlufi.notifyConnectBle({ isStart: true, - deviceId: this.deviceId, - name: this.name + deviceId: that.deviceId, + name: that.name }) } }, 2000) @@ -407,9 +409,11 @@ let devicesarr = options.data devicesarr.forEach(device => { const mac = device.name.substring(4); + console.log(device.name,this.mac,'111'); if (device.name == 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 diff --git a/page_fenbao/device/index.vue b/page_fenbao/device/index.vue index 198a4cc..1968105 100644 --- a/page_fenbao/device/index.vue +++ b/page_fenbao/device/index.vue @@ -225,7 +225,7 @@ if (!options.result) { console.log("蓝牙未开启", options); uni.showToast({ - title: '蓝牙未开启，如有疑问请查看查看常见问题', + title: '蓝牙未开启,请打开手机蓝牙', icon: 'none', duration: 3000 }); @@ -284,7 +284,7 @@ xBlufi.notifyStartDiscoverBle({ 'isStart': false }); - console.log(e, '蓝牙信息101010') + console.log(e, '蓝牙信息101010') const deviceId = e.deviceId this.Bluetoothmac = e.localName.substring(6) //从第七位开始截取 只取后面的mac号 this.mac = e.localName.substring(6) diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue index 1d40dfc..ac87555 100644 --- a/page_user/mapditu/index.vue +++ b/page_user/mapditu/index.vue @@ -333,6 +333,7 @@ }, handleMarkerClick(e) { + console.log(e); this.$u.get("/app/store/" + e.markerId).then(res => { if (res.code == 200) { this.listobj = res.data diff --git a/pages.json b/pages.json index eec9ee0..a23036a 100644 --- a/pages.json +++ b/pages.json @@ -233,6 +233,15 @@ "navigationBarTextStyle": "#FFFFFF", "navigationStyle": "custom" } + },{ + "path": "zhuce", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3996FD", + "navigationBarTextStyle": "#FFFFFF", + "navigationStyle": "custom" + } },{ "path": "device/lianjie", "style": { diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index 7a97dd8..1159c3b 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -125,23 +125,18 @@ uni.navigateTo({ url: '/page_user/sbdetail?id=' +that.deviceobj.deviceId }) - // uni.showModal({ - // title: '提示', - // content: '绑定成功，需前去设置吗？', - // success: function(res) { - // if (res.confirm) { - - // } else if (res.cancel) { - - // } - // } - // }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 1000 - }) + }else { + if(res.msg == '设备未录入'){ + uni.navigateTo({ + url:'/page_fenbao/zhuce?sn=' + id + }) + }else{ + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 1000 + }) + } } }) } else if (res.cancel) { @@ -375,7 +370,7 @@ } }, fail: (error) => { - console.error('获取地图缩放级别失败：', error); + // console.error('获取地图缩放级别失败：', error); }, }) },