From 4ef95c9baa93ea76ea55fc785901f7add01eb5f5 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Thu, 27 Nov 2025 19:10:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesCreateOrder/table-order/index.vue | 10 +++++++--- pagesOrder/pay-order/pay-order.vue | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pagesCreateOrder/table-order/index.vue b/pagesCreateOrder/table-order/index.vue index da1823e..15ef013 100644 --- a/pagesCreateOrder/table-order/index.vue +++ b/pagesCreateOrder/table-order/index.vue @@ -130,10 +130,14 @@ import * as areaApi from "@/http/api/area.js"; import yskUtils from "ysk-utils"; import go from "@/commons/utils/go.js"; -import { reactive, ref, provide, computed } from "vue"; +import { reactive, ref, provide, computed,inject } from "vue"; +const websocketUtil=inject("websocketUtil") + const cartStore = useCartStore(); const accountStore = useAccountStore(); - +websocketUtil.onMessage((data) => { + cartStore.onMessage(data); +}); const modalData = reactive({ show: false, key: "", @@ -233,7 +237,7 @@ function toPay() { isNowPay: true, dinnerType: cartStore.currentDinnerType, personCount: cartStore.personCount, - },'redirect'); + }); } const areaList = ref([]); diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue index eca7d8e..73220d0 100644 --- a/pagesOrder/pay-order/pay-order.vue +++ b/pagesOrder/pay-order/pay-order.vue @@ -1228,7 +1228,9 @@ async function pay(par) { } if (error.code == 701) { uni.removeStorageSync("table_code"); - uni.navigateBack(); + uni.navigateBack({ + delta: 2, + }); } payStatus = ""; return false; @@ -1254,7 +1256,7 @@ function paySuccess() { uni.$emit("get:table"); uni.$emit("update:orderDetail"); uni.navigateBack({ - delta: 1, + delta: 2, }); websocketUtil.send( JSON.stringify({