From 63cf0b1e50a6eb39e46b4280afe567b1c96af9df Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Thu, 30 May 2024 17:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.interceptor.js | 2 +- page_components/fuwu/index.vue | 2 +- page_fenbao/statulist/fault/yichang/index.vue | 2 +- .../statulist/myshop/shopdetail/index.vue | 9 +- page_user/mapditu/index.vue | 2 +- page_user/sbdetail.vue | 321 +++++++++--------- page_user/switchs.vue | 2 +- pages/shouye/index.vue | 3 +- 8 files changed, 173 insertions(+), 170 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 6e2ff30..a29f9ef 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -21,7 +21,7 @@ const install = (Vue, vm) => { // }); Vue.prototype.$u.http.setConfig({ // baseUrl: 'http://192.168.2.184:3000/dev-api', - baseUrl: 'https://kaiguan.chuantewulian.cn/prod-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 602ec58..512897a 100644 --- a/page_components/fuwu/index.vue +++ b/page_components/fuwu/index.vue @@ -85,7 +85,7 @@ } let sceneValue = option.q let decodedValue = decodeURIComponent(sceneValue); - this.id = getQueryParam(decodedValue, 'deviceNo') + this.id = getQueryParam(decodedValue, 's') console.log(this.id) this.startTimer() this.gettaoc() diff --git a/page_fenbao/statulist/fault/yichang/index.vue b/page_fenbao/statulist/fault/yichang/index.vue index 40989db..bfa3aa7 100644 --- a/page_fenbao/statulist/fault/yichang/index.vue +++ b/page_fenbao/statulist/fault/yichang/index.vue @@ -79,7 +79,7 @@ } let sceneValue = res.result let decodedValue = decodeURIComponent(sceneValue); - this.deviceNo = getQueryParam(decodedValue, 'deviceNo') + this.deviceNo = getQueryParam(decodedValue, 's') // this.deviceNo = res.result; }, fail: err => { diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue index 63206fb..21d662a 100644 --- a/page_fenbao/statulist/myshop/shopdetail/index.vue +++ b/page_fenbao/statulist/myshop/shopdetail/index.vue @@ -180,14 +180,10 @@ } let sceneValue = res.result let decodedValue = decodeURIComponent(sceneValue); - let id = getQueryParam(decodedValue, 'deviceNo') + let id = getQueryParam(decodedValue, 's') this.$u.get(`/app/device/${id}/bySn`).then((res) => { if (res.code == 200) { this.qrResult = 'CTKG-' + res.data.mac - // console.log(this.qrResult); - // uni.navigateTo({ - // url:'/page_fenbao/device/lianjie?mac=' + this.qrResult + '&storeId=' + this.storeId - // }) xBlufi.initXBlufi(1); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.notifyStartDiscoverBle({ @@ -243,7 +239,8 @@ } else { uni.showToast({ title: '没有发现设备', - icon: 'none' + icon: 'none', + duration:2000 }); } break; diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue index b753974..6724052 100644 --- a/page_user/mapditu/index.vue +++ b/page_user/mapditu/index.vue @@ -180,7 +180,7 @@ } let sceneValue = res.result let decodedValue = decodeURIComponent(sceneValue); - let id = getQueryParam(decodedValue, 'deviceNo') + let id = getQueryParam(decodedValue, 's') this.$u.get(`/app/device/${id}/withSuitList`).then((res) =>{ if(res.code == 200){ uni.navigateTo({ diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue index 8b3b45f..bd17e0e 100644 --- a/page_user/sbdetail.vue +++ b/page_user/sbdetail.vue @@ -188,11 +188,11 @@ token: '', userImgs: '', imgflag: true, - mac:"", - name:'', - deviceId:'', - storeId:'', - qrResult:'' + mac: "", + name: '', + deviceId: '', + storeId: '', + qrResult: '' } }, onLoad(option) { @@ -322,7 +322,7 @@ icon: 'success', duration: 2000 }) - }else if(res.code == 500){ + } else if (res.code == 500) { uni.showToast({ title: '设备不在线', icon: 'none', @@ -455,9 +455,9 @@ // url: '/page_fenbao/device/lianjie?mac=' + this.deviceInfo.mac + '&storeId=' + this // .deviceInfo.storeId // }) - uni.showLoading({ - title: '加载中...' - }); + uni.showLoading({ + title: '加载中...' + }); xBlufi.initXBlufi(1); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.notifyStartDiscoverBle({ @@ -480,154 +480,158 @@ } }, - funListenDeviceMsgEvent: function(options) { - switch (options.type) { - case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS: - if (options.result) { - let devicesarr = options.data - // console.log(devicesarr,'devicesarrdevicesarr'); - devicesarr.forEach(device => { - const mac = device.name.substring(5); - if (device.name == this.qrResult) { - this.deviceId = device.deviceId - this.name = device.name - this.mac = device.name.slice(5,17) - console.log(this.mac,'macmacmac'); - this.devicesList = uniqueDevicesList; - } - - }); - } - break; - - case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED: - console.log("连接回调：" + JSON.stringify(options)); - if (options.result) { - uni.hideLoading(); - // uni.showToast({ - // title: '连接成功', - // icon: 'none' - // }); - { - console.log("连接回调options.data.deviceId：" + options.data.deviceId, - "连接回调options.data.name：" + options.data.name); - let name = '' - let index = this.name.indexOf('-'); - if (index !== -1) { - name = this.name.slice(index + 1); - } - let data = { - storeId:this.storeId, - mac:this.mac - } - this.$u.put('/app/device/bind', data).then((res) => { - if (res.code == 200) { - uni.showToast({ - title: '绑定成功', - icon: 'none', - duration: 2000 - }); - uni.hideLoading(); - uni.removeStorageSync('mac'); - let vm = this - uni.showModal({ - title: '提示', - content: '你已绑定成功,需前去配网吗？', - success: function (res) { - if (res.confirm) { - let systemInfo = uni.getSystemInfoSync(); - if (systemInfo.platform === 'android') { - // 当前设备是 Android - uni.navigateTo({ - url: '/page_components/wifilist/index?deviceId=' + options - .data.deviceId + '&name=' + options.data.name - }) - } else if (systemInfo.platform === 'ios') { - // 当前设备是 iOS - uni.navigateTo({ - url: '/page_fenbao/device/wifivideo?deviceId=' + options - .data.deviceId + '&name=' + options.data.name - }) - } - } else if (res.cancel) { - console.log('用户点击了取消'); - } - } - }) - }else if(res.code == 500){ - uni.showToast({ - title: '该设备已被绑定', - icon: 'none', - duration: 2000 - }); - } else { - uni.showToast({ - title: '连接失败', - icon: 'none', - duration: 2000 - }); - // uni.navigateBack() - } - }) - } - } - - break; - - case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: - if (!options.result) { - console.log("蓝牙未开启", options); - uni.showToast({ - title: '蓝牙未开启', - icon: 'none', - duration: 3000 - }); - } else { - // this.searching = true - //蓝牙搜索开始 - // _this.setData({ - // searching: true - // }); - } - - break; - - case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP: - if (options.result) { - let uniqueDevicesList = Array.from(new Set(this.devicesList)); - - // 将去重后的数组重新赋值给 this.devicesList - this.devicesList = uniqueDevicesList; - let list = [] - filteredDevices.forEach(device => { - // 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符） - let macFromName = device.name.substring(device.name.length - 12); - this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => { - if (res.data == false) { - list.push(device) - } else { - - } - }) - - }); - setTimeout(() => { - this.devicesList = list - }, 200) - - console.log('蓝牙停止搜索ok'); - } else { - //蓝牙停止搜索失败 - console.log('蓝牙停止搜索失败'); - } - this.searching = false - // _this.setData({ - // searching: false - // }); - - break; - } - }, + funListenDeviceMsgEvent: function(options) { + switch (options.type) { + case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS: + if (options.result) { + let devicesarr = options.data + // console.log(devicesarr,'devicesarrdevicesarr'); + devicesarr.forEach(device => { + const mac = device.name.substring(5); + if (device.name == this.qrResult) { + this.deviceId = device.deviceId + this.name = device.name + this.mac = device.name.slice(5, 17) + console.log(this.mac, 'macmacmac'); + this.devicesList = uniqueDevicesList; + } + + }); + } + break; + + case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED: + console.log("连接回调：" + JSON.stringify(options)); + if (options.result) { + uni.hideLoading(); + // uni.showToast({ + // title: '连接成功', + // icon: 'none' + // }); + { + console.log("连接回调options.data.deviceId：" + options.data.deviceId, + "连接回调options.data.name：" + options.data.name); + let name = '' + let index = this.name.indexOf('-'); + if (index !== -1) { + name = this.name.slice(index + 1); + } + let data = { + storeId: this.storeId, + mac: this.mac + } + this.$u.put('/app/device/bind', data).then((res) => { + if (res.code == 200) { + uni.showToast({ + title: '绑定成功', + icon: 'none', + duration: 2000 + }); + uni.hideLoading(); + uni.removeStorageSync('mac'); + let vm = this + uni.showModal({ + title: '提示', + content: '你已绑定成功,需前去配网吗？', + success: function(res) { + if (res.confirm) { + let systemInfo = uni.getSystemInfoSync(); + if (systemInfo.platform === 'android') { + // 当前设备是 Android + uni.navigateTo({ + url: '/page_components/wifilist/index?deviceId=' + + options + .data.deviceId + '&name=' + + options.data.name + }) + } else if (systemInfo.platform === 'ios') { + // 当前设备是 iOS + uni.navigateTo({ + url: '/page_fenbao/device/wifivideo?deviceId=' + + options + .data.deviceId + '&name=' + + options.data.name + }) + } + } else if (res.cancel) { + console.log('用户点击了取消'); + } + } + }) + } else if (res.code == 500) { + uni.showToast({ + title: '该设备已被绑定', + icon: 'none', + duration: 2000 + }); + } else { + uni.showToast({ + title: '连接失败', + icon: 'none', + duration: 2000 + }); + // uni.navigateBack() + } + }) + } + } + + break; + + case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: + if (!options.result) { + console.log("蓝牙未开启", options); + uni.showToast({ + title: '蓝牙未开启', + icon: 'none', + duration: 3000 + }); + } else { + // this.searching = true + //蓝牙搜索开始 + // _this.setData({ + // searching: true + // }); + } + + break; + + case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP: + if (options.result) { + let uniqueDevicesList = Array.from(new Set(this.devicesList)); + + // 将去重后的数组重新赋值给 this.devicesList + this.devicesList = uniqueDevicesList; + let list = [] + filteredDevices.forEach(device => { + // 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符） + let macFromName = device.name.substring(device.name.length - 12); + this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => { + if (res.data == false) { + list.push(device) + } else { + + } + }) + + }); + setTimeout(() => { + this.devicesList = list + }, 200) + + console.log('蓝牙停止搜索ok'); + } else { + //蓝牙停止搜索失败 + console.log('蓝牙停止搜索失败'); + } + this.searching = false + // _this.setData({ + // searching: false + // }); + + break; + } + }, } } @@ -763,11 +767,12 @@ // margin-top: 50rpx; display: flex; // flex-wrap: nowrap; - width: 100%; + width: 100%; justify-content: space-between; padding-left: 80rpx; padding-right: 120rpx; box-sizing: border-box; + .cont { .tit { font-size: 28rpx; diff --git a/page_user/switchs.vue b/page_user/switchs.vue index e4c76e2..c41bd4a 100644 --- a/page_user/switchs.vue +++ b/page_user/switchs.vue @@ -109,7 +109,7 @@ } let sceneValue = res.result let decodedValue = decodeURIComponent(sceneValue); - this.qrResult = getQueryParam(decodedValue, 'deviceNo') + this.qrResult = getQueryParam(decodedValue, 's') // this.qrResult = res.result; // 将扫描结果存储在数据中 }, fail: err => { diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index 485efc1..516f55e 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -216,7 +216,8 @@ } let sceneValue = res.result let decodedValue = decodeURIComponent(sceneValue); - let id = getQueryParam(decodedValue, 'deviceNo') + let id = getQueryParam(decodedValue, 's') + console.log(res,id); this.$u.get(`/app/device/${id}/withSuitList`).then((res) => { if (res.code == 200) { uni.navigateTo({