chuangte/bike
5
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
tx 2024-12-30 14:31:59 +08:00
parent f8675832cc
commit f1eee059b6
2 changed files with 1695 additions and 1639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3209
page_user/changeCar.vue
View File

File diff suppressed because it is too large Load Diff

125
pages/index/index.vue
View File

@ -1501,82 +1501,87 @@ export default {
},
deviceInfo(num) {
if (!this.sn) return;
setTimeout(() => {
if (!this.sn) return;
// 检查是否有进行中的订单
if (this.orderinfo.sn) {
if (this.orderinfo.sn != this.sn) {
uni.showToast({
title: '您有正在进行的订单，请先完成当前订单',
icon: 'none',
duration: 2000
});
return;
// 检查是否有进行中的订单
if (this.orderinfo.sn) {
if (this.orderinfo.sn != this.sn) {
uni.showToast({
title: '您有正在进行的订单，请先完成当前订单',
icon: 'none',
duration: 2000
});
return;
}
return
}
}
this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
if (res.code === 200) {
this.isqrcode = true
this.deviceInfos = res.data;
this.getlist(res.data.modelId)
this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
if (res.code === 200) {
this.isqrcode = true
this.deviceInfos = res.data;
this.getlist(res.data.modelId)
if (!this.orderinfo.sn) {
this.mac = res.data.mac
}
// 检查区域是否需要切换
const areaChanged = this.areaInfo.areaId != res.data.areaId;
console.log(this.areaInfo.areaId, res.data.areaId, 'aaaaaaaaaaaaaaaaaaaaaa');
if (num == 0) {
if (areaChanged) {
// 区域不同，需要切换区域
uni.setStorageSync('areaId', res.data.areaId);
this.gps.sn = this.sn;
this.isqrcode = false; // 重置标志以允许新区域的设备信息获取
this.getArea(); // 重新获取区域信息
} else {
this.showdevice = true;
this.type = 0;
if (!this.orderinfo.sn) {
this.mac = res.data.mac
}
} else {
if (this.deviceInfos.status == 1) {
// 检查区域是否需要切换
const areaChanged = this.areaInfo.areaId != res.data.areaId;
console.log(this.areaInfo.areaId, res.data.areaId, 'aaaaaaaaaaaaaaaaaaaaaa');
if (num == 0) {
if (areaChanged) {
// 区域不同，需要切换区域
uni.setStorageSync('areaId', res.data.areaId);
this.gps.sn = this.sn;
this.isqrcode = false; // 重置标志以允许新区域的设备信息获取
this.getArea(); // 重新获取区域信息
setTimeout(() => {
} else {
this.showdevice = true;
this.type = 0;
}
} else {
if (this.deviceInfos.status == 1) {
if (areaChanged) {
// 区域不同，需要切换区域
uni.setStorageSync('areaId', res.data.areaId);
this.gps.sn = this.sn;
this.isqrcode = false; // 重置标志以允许新区域的设备信息获取
this.getArea(); // 重新获取区域信息
setTimeout(() => {
this.showdevice = true;
this.type = 1;
this.deviceIndex = 1;
}, 600);
} else {
this.showdevice = true;
this.type = 1;
this.deviceIndex = 1;
}, 600);
}
} else {
this.showdevice = true;
this.type = 1;
this.deviceIndex = 1;
this.$refs.uToast.show({
title: this.getStatusMessage(this.deviceInfos.status),
duration: 2000
});
}
} else {
this.$refs.uToast.show({
title: this.getStatusMessage(this.deviceInfos.status),
duration: 2000
});
}
} else {
this.showdevice = false;
this.deviceIndex = 0;
this.type = 0;
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
} else {
this.showdevice = false;
this.deviceIndex = 0;
this.type = 0;
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
});
});
}, 700);
},
// 新增辅助方法处理状态消息
getStatusMessage(status) {
@ -2082,8 +2087,6 @@ export default {
console.error("Error fetching parking data:", error);
});
},
totxtpage() {
this.seeDetail = true
uni.navigateTo({
@ -4577,7 +4580,7 @@ export default {
},
convertBoundaryToPolylines(boundaries, num) {
if (num == 1) {
console.log('判断1');
return boundaries.map(boundary => {
if (!boundary) return null;
let coords;