|
|
@@ -589,21 +589,12 @@ const onImgLoad = () => {
|
|
|
return;
|
|
|
}
|
|
|
if (res && res.isStarted) {
|
|
|
- if (options.value && options.value.connectorId === res.connectorId) {
|
|
|
- fetchStatus(res);
|
|
|
- return;
|
|
|
+ // 已有充电中的订单,直接进入充电中页面
|
|
|
+ if (options.value && options.value.connectorId !== res.connectorId) {
|
|
|
+ // 同步为当前充电订单的充电桩,保证停止充电等操作正确
|
|
|
+ options.value = { ...options.value, connectorId: res.connectorId };
|
|
|
}
|
|
|
- // 当前充电中
|
|
|
- uni.showModal({
|
|
|
- title: "温馨提示",
|
|
|
- content: "当前有正在充电中的订单",
|
|
|
- showCancel: false,
|
|
|
- confirmText: "查看订单",
|
|
|
- confirmColor: "#2d9e95",
|
|
|
- success: () => {
|
|
|
- fetchStatus(res);
|
|
|
- },
|
|
|
- });
|
|
|
+ fetchStatus(res);
|
|
|
} else {
|
|
|
reLaunch();
|
|
|
}
|