|
|
@@ -293,7 +293,7 @@ import { ref } from "vue";
|
|
|
import ChargeMachine from "../machines/charge-machine/charge-machine.vue";
|
|
|
import PriceDesc from "../machines/price-desc/price-desc.vue";
|
|
|
import { format } from "@/utils/date";
|
|
|
-import { to } from "../../utils/navigate";
|
|
|
+import { to,redirect } from "../../utils/navigate";
|
|
|
|
|
|
const DAY = 24 * 60 * 60 * 1000;
|
|
|
const options = ref<any>();
|
|
|
@@ -491,7 +491,7 @@ const changeHour = (index: number) => {
|
|
|
appointmentData.value.startChargeSeq,
|
|
|
`${format("y-M-d", chargeTime.value.time)} ${
|
|
|
timesInfo.value.hour[index].format
|
|
|
- }`
|
|
|
+ }:00`
|
|
|
)
|
|
|
.then(() => {
|
|
|
return fetchChargeStatus();
|
|
|
@@ -700,9 +700,7 @@ const submit = () => {
|
|
|
});
|
|
|
}
|
|
|
if (chargeType.value === 1) {
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages-charge/ordering/ordering?sn=${options.value.sn}&start=1`,
|
|
|
- });
|
|
|
+ redirect(`/pages-charge/ordering/ordering?sn=${options.value.sn}&start=1`)
|
|
|
}
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
@@ -736,9 +734,7 @@ const _checkStartCharge = () => {
|
|
|
fetchChargeStatus().then((res) => {
|
|
|
if (res && [2].includes(res.chargeStatus)) {
|
|
|
uni.hideLoading();
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages-charge/ordering/ordering?sn=${options.value.sn}&start=1`,
|
|
|
- });
|
|
|
+ redirect(`/pages-charge/ordering/ordering?sn=${options.value.sn}&start=1`)
|
|
|
} else {
|
|
|
_checkStartCharge();
|
|
|
}
|