From fea4d0be97e6ae7ebbdc974a8c7c530e8e2326c6 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 5 Jun 2024 18:07:50 +0800
Subject: [PATCH] aa
---
page_components/fuwu/index.vue | 2 +-
page_fenbao/chongzhi.vue | 10 +-
page_fenbao/device/czDevice.vue | 16 +-
page_fenbao/device/index.vue | 2 +-
page_fenbao/device/joinDevice.vue | 6 +-
page_fenbao/device/lianjie.vue | 2 +-
page_fenbao/device/wifiDevice.vue | 6 +-
page_fenbao/statulist/fault/index.vue | 3 +-
page_fenbao/statulist/fault/yichang/index.vue | 2 +-
.../statulist/myorder/detailxq/index.vue | 2 +-
page_fenbao/statulist/myorder/index.vue | 4 +-
.../statulist/myshop/editshop/index.vue | 2 +-
page_fenbao/statulist/myshop/index.vue | 18 +-
.../statulist/myshop/shebeilist/index.vue | 4 +-
.../statulist/myshop/shopdetail/index.vue | 4 +-
page_fenbao/statulist/myshop/shopxx/index.vue | 2 +-
page_fenbao/statulist/nearby/index.vue | 4 +-
page_user/cbRecord.vue | 4 +-
page_user/mapditu/index.vue | 4 +-
page_user/sbdetail.vue | 566 ++++++++++++------
page_user/shouzhi.vue | 6 +-
page_user/txrecord.vue | 6 +-
page_user/wifijoint/index.vue | 2 +-
pages/index/index.vue | 10 +-
pages/shouye/index.vue | 16 +-
25 files changed, 460 insertions(+), 243 deletions(-)
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 43742c5..3ea348b 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -364,7 +364,7 @@
}
.date {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #525252;
margin-top: 10rpx;
}
diff --git a/page_fenbao/chongzhi.vue b/page_fenbao/chongzhi.vue
index 30eb249..6d87b05 100644
--- a/page_fenbao/chongzhi.vue
+++ b/page_fenbao/chongzhi.vue
@@ -543,7 +543,7 @@
.text {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
@@ -551,7 +551,7 @@
.info_bot {
margin-top: 24rpx;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
@@ -563,11 +563,11 @@
display: flex;
align-items: center;
justify-content: center;
- border: 2rpx solid #ccc;
+ border: 2rpx solid #8883F0;
border-radius: 20rpx;
font-weight: 400;
font-size: 28rpx;
- color: #ccc;
+ color: #8883F0;
}
@@ -673,7 +673,7 @@
.mac {
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #262B37;
line-height: 32rpx;
text-align: left;
diff --git a/page_fenbao/device/czDevice.vue b/page_fenbao/device/czDevice.vue
index d76df68..7a3f154 100644
--- a/page_fenbao/device/czDevice.vue
+++ b/page_fenbao/device/czDevice.vue
@@ -92,10 +92,10 @@
}
},
onLoad(e) {
- let orderinfo = JSON.parse(e.orderinfo);
- this.orderinfo = orderinfo
- console.log(this.orderinfo, 'aaa');
- this.mac = orderinfo.deviceMac
+ // let orderinfo = JSON.parse(e.orderinfo);
+ // this.orderinfo = orderinfo
+ // console.log(this.orderinfo, 'aaa');
+ // this.mac = orderinfo.deviceMac
xBlufi.initXBlufi(1);
console.log("xBlufi", xBlufi.XMQTT_SYSTEM);
@@ -103,7 +103,7 @@
xBlufi.notifyStartDiscoverBle({
'isStart': true
});
- this.dl = ((this.orderinfo.deviceAmount / this.orderinfo.unitPrice)*1000).toFixed(2);
+ // this.dl = ((this.orderinfo.deviceAmount / this.orderinfo.unitPrice)*1000).toFixed(2);
// 两秒后停止蓝牙搜索
setTimeout(() => {
@@ -583,7 +583,7 @@
.text {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
@@ -591,7 +591,7 @@
.info_bot {
margin-top: 24rpx;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
@@ -713,7 +713,7 @@
.mac {
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #262B37;
line-height: 32rpx;
text-align: left;
diff --git a/page_fenbao/device/index.vue b/page_fenbao/device/index.vue
index 9c17ff0..ebf8e1e 100644
--- a/page_fenbao/device/index.vue
+++ b/page_fenbao/device/index.vue
@@ -457,7 +457,7 @@
.mac {
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #262B37;
line-height: 32rpx;
text-align: left;
diff --git a/page_fenbao/device/joinDevice.vue b/page_fenbao/device/joinDevice.vue
index c814de2..b58799a 100644
--- a/page_fenbao/device/joinDevice.vue
+++ b/page_fenbao/device/joinDevice.vue
@@ -529,14 +529,14 @@
margin-top: 24rpx;
.text{
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
.info_bot{
margin-top: 24rpx;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
@@ -655,7 +655,7 @@
.mac {
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #262B37;
line-height: 32rpx;
text-align: left;
diff --git a/page_fenbao/device/lianjie.vue b/page_fenbao/device/lianjie.vue
index 0d36419..1e47b45 100644
--- a/page_fenbao/device/lianjie.vue
+++ b/page_fenbao/device/lianjie.vue
@@ -408,7 +408,7 @@
.mac {
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #262B37;
line-height: 32rpx;
text-align: left;
diff --git a/page_fenbao/device/wifiDevice.vue b/page_fenbao/device/wifiDevice.vue
index 78f266a..9e2b9e7 100644
--- a/page_fenbao/device/wifiDevice.vue
+++ b/page_fenbao/device/wifiDevice.vue
@@ -524,14 +524,14 @@
margin-top: 24rpx;
.text{
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
.info_bot{
margin-top: 24rpx;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #95989D;
}
}
@@ -650,7 +650,7 @@
.mac {
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #262B37;
line-height: 32rpx;
text-align: left;
diff --git a/page_fenbao/statulist/fault/index.vue b/page_fenbao/statulist/fault/index.vue
index dd0a31d..36e97ba 100644
--- a/page_fenbao/statulist/fault/index.vue
+++ b/page_fenbao/statulist/fault/index.vue
@@ -138,6 +138,7 @@
}
page {
// background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
+ background: #F4F5F7;
}
.page {
@@ -171,7 +172,7 @@
color: #3D3D3D;
}
.qian{
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
}
}
diff --git a/page_fenbao/statulist/fault/yichang/index.vue b/page_fenbao/statulist/fault/yichang/index.vue
index 07a8e1c..184ae62 100644
--- a/page_fenbao/statulist/fault/yichang/index.vue
+++ b/page_fenbao/statulist/fault/yichang/index.vue
@@ -164,7 +164,7 @@
background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
}
input{
- font-size: 24rpx;
+ font-size: 26rpx;
}
.page {
width: 750rpx;
diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue
index 1e92cc1..3f9e209 100644
--- a/page_fenbao/statulist/myorder/detailxq/index.vue
+++ b/page_fenbao/statulist/myorder/detailxq/index.vue
@@ -151,7 +151,7 @@
color: #3D3D3D;
}
.qian{
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
}
}
diff --git a/page_fenbao/statulist/myorder/index.vue b/page_fenbao/statulist/myorder/index.vue
index be18226..d232aa5 100644
--- a/page_fenbao/statulist/myorder/index.vue
+++ b/page_fenbao/statulist/myorder/index.vue
@@ -158,14 +158,14 @@
color: #3D3D3D;
}
.wz{
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
margin-top: 16rpx;
}
}
.rt{
.top{
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
}
.je{
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index bac1e16..c28c230 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -441,7 +441,7 @@
}
.wz {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
margin-top: 20rpx;
}
diff --git a/page_fenbao/statulist/myshop/index.vue b/page_fenbao/statulist/myshop/index.vue
index 3b01b15..4c5a193 100644
--- a/page_fenbao/statulist/myshop/index.vue
+++ b/page_fenbao/statulist/myshop/index.vue
@@ -26,7 +26,7 @@
- 日收月收上月收在线离线
+ 日收 月收 上月收 在线 离线
{{item.todayIncome}}￥{{item.monthIncome}}￥{{item.lastMonthIncome}}￥{{item.onlineCount}}台{{item.offlineCount}}台
@@ -206,14 +206,14 @@
.yunxing {
display: flex;
justify-content: space-between;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
margin-top: 26rpx;
}
.phones {
margin-top: 16rpx;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #1DBE7B;
border-bottom: 1px solid #ccc;
padding-bottom: 26rpx;
@@ -226,7 +226,7 @@
.phone {
margin-top: 16rpx;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
text {
@@ -240,7 +240,7 @@
padding-bottom: 26rpx;
.jfgz {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
text {
@@ -251,7 +251,7 @@
.rishou {
margin-top: 26rpx;
- padding: 0 28rpx;
+ // padding: 0 28rpx;
box-sizing: border-box;
.rishouwz {
@@ -259,8 +259,10 @@
justify-content: space-between;
text {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
+ width: 230rpx;
+ text-align: center;
}
}
@@ -273,6 +275,8 @@
font-weight: 500;
font-size: 32rpx;
color: #3D3D3D;
+ width: 230rpx;
+ text-align: center;
}
}
}
diff --git a/page_fenbao/statulist/myshop/shebeilist/index.vue b/page_fenbao/statulist/myshop/shebeilist/index.vue
index 81cb981..b64d213 100644
--- a/page_fenbao/statulist/myshop/shebeilist/index.vue
+++ b/page_fenbao/statulist/myshop/shebeilist/index.vue
@@ -186,7 +186,7 @@
.sta_txt {
margin-left: 15rpx;
color: #262B37;
- font-size: 24rpx;
+ font-size: 26rpx;
font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
font-weight: 400;
}
@@ -194,7 +194,7 @@
.card_left_no {
margin-top: 15rpx;
- font-size: 24rpx;
+ font-size: 26rpx;
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
color: #95989D;
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index 9e0fca2..93cc14c 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/index.vue
@@ -447,14 +447,14 @@
justify-content: space-between;
.qian {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
width: 40%;
// margin-right: 20rpx;
}
.shen {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
}
}
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index 46a375e..602855e 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -404,7 +404,7 @@
}
.wz {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
margin-top: 20rpx;
}
diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue
index 0e259d4..af7ff81 100644
--- a/page_fenbao/statulist/nearby/index.vue
+++ b/page_fenbao/statulist/nearby/index.vue
@@ -431,7 +431,7 @@
.cenb {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
line-height: 32rpx;
margin-top: 14rpx;
@@ -448,7 +448,7 @@
.cenc {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
line-height: 32rpx;
margin-top: 14rpx;
diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue
index 0d535da..1f06c38 100644
--- a/page_user/cbRecord.vue
+++ b/page_user/cbRecord.vue
@@ -142,14 +142,14 @@
color: #3D3D3D;
}
.wz{
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
margin-top: 16rpx;
}
}
.rt{
.top{
- font-size: 24rpx;
+ font-size: 26rpx;
color: #808080;
}
.je{
diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue
index 31fc80c..82adceb 100644
--- a/page_user/mapditu/index.vue
+++ b/page_user/mapditu/index.vue
@@ -434,7 +434,7 @@
.cenb {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
line-height: 32rpx;
margin-top: 14rpx;
@@ -449,7 +449,7 @@
.cenc {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #3D3D3D;
line-height: 32rpx;
margin-top: 14rpx;
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 106d954..9e156dd 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -21,9 +21,12 @@
{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }}
+
+ 更新时间：{{deviceInfo.lastPullTime}}
- S/N码：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}
+
+ S/N码：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}
在线
离线
断电
@@ -40,7 +43,7 @@
-->
-
+
实时
-
+
+
+
+
+ {{deviceInfo.orderAmount == null ? 0 : deviceInfo.orderAmount}}
+
+
+ 订单金额
+
+
+
+
+ {{deviceInfo.orderCount == null ? 0 : deviceInfo.orderCount}}
+
+
+ 订单数
+
+
+
+
+ {{timeday}}
+ sb:{{setMode}}
+
+
+ 剩余分钟
+
+
+
+
其他
@@ -122,7 +154,7 @@
-
收费方式
@@ -134,13 +166,20 @@
设置
-
+
配网
+
+
+
+
+
+ 充值
+
@@ -149,7 +188,18 @@
-
+
+
+ 请输入您需要充值的时长(分钟)
+
+
+
+ 取消 确定
+
+
+
+
@@ -192,16 +242,39 @@
deviceId: '',
storeId: '',
qrResult: '',
- devicesList:[]
+ devicesList: [],
+ setMode:0,
+ vipflag:false,
+ cztime:''
}
},
onLoad(option) {
- // setTimeout(() => {
- // this.$refs.canvas.init(this.initChart)
- // }, 1000)
let id = option.id
this.id = id
this.getDevice(id)
+
+ xBlufi.initXBlufi(1);
+ xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
+ xBlufi.notifyStartDiscoverBle({
+ 'isStart': true
+ })
+
+ // 停止蓝牙搜索
+ setTimeout(() => {
+ xBlufi.notifyStartDiscoverBle({
+ 'isStart': false
+ });
+
+ xBlufi.notifyConnectBle({
+ isStart: true,
+ deviceId: this.deviceId,
+ name: this.name
+ })
+ xBlufi.notifyInitBleEsp32({
+ deviceId: this.deviceId
+ });
+ }, 2000)
+
},
onShow() {
setTimeout(() => {
@@ -214,68 +287,29 @@
xBlufi.notifyStartDiscoverBle({
'isStart': false
});
+ wx.closeBLEConnection({
+ deviceId: this.objlist.deviceId,
+ })
},
onHide() {
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
'isStart': false
});
+ wx.closeBLEConnection({
+ deviceId: this.objlist.deviceId,
+ })
},
onBeforeUnmount() {
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
'isStart': false
});
+ wx.closeBLEConnection({
+ deviceId: this.objlist.deviceId,
+ })
},
methods: {
- async initChart() {
- let value = 100;
- let value2 = this.deviceInfo.orderAmount
- const option = {
- series: [{
- type: 'pie', // 饼图类型
- radius: ['98%', '70%'], // 饼图半径，第一个值是内半径，第二个值是外半径
- silent: true,
- clockwise: true,
- startAngle: 90, // 起始角度
- z: 0,
- zlevel: 0,
- data: [{
- value: value,
- name: '占比', // 数据项名称
- itemStyle: {
- normal: {
- color: '#8883F0', // 数据项颜色
- },
- },
- label: {
- normal: {
- position: 'center',
- formatter: ` {a|${value2 == null ? 0 : value2}}\n\n{b|订单金额}`, // 标签内容格式
- rich: {
- a: {
- fontSize: 15,
- fontWeight: '700',
- color: '#333',
- },
- b: {
- fontSize: 11,
- color: '#888',
- },
- },
- },
- },
- }, ],
- }, ],
- };
-
- // console.log( this.$refs.chartRef,'1111');
- const chart = await this.$refs.chart.init(echarts);
- // console.log(option,11);
- chart.setOption(option)
- return chart
- },
-
getQiniuToken() {
this.$u.get("/common/qiniu/uploadInfo").then((res) => {
if (res.code == 200) {
@@ -355,12 +389,11 @@
let now = new Date();
let differenceInMs = expireDate - now;
if (differenceInMs <= 0) {
- this.timeday = 0
+ this.timeday = null
} else {
this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60)));
}
this.loadings = true
- // this.initChart()
}
});
@@ -424,18 +457,22 @@
title: res.data,
icon: 'none',
duration: 2000
- });
+ })
this.getDevice(this.id)
} else if (res.msg == '设备剩余时间不足，无需归零') {
uni.showToast({
title: '设备剩余时间不足，无需归零',
icon: 'none',
duration: 2000
- });
- this.getDevice(this.id)
+ })
+ }else if(res.code == 500){
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
}
})
-
} else if (num == 2) { //异常
uni.navigateTo({
url: '/page_fenbao/statulist/fault/yichang/index'
@@ -450,48 +487,165 @@
url: '/page_user/setting?id=' + this.id
})
} else if (num == 5) {
- console.log(this.deviceInfo);
- // uni.navigateTo({
- // url: '/page_fenbao/device/lianjie?mac=' + this.deviceInfo.mac + '&storeId=' + this
- // .deviceInfo.storeId
- // })
- uni.showLoading({
- title: '加载中...'
- });
- xBlufi.initXBlufi(1);
- xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
- xBlufi.notifyStartDiscoverBle({
- 'isStart': true
- });
-
-
- // 停止蓝牙搜索
- setTimeout(() => {
+ if(this.deviceId == ''){
+ xBlufi.initXBlufi(1);
+ xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
- 'isStart': false
- });
-
+ 'isStart': true
+ })
+
+ // 停止蓝牙搜索
+ setTimeout(() => {
+ xBlufi.notifyStartDiscoverBle({
+ 'isStart': false
+ });
+
xBlufi.notifyConnectBle({
isStart: true,
deviceId: this.deviceId,
name: this.name
})
-
- // if(this.devicesList.length == 0){
- // uni.hideLoading();
- // uni.showToast({
- // title: '设备离线或不在范围内',
- // icon: 'none',
- // duration: 2000
- // });
- // }
- }, 2000)
-
+ xBlufi.notifyInitBleEsp32({
+ deviceId: this.deviceId
+ })
+ 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 systemInfo = uni.getSystemInfoSync();
+ if (systemInfo.platform == 'android') {
+ // 当前设备是 Android
+ uni.navigateTo({
+ url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+ })
+ } else if (systemInfo.platform == 'ios') {
+ // 当前设备是 iOS
+ uni.navigateTo({
+ url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
+ })
+ }
+ } else if (res.msg == '设备编号和mac不能同时为空') {
+ uni.showToast({
+ title: '设备不在线，未找到设备',
+ icon: 'none',
+ duration: 2000
+ });
+ } else {
+ uni.showToast({
+ title: '连接失败',
+ icon: 'none',
+ duration: 2000
+ });
+ // uni.navigateBack()
+ }
+ })
+ }, 1000)
+ }else{
+ 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 systemInfo = uni.getSystemInfoSync();
+ if (systemInfo.platform == 'android') {
+ // 当前设备是 Android
+ uni.navigateTo({
+ url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+ })
+ } else if (systemInfo.platform == 'ios') {
+ // 当前设备是 iOS
+ uni.navigateTo({
+ url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
+ })
+ }
+ } else if (res.msg == '设备编号和mac不能同时为空') {
+ uni.showToast({
+ title: '设备不在线，未找到设备',
+ icon: 'none',
+ duration: 2000
+ })
+ } else {
+ uni.showToast({
+ title: '连接失败',
+ icon: 'none',
+ duration: 2000
+ });
+ // uni.navigateBack()
+ }
+ })
+ }
+ }else if(num == 6){
+ this.vipflag = true
}
},
+ trueje(){
+ let id = this.deviceInfo.deviceId
+ this.vipflag = false
+ this.$u.put('/app/device/addTime/' + id + '?amount=' + this.cztime).then(res => {
+ if(res.code == 200){
+ uni.showToast({
+ title: '充值成功',
+ icon: 'success',
+ duration: 2000
+ })
+ this.getDevice(this.id)
+ this.cztime = ''
+ }else if(res.code == 500){
+ uni.showToast({
+ title: res.msg,
+ icon: 'success',
+ duration: 2000
+ })
+ }
+ })
+ },
+ btnqx(){
+ this.vipflag = false
+ this.cztime = ''
+ },
+
funListenDeviceMsgEvent: function(options) {
switch (options.type) {
+ case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+ let loadPercent = options.data;
+ let loadText = '文件读取中'
+ // console.log("文件读取中", options.data);
+ break;
+ case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+
+ let ver_data = this.parseCustomData(options.data)
+ this.setMode = Math.floor(ver_data.setMode / 60)
+ console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode);
+ break;
+
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
if (options.result) {
let devicesarr = options.data
@@ -502,15 +656,15 @@
this.deviceId = device.deviceId
this.name = device.name
this.mac = device.name.slice(5, 17)
- console.log(this.mac, 'macmacmac');
- this.devicesList = uniqueDevicesList;
+ // console.log(this.mac, 'macmacmac');
+ // this.devicesList = uniqueDevicesList;
}
})
}
break;
case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
- console.log("连接回调：" + JSON.stringify(options));
+ // console.log("连接回调：" + JSON.stringify(options));
if (options.result) {
uni.hideLoading();
// uni.showToast({
@@ -520,70 +674,8 @@
{
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.msg == '设备编号和mac不能同时为空') {
- uni.showToast({
- title: '设备不在线，未找到设备',
- icon: 'none',
- duration: 2000
- });
- } else {
- uni.showToast({
- title: '连接失败',
- icon: 'none',
- duration: 2000
- });
- // uni.navigateBack()
- }
- })
}
- }else{
+ } else {
uni.hideLoading()
uni.showToast({
title: '设备离线或不在范围内',
@@ -646,33 +738,125 @@
// });
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"，并将字符串转换为浮点数
+ const power = parseFloat(dataArray[4].substring(1)); // 去除前缀 "P"，并将字符串转换为浮点数
+ const remainingPower = parseFloat(dataArray[5].substring(1)); // 去除前缀 "M"，并将字符串转换为浮点数
+ const setMode = dataArray[6].substring(1); // 去除前缀 "T"
+
+ // 返回解析后的数据对象
+ return {
+ voltage,
+ switchState,
+ current,
+ power,
+ remainingPower,
+ setMode
+ };
+ },
}
}