From 0632e395ce94c95a96b6db1a54ac7ce8dc348ae6 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Thu, 10 Oct 2024 16:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../choose-table/choose-table.vue | 9 +++- .../confirm-order/components/remark.vue | 1 + .../confirm-order/confirm-order.vue | 52 ++++++++++++------- pagesCreateOrder/index/components/car.vue | 5 +- pagesCreateOrder/index/index.vue | 15 +++++- pagesCreateOrder/pay-order/pay-order.vue | 2 + 6 files changed, 61 insertions(+), 23 deletions(-) diff --git a/pagesCreateOrder/choose-table/choose-table.vue b/pagesCreateOrder/choose-table/choose-table.vue index 0aba9f3..55e2848 100644 --- a/pagesCreateOrder/choose-table/choose-table.vue +++ b/pagesCreateOrder/choose-table/choose-table.vue @@ -45,6 +45,9 @@ + @@ -142,7 +145,7 @@ content } = await $table.get(query) tables.hasAjax = true - content = content.filter(v => v.status != 'closed') + content = content.filter(v => v.status == 'idle') tables.list = content tables.selIndex = content.findIndex(v => v.tableId == option.tableId) console.log(tables.selIndex ); @@ -166,6 +169,10 @@ } watch(() => area.sel, (newval) => { + if(!newval){ + tables.list = tables.originList + return + } tables.list = tables.originList.filter(v => v.areaId == newval.id) }) let option = {} diff --git a/pagesCreateOrder/confirm-order/components/remark.vue b/pagesCreateOrder/confirm-order/components/remark.vue index 13b4fa3..38f61c8 100644 --- a/pagesCreateOrder/confirm-order/components/remark.vue +++ b/pagesCreateOrder/confirm-order/components/remark.vue @@ -48,6 +48,7 @@ function changeCauses(item) { let prve=form.remark?',':'' form.remark +=prve+item.name + console.log(form.remark); } const causes = reactive([{ diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue index 634ae1e..a6ba538 100644 --- a/pagesCreateOrder/confirm-order/confirm-order.vue +++ b/pagesCreateOrder/confirm-order/confirm-order.vue @@ -221,7 +221,7 @@ - + @@ -240,10 +240,9 @@ computed, watch } from 'vue'; - import myButton from '@/components/my-components/my-button' import modelDiscount from './components/discount' import giveFood from './components/give-food' - import myRemark from './components/remark' + import oneRemark from './components/remark' import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue' import go from '@/commons/utils/go.js'; import { @@ -273,10 +272,12 @@ } function showModel(key, index) { - modelData.data =goods.list[index] - modelData.selIndex =index + modelData.data = goods.list[index] + modelData.selIndex = index const model = models.get(key) - model && model.open({remark:modelData.data.note}) + model && model.open({ + remark: modelData.data.note||'' + }) } function formatPrice(n) { @@ -398,11 +399,11 @@ //监听桌台改变 watch(() => table.value, (newval, oldval) => { if (newval && oldval) { - Api.$choseTable({ - orderId: 4462, - oldTableId: oldval.tableId, - newTableId: newval.tableId, - }) + // Api.$choseTable({ + // orderId: 4462, + // oldTableId: oldval.tableId, + // newTableId: newval.tableId, + // }) } }) @@ -510,9 +511,16 @@ }) } else { //后付 - uni.navigateBack({ - delta: 2 - }) + if (option.isCreateOrderToDetail) { + go.to('PAGES_ORDER_DETAIL', { + id: res.id + }) + } else { + uni.navigateBack({ + delta: 2 + }) + } + // return go.to('PAGES_ORDER_DETAIL', { // id: res.id // }) @@ -531,7 +539,7 @@ //单品备注确认 async function goodsOneRemarkConfirm(e) { - const cart=goods.list[modelData.selIndex] + const cart = goods.list[modelData.selIndex] await Api.$updateCart({ cartId: cart.id, productId: cart.productId, @@ -540,11 +548,16 @@ note: e.remark, num: cart.number // 0会删除此商品 }) - cart.note= e.remark + cart.note = e.remark } - function init() { - + async function init() { + await getTbShopInfo() + await getCart() + console.log($seatFee); + if (!$seatFee.totalNumber) { + updateChoseCount() + } } onLoad((opt) => { @@ -558,8 +571,7 @@ } } init() - getCart() - getTbShopInfo() + // updateChoseCount() }) diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue index 2c66ae4..1d5366e 100644 --- a/pagesCreateOrder/index/components/car.vue +++ b/pagesCreateOrder/index/components/car.vue @@ -76,6 +76,9 @@ return [] } }, + isCreateOrderToDetail:{ + type:Boolean,default:false + }, user:{ type: Object, default: () => { @@ -123,7 +126,7 @@ const {tableId,name,maxCapacity,status,type}=props.table go.to('PAGES_CONFIRM_ORDER',{ masterId:props.masterId,type, - tableId,name,maxCapacity,status + tableId,name,maxCapacity,status,isCreateOrderToDetail:props.isCreateOrderToDetail }) } diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index c3821dd..4e5d963 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -97,7 +97,7 @@ - @@ -913,16 +913,29 @@ init() }) onBeforeUnmount(() => {}) + + function watchUpdate() { + uni.$off('update:createOrderIndex') + uni.$on('update:createOrderIndex', (data) => { + console.log('update:createOrderIndex'); + init() + }) + } onShow(() => { // watchChooseuser() watchChooseTable() + watchUpdate() }) + let isCreateOrderToDetail=ref(false) onLoad((opt) => { console.log(opt) Object.assign(data.table, opt) if(opt.useType){ uni.setStorageSync('useType',opt.useType) } + if(JSON.stringify(opt)=='{}'){ + isCreateOrderToDetail.value=true + } // if (!opt.tableId) { // infoBox.showErrorToast('暂不支持不选择桌台下载，请从桌台点餐') // return setTimeout(() => { diff --git a/pagesCreateOrder/pay-order/pay-order.vue b/pagesCreateOrder/pay-order/pay-order.vue index 16678cd..ee1bddb 100644 --- a/pagesCreateOrder/pay-order/pay-order.vue +++ b/pagesCreateOrder/pay-order/pay-order.vue @@ -122,6 +122,8 @@ infoBox.showToast('支付成功') setTimeout(() => { // uni.$emit('orderDetail:update') + uni.$emit('update:createOrderIndex') + console.log('update:createOrderIndex'); uni.navigateBack({ delta: 2 })