From dd66d10bdb511ce6aca7cd16a4866bec3ba84cf4 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Fri, 6 Sep 2024 18:03:19 +0800 Subject: [PATCH] 11 --- page_components/eletj.vue | 617 +++++++++--------- .../statulist/myshop/shopdetail/index.vue | 2 +- page_fenbao/statulist/question/index.vue | 14 +- page_fenbao/zhuce.vue | 4 +- page_user/sbdetail.vue | 19 +- page_user/setting.vue | 27 +- pages/my.vue | 14 +- 7 files changed, 368 insertions(+), 329 deletions(-) diff --git a/page_components/eletj.vue b/page_components/eletj.vue index d5fc314..d847e25 100644 --- a/page_components/eletj.vue +++ b/page_components/eletj.vue @@ -4,16 +4,16 @@ :custom-back="btns" title-size='36' height='50' id="navbar"> - + 历史总用电量：{{totalElectriQuantity}} 度 - --> + @@ -180,7 +181,7 @@ --> - + 立即支付 结束订单 @@ -274,7 +275,8 @@ temperature:null, du:'', totalElectriQuantity:'', - suitStartEle :'' + suitStartEle :'', + sbobj:{} } }, onLoad(option) { @@ -400,299 +402,325 @@ }) }, btnjieshu(){ - this.getsb() - this.trueboxfalg = true - }, - btnbox() { - this.trueboxfalg = false - this.jieshuflag = true - if (this.onlineStatus == 1) { - if (this.detaobj.suitFeeType == 1 || this.detaobj.suitFeeType == 2) { - let data = { - billId: this.billId - } - this.$u.put(`/app/bill/endSmartUse`, data).then(res => { - if (res.code == 200) { - uni.showToast({ - title: res.msg, - icon: 'success', - duration: 1000 - }) - setTimeout(() => { - this.jieshuflag = false - uni.reLaunch({ - url: '/pages/shouye/index' - }) - }, 1500) - } else { - this.getDevice() - this.jieshuflag = false - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - } - }) - } else { - if (this.detaobj.status == 1) { - this.$u.get(`/app/pay/wx/${this.orderno}`).then((res) => { - if (res.code == 200) { - let that = this - uni.requestPayment({ - provider: 'wxpay', - timeStamp: res.data.payParams.timeStamp, - nonceStr: res.data.payParams.nonceStr, - package: res.data.payParams.packageVal, - signType: res.data.payParams.signType, - paySign: res.data.payParams.paySign, - success: (res) => { - that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`) - .then(res => {}) - // 支付成功逻辑 - uni.showToast({ - title: res.msg, - icon: 'success', - duration: 1000 - }) - setTimeout(() => { - that.jieshuflag = false - uni.reLaunch({ - url: '/pages/shouye/index' - }) - }, 1500) - }, - fail(err) { - that.getDevice() - that.jieshuflag = false - // 支付失败逻辑 - uni.showToast({ - title: '支付失败', - icon: 'none', - duration: 2000 - }); - } - }) - } - }) - } else { - let data = { - billId: this.billId - } - this.$u.put(`/app/bill/endTimingUse`, data).then(res => { - if (res.code == 200) { - this.$u.get(`/app/pay/wx/${this.orderno}`).then((res) => { - if (res.code == 200) { - let that = this - uni.requestPayment({ - provider: 'wxpay', - timeStamp: res.data.payParams.timeStamp, - nonceStr: res.data.payParams.nonceStr, - package: res.data.payParams.packageVal, - signType: res.data.payParams.signType, - paySign: res.data.payParams.paySign, - success: (res) => { - that.$u.put( - `/app/bill/${that.orderno}/refreshPayResult` - ).then(res => {}) - // 支付成功逻辑 - uni.showToast({ - title: res.msg, - icon: 'success', - duration: 1000 - }) - setTimeout(() => { - that.jieshuflag = false - uni.reLaunch({ - url: '/pages/shouye/index' - }) - }, 1500) - }, - fail(err) { - that.jieshuflag = false - // 支付失败逻辑 - uni.showToast({ - title: '支付失败', - icon: 'none', - duration: 2000 - }); - } - }) - } - }) - } else { - this.getDevice() - this.jieshuflag = false - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - } - }) - } + if(this.detaobj.suitFeeMode == 1){ + let data = { + billId: this.billId } - } else { - // console.log(this.temperature,'this.temperature'); - if (this.temperature == null) { - uni.showLoading({ - title: '切换中' - }) - let that = this - xBlufi.initXBlufi(1); - xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); - xBlufi.notifyStartDiscoverBle({ - 'isStart': true - }) - setTimeout(() => { - xBlufi.notifyStartDiscoverBle({ - 'isStart': false - }) - if (that.devicesList.length > 0) { - xBlufi.notifyConnectBle({ - isStart: true, - deviceId: that.deviceId, - name: that.name - }) - } - }, 2000) - uni.showModal({ - title: '温馨提示', - content: `检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙`, - showCancel: false, - success: function (res) { - - } - }) - }else{ - if(this.detaobj.suitFeeType == 1 || this.detaobj.suitFeeType == 2){ - let data = { - billId: this.billId, - totalEle:this.temperature - } - this.$u.put(`/app/bill/endSmartUse`, data).then(res => { - if (res.code == 200) { - uni.getNetworkType({ - success(res) { - if (res.networkType !== 'none') { - uni.getConnectedBluetoothDevices({ - success(res) { - setTimeout(()=> { - xBlufi.notifySendCustomData({ - customData: 'close' - }) - setTimeout(() => { - this.jieshuflag = false - uni.reLaunch({ - url: '/pages/shouye/index' - }) - },1000) - },1500) - }, - fail(err) { - console.error('获取已连接蓝牙设备信息失败：',err) - } - }) - } else { - console.log('手机未连接网络') - // this.baiflag = false - } - } - }) - } else { - this.jieshuflag = false - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) + this.$u.put(`/app/bill/endUse`, data).then(res => { + if(res.code == 200){ + uni.showModal({ + title: '提示', + content: '您确定要提前结束订单吗，将不会产生任何退款和赔偿？', + success: function(res) { + if (res.confirm) { + uni.reLaunch({ + url:'/pages/shouye/index' + }) + } } }) }else{ - let data = { - billId: this.billId, - totalEle:this.temperature - } - this.$u.put(`/app/bill/endTimingUse`, data).then(res => { - if (res.code == 200) { - let that = this - uni.getNetworkType({ - success(res) { - if (res.networkType !== 'none') { - uni.getConnectedBluetoothDevices({ - success(res) { - setTimeout(()=> { - xBlufi.notifySendCustomData({ - customData: 'close' - }) - setTimeout(() => { - that.$u.get(`/app/pay/wx/${that.orderno}`).then((res) => { - if (res.code == 200) { - - uni.requestPayment({ - provider: 'wxpay', - timeStamp: res.data.payParams.timeStamp, - nonceStr: res.data.payParams.nonceStr, - package: res.data.payParams.packageVal, - signType: res.data.payParams.signType, - paySign: res.data.payParams.paySign, - success: (res) => { - that.$u.put( - `/app/bill/${that.orderno}/refreshPayResult` - ).then(res => {}) - // 支付成功逻辑 - uni.showToast({ - title: res.msg, - icon: 'success', - duration: 1000 - }) - setTimeout(() => { - that.jieshuflag = false - uni.reLaunch({ - url: '/pages/shouye/index' - }) - }, 1500) - }, - fail(err) { - that.jieshuflag = false - // 支付失败逻辑 - uni.showToast({ - title: '支付失败', - icon: 'none', - duration: 2000 - }); - } - }) - } - }) - },1000) - },1500) - }, - fail(err) { - console.error('获取已连接蓝牙设备信息失败：',err) - } - }) - } else { - console.log('手机未连接网络') - // this.baiflag = false - } - } - }) - } else { - this.getDevice() - this.jieshuflag = false - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - } + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 1000 }) } - - } + }) + }else{ + this.getsb() + this.trueboxfalg = true } - + }, + btnbox() { + this.trueboxfalg = false + this.jieshuflag = true + if (this.onlineStatus == 1) { + if (this.detaobj.suitFeeType == 1 || this.detaobj.suitFeeType == 2) { + let data = { + billId: this.billId + } + this.$u.put(`/app/bill/endUse`, data).then(res => { + if (res.code == 200) { + uni.showToast({ + title: res.msg, + icon: 'success', + duration: 1000 + }) + setTimeout(() => { + this.jieshuflag = false + uni.reLaunch({ + url: '/pages/shouye/index' + }) + }, 1500) + } else { + this.getDevice() + this.jieshuflag = false + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + } else { + if (this.detaobj.status == 1) { + this.$u.get(`/app/pay/wx/${this.orderno}`).then((res) => { + if (res.code == 200) { + let that = this + uni.requestPayment({ + provider: 'wxpay', + timeStamp: res.data.payParams.timeStamp, + nonceStr: res.data.payParams.nonceStr, + package: res.data.payParams.packageVal, + signType: res.data.payParams.signType, + paySign: res.data.payParams.paySign, + success: (res) => { + that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`) + .then(res => {}) + // 支付成功逻辑 + uni.showToast({ + title: res.msg, + icon: 'success', + duration: 1000 + }) + setTimeout(() => { + that.jieshuflag = false + uni.reLaunch({ + url: '/pages/shouye/index' + }) + }, 1500) + }, + fail(err) { + that.getDevice() + that.jieshuflag = false + // 支付失败逻辑 + uni.showToast({ + title: '支付失败', + icon: 'none', + duration: 2000 + }); + } + }) + } + }) + } else { + let data = { + billId: this.billId + } + this.$u.put(`/app/bill/endUse`, data).then(res => { + if (res.code == 200) { + this.$u.get(`/app/pay/wx/${this.orderno}`).then((res) => { + if (res.code == 200) { + let that = this + uni.requestPayment({ + provider: 'wxpay', + timeStamp: res.data.payParams.timeStamp, + nonceStr: res.data.payParams.nonceStr, + package: res.data.payParams.packageVal, + signType: res.data.payParams.signType, + paySign: res.data.payParams.paySign, + success: (res) => { + that.$u.put( + `/app/bill/${that.orderno}/refreshPayResult` + ).then(res => {}) + // 支付成功逻辑 + uni.showToast({ + title: res.msg, + icon: 'success', + duration: 1000 + }) + setTimeout(() => { + that.jieshuflag = false + uni.reLaunch({ + url: '/pages/shouye/index' + }) + }, 1500) + }, + fail(err) { + that.jieshuflag = false + // 支付失败逻辑 + uni.showToast({ + title: '支付失败', + icon: 'none', + duration: 2000 + }); + } + }) + } + }) + } else { + this.getDevice() + this.jieshuflag = false + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + } + } + } else { + // console.log(this.temperature,'this.temperature'); + if (this.temperature == null) { + uni.showLoading({ + title: '切换中' + }) + let that = this + xBlufi.initXBlufi(1); + xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); + xBlufi.notifyStartDiscoverBle({ + 'isStart': true + }) + setTimeout(() => { + xBlufi.notifyStartDiscoverBle({ + 'isStart': false + }) + if (that.devicesList.length > 0) { + xBlufi.notifyConnectBle({ + isStart: true, + deviceId: that.deviceId, + name: that.name + }) + } + }, 2000) + uni.showModal({ + title: '温馨提示', + content: `检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙`, + showCancel: false, + success: function (res) { + + } + }) + }else{ + if(this.detaobj.suitFeeType == 1 || this.detaobj.suitFeeType == 2){ + let data = { + billId: this.billId, + totalEle:this.temperature + } + this.$u.put(`/app/bill/endUse`, data).then(res => { + if (res.code == 200) { + uni.getNetworkType({ + success(res) { + if (res.networkType !== 'none') { + uni.getConnectedBluetoothDevices({ + success(res) { + setTimeout(()=> { + xBlufi.notifySendCustomData({ + customData: 'close' + }) + setTimeout(() => { + this.jieshuflag = false + uni.reLaunch({ + url: '/pages/shouye/index' + }) + },1000) + },1500) + }, + fail(err) { + console.error('获取已连接蓝牙设备信息失败：',err) + } + }) + } else { + console.log('手机未连接网络') + // this.baiflag = false + } + } + }) + } else { + this.jieshuflag = false + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + }else{ + let data = { + billId: this.billId, + totalEle:this.temperature + } + this.$u.put(`/app/bill/endUse`, data).then(res => { + if (res.code == 200) { + let that = this + uni.getNetworkType({ + success(res) { + if (res.networkType !== 'none') { + uni.getConnectedBluetoothDevices({ + success(res) { + setTimeout(()=> { + xBlufi.notifySendCustomData({ + customData: 'close' + }) + setTimeout(() => { + that.$u.get(`/app/pay/wx/${that.orderno}`).then((res) => { + if (res.code == 200) { + + uni.requestPayment({ + provider: 'wxpay', + timeStamp: res.data.payParams.timeStamp, + nonceStr: res.data.payParams.nonceStr, + package: res.data.payParams.packageVal, + signType: res.data.payParams.signType, + paySign: res.data.payParams.paySign, + success: (res) => { + that.$u.put( + `/app/bill/${that.orderno}/refreshPayResult` + ).then(res => {}) + // 支付成功逻辑 + uni.showToast({ + title: res.msg, + icon: 'success', + duration: 1000 + }) + setTimeout(() => { + that.jieshuflag = false + uni.reLaunch({ + url: '/pages/shouye/index' + }) + }, 1500) + }, + fail(err) { + that.jieshuflag = false + // 支付失败逻辑 + uni.showToast({ + title: '支付失败', + icon: 'none', + duration: 2000 + }); + } + }) + } + }) + },1000) + },1500) + }, + fail(err) { + console.error('获取已连接蓝牙设备信息失败：',err) + } + }) + } else { + console.log('手机未连接网络') + // this.baiflag = false + } + } + }) + } else { + this.getDevice() + this.jieshuflag = false + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + } + + } + } }, // 每一分钟请求更新一次 @@ -771,6 +799,7 @@ getsb() { this.$u.get(`/app/device/${this.sbid}`).then(res => { if (res.code == 200) { + this.sbobj = res.data this.onlineStatus = res.data.onlineStatus this.qrResult = res.data.mac this.totalElectriQuantity = res.data.totalElectriQuantity diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue index 094e0cc..b51d0d9 100644 --- a/page_fenbao/statulist/myshop/shopdetail/index.vue +++ b/page_fenbao/statulist/myshop/shopdetail/index.vue @@ -184,7 +184,7 @@ } else if (res.code == 500) { uni.showToast({ title: res.msg, - icon: 'success', + icon: 'none', duration: 1000 }) this.btnmsk = false diff --git a/page_fenbao/statulist/question/index.vue b/page_fenbao/statulist/question/index.vue index 86ad153..35770d7 100644 --- a/page_fenbao/statulist/question/index.vue +++ b/page_fenbao/statulist/question/index.vue @@ -1,6 +1,6 @@