From bda070dd891c16b5eef40b0e72c0ef70e2c59dca Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Thu, 18 Jul 2024 18:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BD=95=E5=85=A5=20?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- page_components/bindsz.vue | 15 +- page_components/eletj.vue | 84 ++++++++-- page_components/fuwu/index.vue | 17 +- .../statulist/myorder/detailxq/index.vue | 27 +++- page_fenbao/statulist/myorder/index.vue | 2 +- .../statulist/myshop/shopdetail/index.vue | 33 ++-- page_user/cbRecord.vue | 2 +- page_user/sbdetail.vue | 147 ++++++++++++++++-- pages.json | 8 + pages/index/index.vue | 17 +- pages/my.vue | 11 +- 11 files changed, 291 insertions(+), 72 deletions(-) diff --git a/page_components/bindsz.vue b/page_components/bindsz.vue index 4e90ec9..6982fbd 100644 --- a/page_components/bindsz.vue +++ b/page_components/bindsz.vue @@ -66,7 +66,7 @@ - + 店铺名称 @@ -222,7 +222,8 @@ setMode:null, mac:'', name:'', - deviceId:'' + deviceId:'', + isMch:false } }, onLoad(option) { @@ -234,6 +235,7 @@ }, onShow() { this.getgroup() + this.getuserinfo() }, // 分享到好友（会话） onShareAppMessage: function () { @@ -258,7 +260,14 @@ url:'/page_components/newtaocan?id=' + this.id }) }, - + // 获取当前用户信息 + getuserinfo() { + this.$u.get("/app/user/userInfo").then((res) => { + if (res.code == 200) { + this.isMch = res.data.isMch + } + }) + }, // 点击wifi进行配网 btnwifi(){ if(this.deviceId == ''){ diff --git a/page_components/eletj.vue b/page_components/eletj.vue index a008850..606466e 100644 --- a/page_components/eletj.vue +++ b/page_components/eletj.vue @@ -47,7 +47,7 @@ - 剩余时长：{{ setMode == null ? timeday : setMode}} 分钟 + 剩余时长：{{formattedTime}} @@ -102,13 +102,14 @@ setMode:null, vipflag:false, cztime:'', - opflag:true + opflag:true, + timer: null } }, onLoad(option) { let id = option.id this.id = id - this.getDevice(id) + // this.getDevice(id) if(option.flag){ this.opflag = false }else{ @@ -116,6 +117,23 @@ } }, + computed: { + formattedTime() { + if (this.timeday.days > 0) { + // 只展示天和小时 + return `${this.timeday.days}天${this.timeday.hours}小时`; + } else if (this.timeday.hours > 0) { + // 展示小时和分钟 + return `${this.timeday.hours}小时${this.timeday.minutes}分钟`; + } else if (this.timeday.minutes > 0) { + // 展示分钟和秒 + return `${this.timeday.minutes}分钟${this.timeday.seconds}秒`; + } else { + // 展示秒或0（如果秒也为0） + return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'; + } + } + }, // 分享到好友（会话） onShareAppMessage: function () { return { @@ -135,7 +153,7 @@ onShow() { setTimeout(() => { this.getDevice(this.id) - }, 1000) + }, 100) this.getQiniuToken() }, onUnload: function() { @@ -165,6 +183,14 @@ deviceId: this.objlist.deviceId, }) }, + beforeDestroy() { + // 组件销毁前清除定时器，防止内存泄漏 + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + console.log('已销毁'); + } + }, methods: { getQiniuToken() { this.$u.get("/common/qiniu/uploadInfo").then((res) => { @@ -243,15 +269,55 @@ if (differenceInMs <= 0) { this.timeday = 0 } else { - this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60))); + this.timeday = this.formatMilliseconds(differenceInMs) + this.startTimer() } } - - this.loadings = true } - }); - + }) + }, + startTimer() { + this.timer = setInterval(() => { + if (this.timeday.seconds > 0) { + this.timeday.seconds--; + } else if (this.timeday.minutes > 0) { + this.timeday.seconds = 59; // 重置秒数为59 + this.timeday.minutes--; + } else if (this.timeday.hours > 0) { + this.timeday.minutes = 59; // 重置分钟数为59 + this.timeday.hours--; + this.timeday.seconds = 0; // 同时重置秒数为0 + } else if (this.timeday.days > 0) { + this.timeday.hours = 23; // 重置小时数为23 + this.timeday.minutes = 59; // 重置分钟数为59 + this.timeday.seconds = 0; // 重置秒数为0 + this.timeday.days--; + } else { + // 所有时间单位都已减为0，停止定时器 + clearInterval(this.timer); + this.timer = null; + console.log('时间已到期'); + } + }, 1000); // 每秒执行一次 + }, + // 计算天时分秒 + formatMilliseconds(milliseconds) { + // 计算天数 + let days = Math.floor(milliseconds / (1000 * 60 * 60 * 24)) + // 计算剩余的小时数 + let hours = Math.floor((milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)) + // 计算剩余的分钟数 + let minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60)) + // 计算剩余的秒数 + let seconds = Math.floor((milliseconds % (1000 * 60)) / 1000) + // 返回一个对象，包含天、小时、分钟和秒 + return { + days: days, + hours: hours, + minutes: minutes, + seconds: seconds + } }, opendevice() { let stause = 0 diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue index 450b90e..d915805 100644 --- a/page_components/fuwu/index.vue +++ b/page_components/fuwu/index.vue @@ -3,7 +3,8 @@ - {{deviceobj.deviceName == undefined ? '--' : deviceobj.deviceName}} + + {{deviceobj.deviceName == undefined ? '--' : deviceobj.deviceName}} @@ -189,7 +190,6 @@ }, 2000) } } - }, computed: { @@ -213,7 +213,7 @@ onShow() { this.getuserinfo() if (this.orderno) { - this.gethuidaio() + // this.gethuidaio() } }, onUnload: function() { @@ -481,9 +481,9 @@ // 111111111111111111111111 that.$u.get('/app/bill/recharge/device/fail/list').then(res => { if (res.code == 200) { - // console.log('获取订单状态',res); + console.log('获取订单状态',res); let dingobj = res.data[0].billNo - // console.log(dingobj); + console.log(dingobj,'订单号'); uni.getNetworkType({ success(res) { if (res.networkType !== 'none') { @@ -549,7 +549,7 @@ } }, - + //选择套餐 btnactive(item) { this.sytime = item.value this.zfobj = item @@ -570,7 +570,7 @@ this.checked = e.value }, - + // 获取附近蓝牙设备列表 funListenDeviceMsgEvent: function(options) { switch (options.type) { case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS: @@ -646,11 +646,10 @@ break; } }, - + // 从蓝牙拿到数据进行解析 parseCustomData(data) { // 将字符串按照 "@" 分割成数组 const dataArray = data.split('@'); - // 根据约定，解析各个字段的值 const voltage = parseFloat(dataArray[0].substring(1)); // 去除前缀 "V"，并将字符串转换为浮点数 const switchState = dataArray[1].substring(1); // 去除前缀 "S" const current = parseFloat(dataArray[2].substring(1)); // 去除前缀 "A"，并将字符串转换为浮点数 diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue index 5cd1de7..9746943 100644 --- a/page_fenbao/statulist/myorder/detailxq/index.vue +++ b/page_fenbao/statulist/myorder/detailxq/index.vue @@ -43,6 +43,15 @@ 消费时间{{detailobj.createTime == undefined ? '--' : detailobj.createTime}} + + 套餐开始时间{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}} + + + 套餐结束时间{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}} + + + 套餐失效时间{{detailobj.suitExpireTime == undefined ? '--' : detailobj.suitExpireTime}} + 订单号{{detailobj.billNo == undefined ? '--' : detailobj.billNo}} @@ -56,7 +65,9 @@ 套餐金额{{detailobj.money == undefined ? '--' : detailobj.money}} - 套餐时长{{detailobj.suitTime == undefined ? '--' : detailobj.suitTime}} 分钟 + 套餐时长{{detailobj.suitTime == undefined ? '--' : detailobj.suitTime}} + 天 时 分钟 秒 + @@ -115,6 +126,7 @@ } }, onLoad(option) { + // console.log(uni.getStorageSync('userType')) this.userType = uni.getStorageSync('userType') if(option.billId){ this.billId = option.billId @@ -206,6 +218,7 @@ }else{ this.userflag = false } + // console.log(res.data.mchId ,this.userType.userId); } }) }, @@ -259,9 +272,10 @@ .page { width: 750rpx; - position: fixed; - top: 0; - left: 0; + // position: fixed; + // top: 0; + // left: 0; + .tanc { width: 594rpx; height: 420rpx; @@ -350,6 +364,9 @@ background: #F4F5F7; border-radius: 0rpx 0rpx 0rpx 0rpx; padding-top: 24rpx; + overflow: scroll; + padding-bottom: 100rpx; + box-sizing: border-box; .pic{ width: 680rpx; height: 238rpx; @@ -359,7 +376,7 @@ } .listxq{ width: 680rpx; - height: 780rpx; + height: 1010rpx; background: #FFFFFF; border-radius: 20rpx 20rpx 20rpx 20rpx; margin: auto; diff --git a/page_fenbao/statulist/myorder/index.vue b/page_fenbao/statulist/myorder/index.vue index 6b899a2..33790c6 100644 --- a/page_fenbao/statulist/myorder/index.vue +++ b/page_fenbao/statulist/myorder/index.vue @@ -7,7 +7,7 @@ {{item.deviceName}} - 地点：{{item.storeName == null ? '--' : ''}} + 地点：{{item.storeAddress == null ? '--' : item.storeAddress.length > 13 ? item.storeAddress.slice(0, 13) + '...' : item.storeAddress}} 订单号：{{item.billNo}} 消费时间：{{item.createTime}} diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue index 8eb4e71..b7a1778 100644 --- a/page_fenbao/statulist/myshop/shopdetail/index.vue +++ b/page_fenbao/statulist/myshop/shopdetail/index.vue @@ -131,7 +131,6 @@ }) }, - btnpag(num) { if (num == 1) { uni.navigateTo({ @@ -249,7 +248,7 @@ this.devicesList = uniqueDevicesList; } - }); + }) } else { uni.showToast({ title: '没有发现设备', @@ -269,11 +268,11 @@ // }); { console.log("连接回调options.data.deviceId：" + options.data.deviceId, - "连接回调options.data.name：" + options.data.name); + "连接回调options.data.name：" + options.data.name) let name = '' - let index = this.name.indexOf('-'); + let index = this.name.indexOf('-') if (index !== -1) { - name = this.name.slice(index + 1); + name = this.name.slice(index + 1) } let data = { storeId: this.storeId, @@ -286,7 +285,7 @@ icon: 'none', duration: 2000 }); - uni.hideLoading(); + uni.hideLoading() uni.removeStorageSync('mac'); let vm = this uni.showModal({ @@ -296,7 +295,7 @@ if (res.confirm) { if(vm.mac == ''){ uni.showToast({ - title: '当前设备不在线', + title: '请靠近设备，未找到设备', icon: 'none', duration: 2000 }); @@ -314,10 +313,8 @@ }) } } - - } else if (res.cancel) { - console.log('用户点击了取消'); + console.log('用户点击了取消') } } }) @@ -330,7 +327,7 @@ }); } else { uni.showToast({ - title: '连接失败', + title: '绑定失败', icon: 'none', duration: 2000 }); @@ -344,7 +341,7 @@ case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: if (!options.result) { - console.log("蓝牙未开启", options); + console.log("蓝牙未开启", options) uni.showToast({ title: '蓝牙未开启', icon: 'none', @@ -365,12 +362,12 @@ let uniqueDevicesList = Array.from(new Set(this.devicesList)); // 将去重后的数组重新赋值给 this.devicesList - this.devicesList = uniqueDevicesList; + this.devicesList = uniqueDevicesList let list = [] filteredDevices.forEach(device => { // 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符） - let macFromName = device.name.substring(device.name.length - 12); - // console.log(macFromName); + let macFromName = device.name.substring(device.name.length - 12) + // console.log(macFromName) // 与 this.mac 进行比较 this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => { if (res.data == false) { @@ -385,17 +382,17 @@ this.devicesList = list }, 200) - console.log('蓝牙停止搜索ok'); + console.log('蓝牙停止搜索ok') } else { //蓝牙停止搜索失败 - console.log('蓝牙停止搜索失败'); + console.log('蓝牙停止搜索失败') } this.searching = false // _this.setData({ // searching: false // }); - break; + break } }, diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue index 492d194..5149366 100644 --- a/page_user/cbRecord.vue +++ b/page_user/cbRecord.vue @@ -7,7 +7,7 @@ {{item.deviceName}} - 地点：{{item.storeName == null ? '--' : item.storeName}} + 地点：{{item.storeAddress == null ? '--' : item.storeAddress.length > 15 ? item.storeAddress.slice(0, 15) + '...' : item.storeAddress}} 订单号：{{item.billNo}} 消费时间：{{item.createTime}} diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue index f402eeb..6339ab6 100644 --- a/page_user/sbdetail.vue +++ b/page_user/sbdetail.vue @@ -66,7 +66,7 @@ - {{ setMode == null ? timeday : setMode}} 分钟 + {{formattedTime}} @@ -113,7 +113,7 @@ - 电量充值 + 充值 @@ -133,11 +133,19 @@ - + 配网 + + + + + + {{tdtxt}} + + @@ -180,6 +188,7 @@ deviceInfo: {}, loadings: false, info: '', + checked:false, tittxt: "设备详情", titlist: [ "全部", @@ -187,6 +196,7 @@ "水表", ], + tdtxt:'开启', curtitidx: 0, id: '', focus:false, @@ -204,13 +214,14 @@ setMode:null, vipflag:false, cztime:'', - opflag:true + opflag:true, + timer: null } }, onLoad(option) { let id = option.id this.id = id - this.getDevice(id) + // this.getDevice(id) if(option.flag){ this.opflag = false }else{ @@ -255,10 +266,35 @@ path: '/pages/shouye/index' } }, + computed: { + formattedTime() { + if (this.timeday.days > 0) { + // 只展示天和小时 + return `${this.timeday.days}天${this.timeday.hours}小时`; + } else if (this.timeday.hours > 0) { + // 展示小时和分钟 + return `${this.timeday.hours}小时${this.timeday.minutes}分钟`; + } else if (this.timeday.minutes > 0) { + // 展示分钟和秒 + return `${this.timeday.minutes}分钟${this.timeday.seconds}秒`; + } else { + // 展示秒或0（如果秒也为0） + return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'; + } + } + }, + beforeDestroy() { + // 组件销毁前清除定时器，防止内存泄漏 + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + console.log('已销毁'); + } + }, onShow() { setTimeout(() => { this.getDevice(this.id) - }, 1000) + }, 100) this.getQiniuToken() }, onUnload: function() { @@ -289,6 +325,46 @@ }) }, methods: { + // 开启和关闭 + btnkq(){ + if(this.tdtxt == '开启'){ + this.$u.put(`/app/device/${this.id}/changePower?status=1`).then((res) => { + if (res.code == 200) { + this.tdtxt = '关闭' + this.checked = true + uni.showToast({ + title: res.msg, + icon: 'success', + duration: 2000 + }) + }else{ + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + }else{ + this.$u.put(`/app/device/${this.id}/changePower?status=0`).then((res) => { + if (res.code == 200) { + this.checked = false + this.tdtxt = '开启' + uni.showToast({ + title: res.msg, + icon: 'success', + duration: 2000 + }) + }else{ + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + } + }, getQiniuToken() { this.$u.get("/common/qiniu/uploadInfo").then((res) => { if (res.code == 200) { @@ -366,13 +442,56 @@ if (differenceInMs <= 0) { this.timeday = 0 } else { - this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60))); + this.timeday = this.formatMilliseconds(differenceInMs) + this.startTimer() } } this.loadings = true } }); }, + startTimer() { + this.timer = setInterval(() => { + if (this.timeday.seconds > 0) { + this.timeday.seconds--; + } else if (this.timeday.minutes > 0) { + this.timeday.seconds = 59; // 重置秒数为59 + this.timeday.minutes--; + } else if (this.timeday.hours > 0) { + this.timeday.minutes = 59; // 重置分钟数为59 + this.timeday.hours--; + this.timeday.seconds = 0; // 同时重置秒数为0 + } else if (this.timeday.days > 0) { + this.timeday.hours = 23; // 重置小时数为23 + this.timeday.minutes = 59; // 重置分钟数为59 + this.timeday.seconds = 0; // 重置秒数为0 + this.timeday.days--; + } else { + // 所有时间单位都已减为0，停止定时器 + clearInterval(this.timer); + this.timer = null; + console.log('时间已到期'); + } + }, 1000); // 每秒执行一次 + }, + // 计算天时分秒 + formatMilliseconds(milliseconds) { + // 计算天数 + let days = Math.floor(milliseconds / (1000 * 60 * 60 * 24)) + // 计算剩余的小时数 + let hours = Math.floor((milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)) + // 计算剩余的分钟数 + let minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60)) + // 计算剩余的秒数 + let seconds = Math.floor((milliseconds % (1000 * 60)) / 1000) + // 返回一个对象，包含天、小时、分钟和秒 + return { + days: days, + hours: hours, + minutes: minutes, + seconds: seconds + } + }, opendevice() { let stause = 0 if (this.deviceInfo.powerStatus == 1) { @@ -626,6 +745,10 @@ } }, trueje(){ + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + } let id = this.deviceInfo.deviceId this.vipflag = false this.$u.put('/app/device/addTime/' + id + '?amount=' + this.cztime).then(res => { @@ -737,11 +860,11 @@ case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: if (!options.result) { console.log("蓝牙未开启", options); - uni.showToast({ - title: '蓝牙未开启', - icon: 'none', - duration: 3000 - }); + // uni.showToast({ + // title: '蓝牙未开启', + // icon: 'none', + // duration: 3000 + // }); return } else { // this.searching = true diff --git a/pages.json b/pages.json index 598ec95..b49ca90 100644 --- a/pages.json +++ b/pages.json @@ -449,6 +449,14 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + },{ + "path": "miyao", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } }, { "path": "wifilist/index", diff --git a/pages/index/index.vue b/pages/index/index.vue index 3fd1ecf..81b9461 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -320,9 +320,6 @@ } }) }, - - - tocz() { this.showtip = false uni.navigateTo({ @@ -481,8 +478,6 @@ }); } }, - - changeGp(item, index) { // console.log(item); this.pagenum = 1 @@ -580,8 +575,6 @@ // scanType: ['qrCode'], // success: res => { // console.log('扫描结果：', res); - - // this.qrResult = res.result; // // this.$u.get(`/app/device/${this.qrResult}/withSuitList`).then((res) =>{ // // if(res.code == 200){ @@ -727,10 +720,8 @@ }, ], }; - - const chart = await this.$refs.chart.init(echarts); + const chart = await this.$refs.chart.init(echarts) chart.setOption(option) - return chart }, // 获取设备详情 @@ -749,7 +740,7 @@ // this.$forceUpdate() if (res.code == 200) { - uni.setStorageSync('userType', res.data.userType) + // uni.setStorageSync('userType', res.data.userType) this.userType = res.data.userType if (this.userType == '01') { this.getDeviceList() @@ -817,7 +808,7 @@ getdevice() { this.$u.get("/app/device/tenant").then((res) => { - this.deviceInfo = res.rows.find(item => item.isDefault === true); + this.deviceInfo = res.rows.find(item => item.isDefault === true) if (this.deviceInfo == undefined) { this.addflag = true this.sbflag = false @@ -825,7 +816,7 @@ this.addflag = false this.sbflag = true } - uni.setStorageSync('deviceId', this.deviceInfo.deviceId); + uni.setStorageSync('deviceId', this.deviceInfo.deviceId) // this.initChart() this.order() }); diff --git a/pages/my.vue b/pages/my.vue index 8750dc3..59aa2c3 100644 --- a/pages/my.vue +++ b/pages/my.vue @@ -75,6 +75,10 @@ 意见反馈 + + + 秘钥管理 + 设置 @@ -127,6 +131,11 @@ } }, methods: { + btnmy(){ + uni.navigateTo({ + url:'/page_components/miyao' + }) + }, btntc(){ uni.reLaunch({ url:'/pages/shouye/index' @@ -217,7 +226,7 @@ // this.$forceUpdate() if (res.code == 200) { this.userinfo=res.data - uni.setStorageSync('userType', res.data.userType) + // uni.setStorageSync('userType', res.data.userType) this.userType = res.data.userType if (this.userType == '01') {