diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue index 0c9b654..074fbd9 100644 --- a/pagesCreateOrder/confirm-order/confirm-order.vue +++ b/pagesCreateOrder/confirm-order/confirm-order.vue @@ -523,6 +523,7 @@ } // updateChoseCount() const res = await Api.$createOrder(par) + uni.$emit('update:createOrderIndex') console.log($shop.value); console.log(res); if ($shop.value.registerType == 'munchies') { @@ -534,11 +535,14 @@ ) } else { //后付 - if (option.isCreateOrderToDetail) { + console.log(option.isCreateOrderToDetail); + if (option.isCreateOrderToDetail!='0') { + console.log('PAGES_ORDER_DETAIL'); go.to('PAGES_ORDER_DETAIL', { id: res.id },'redirect') } else { + console.log('back'); uni.navigateBack({ delta: 2 }) @@ -584,9 +588,8 @@ } onLoad((opt) => { - console.log('opt'); - console.log(opt); Object.assign(option, opt) + console.log(option,); if (opt) { table.value = { tableId: opt.tableId, diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue index 1d5366e..8055baa 100644 --- a/pagesCreateOrder/index/components/car.vue +++ b/pagesCreateOrder/index/components/car.vue @@ -126,7 +126,7 @@ const {tableId,name,maxCapacity,status,type}=props.table go.to('PAGES_CONFIRM_ORDER',{ masterId:props.masterId,type, - tableId,name,maxCapacity,status,isCreateOrderToDetail:props.isCreateOrderToDetail + tableId,name,maxCapacity,status,isCreateOrderToDetail:props.isCreateOrderToDetail?1:0 }) } diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index 692ad34..b618e81 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -1,18 +1,21 @@