From b3d153ab862a10dd4571de3e9e913e5b4dbec3ee Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Thu, 19 Mar 2026 17:25:24 +0800 Subject: [PATCH] tablecode --- .env.development | 8 +- src/store/modules/carts.ts | 31 +++++-- .../Storingwineconfig/Content.vue | 3 +- .../tool/Instead/components/carts/list.vue | 93 ++++--------------- src/views/tool/Instead/components/order.vue | 9 +- src/views/tool/Instead/index.vue | 49 +++++++--- 6 files changed, 91 insertions(+), 102 deletions(-) diff --git a/.env.development b/.env.development index 949bf9b..25a20b1 100644 --- a/.env.development +++ b/.env.development @@ -7,8 +7,8 @@ VITE_APP_BASE_API=/dev-api # 接口地址 # VITE_APP_API_URL=https://tapi.cashier.sxczgkj.cn/ # 测试 -# VITE_APP_API_URL=https://cashier.sxczgkj.com/ # 正式 - VITE_APP_API_URL=http://192.168.1.42/ # 本地 +VITE_APP_API_URL=https://cashier.sxczgkj.com/ # 正式 +# VITE_APP_API_URL=http://192.168.1.42/ # 本地 VITE_APP_API_PHP_URL=http://192.168.1.42:8000 #php抖音美团测试环境 VITE_APP_API_PHP_IMPORT_URL=http://192.168.1.42:8789 #本地php批量导入 # VITE_APP_API_PHP_IMPORT_URL=https://diftcs.sxczgkj.com #本地线上php批量导入 @@ -16,8 +16,8 @@ VITE_APP_BASE_API=/dev-api # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws # VITE_APP_WS_ENDPOINT=wss://sockets.sxczgkj.com/wss -# VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss # 正式 -VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地 +VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss # 正式 +# VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地 # VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn #php抖音美团正式环境 # 启用 Mock 服务 diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts index 449ae77..95278c0 100644 --- a/src/store/modules/carts.ts +++ b/src/store/modules/carts.ts @@ -227,8 +227,8 @@ export const useCartsStore = defineStore("carts", () => { // 当前购物车数据（现在 getAllGoodsList 能直接访问） const list = useStorage("carts", []); - // 历史订单数据（现在 getAllGoodsList 能直接访问） - const oldOrder = useStorage("Instead_olold_order", { + // 历史订单数据（现在 getAllGoodsList 能直接访问），不从本地缓存获取，改为从接口获取 + const oldOrder = ref({ detailMap: [], originAmount: 0 }); @@ -833,8 +833,9 @@ export const useCartsStore = defineStore("carts", () => { } // 初始话订单信息/补全历史订单信息 - async function setOldOrder(data: any) { - console.log('补全订单信息', data); + async function setOldOrder(data: any, t: number) { + console.log('补全历史订单信息来源', t); + // console.log('补全订单信息', data); oldOrder.value = { ...data, detailMap: returnDetailMap(data.detailMap) @@ -849,10 +850,12 @@ export const useCartsStore = defineStore("carts", () => { let $initParams = {} as ApifoxModel; - async function init(initParams: ApifoxModel, $oldOrder: any | undefined) { - await getGoods({}); - if ($oldOrder) setOldOrder($oldOrder); - else oldOrder.value = { detailMap: [] }; + async function init(initParams: ApifoxModel | undefined, $oldOrder: any | undefined) { + console.log('cart.init.initParams', initParams); + console.log('cart.init.$oldOrder', $oldOrder); + + + if (initParams) { initParams.table_code = initParams.table_code || ''; @@ -860,6 +863,16 @@ export const useCartsStore = defineStore("carts", () => { $initParams = initParams; } + await getGoods({}); + + if ($oldOrder) { + await setOldOrder($oldOrder); + } else if (table_code.value) { + await getOldOrder(table_code.value); + } else { + oldOrder.value = { detailMap: [] }; + } + concocatSocket($initParams); } @@ -978,7 +991,7 @@ export const useCartsStore = defineStore("carts", () => { } if (msg.operate_type === "product_update") { - init($initParams, oldOrder.value); + init($initParams, oldOrder.value,); } if (msg.type === "bc") { diff --git a/src/views/application/list/storingWine/storingWineconfig/Storingwineconfig/Content.vue b/src/views/application/list/storingWine/storingWineconfig/Storingwineconfig/Content.vue index 7d37499..f229522 100644 --- a/src/views/application/list/storingWine/storingWineconfig/Storingwineconfig/Content.vue +++ b/src/views/application/list/storingWine/storingWineconfig/Storingwineconfig/Content.vue @@ -60,7 +60,8 @@ - + diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue index 2a61a85..041c37d 100644 --- a/src/views/tool/Instead/components/carts/list.vue +++ b/src/views/tool/Instead/components/carts/list.vue @@ -4,38 +4,22 @@
以下是优惠菜品
- +
@@ -74,14 +50,9 @@
- + diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue index b5851fe..e405374 100644 --- a/src/views/tool/Instead/components/order.vue +++ b/src/views/tool/Instead/components/order.vue @@ -672,6 +672,7 @@ function returnPayParams() { newCustomerDiscountAmount: carts.newUserDiscount !== null ? carts.newUserDiscount.amount : 0, // 新客立减金额 vipDiscountAmount: carts.orderCostSummary.vipDiscountAmount, // 超级会员折扣 + remark: cashRemark.value, // 现金支付备注 }, }; } @@ -700,15 +701,19 @@ async function getPaytype() { payTypes.sel = payTypes.list.findIndex((v) => v.payType == "cash"); } } + +const cashRemark = ref(""); function nowPayClick(payType) { payType = payType || payTypes.list[payTypes.sel].payType; if (payType === "cash") { - ElMessageBox.confirm("是否确认已现金收款：" + currentpayMoney.value + "元", "快捷支付", { + ElMessageBox.prompt("是否确认已现金收款：" + currentpayMoney.value + "元", "快捷支付", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", + inputPlaceholder: '请输入现金支付备注（选填）', }) - .then(() => { + .then(({ value }) => { + cashRemark.value = value || ""; payOrder("cash"); }) .catch(() => { }); diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index 3ae6b2e..3d4c078 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -246,7 +246,8 @@ async function refReturnCartConfirm(e) { if (res) { // 获取历史订单数据 const res1 = await orderApi.getHistoryList({ - orderId: carts.oldOrder.id, + // orderId: carts.oldOrder.id, + tableCode: carts.table_code, }); if (res1) { carts.setOldOrder(res1); @@ -370,7 +371,8 @@ async function createOrder(key) { if (res.id) { // 获取历史订单数据 const res1 = await orderApi.getHistoryList({ - orderId: res.id, + // orderId: carts.oldOrder.id, + tableCode: carts.table_code, }); if (res1) { carts.setOldOrder(res1); @@ -403,7 +405,8 @@ async function clearOldOrderCallback() { try { // 获取历史订单数据 const res = await orderApi.getHistoryList({ - orderId: carts.oldOrder.id, + // orderId: carts.oldOrder.id, + tableCode: carts.table_code, }); const noPayStatus = { cancelled: "订单已取消", @@ -415,8 +418,23 @@ async function clearOldOrderCallback() { showOrder.value = false; return; } - if (res) { + console.log('清空历史订单回调', res); + + if (res.data !== null) { + console.log('还有历史订单数据'); carts.setOldOrder(res); + } else { + console.log('历史订单没数据了'); + carts.oldOrder = { + detailMap: [], + originAmount: 0, + }; + carts.setOldOrder({ + detailMap: [], + originAmount: 0, + }, 9); + // carts.clearHistory(); + // resetOldOrder(); } } catch (error) { console.log(error); @@ -748,7 +766,7 @@ function init() { getTableList(); getCategoryList(); changeCartsDinerType(); - carts.init({ table_code: carts.tableInfo.tableCode }, carts.oldOrder); + carts.init({ table_code: carts.tableInfo.tableCode }); } onBeforeRouteLeave(() => { @@ -760,13 +778,18 @@ onMounted(async () => { const { id, tableCode, key } = route.query; if (id || tableCode) { // 获取历史订单数据 - const res = id - ? await orderApi.getHistoryList({ - orderId: id, - }) - : await orderApi.getHistoryList({ - tableCode, - }); + // const res = id + // ? await orderApi.getHistoryList({ + // orderId: id, + // }) + // : await orderApi.getHistoryList({ + // tableCode, + // }); + const res = await orderApi.getHistoryList({ + // orderId: carts.oldOrder.id, + tableCode: carts.table_code, + }); + const noPayStatus = { cancelled: "订单已取消", done: "订单已关闭", @@ -799,6 +822,8 @@ onMounted(async () => { } } if (res) { + console.log('res31231231331-=====--', res); + carts.setOldOrder(res); showOrder.value = key == "isPayOrder" ? true : false; perpole.value = res.seatNum || 0;