diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue index a3405f3..18059ef 100644 --- a/pagesOrder/detail/detail.vue +++ b/pagesOrder/detail/detail.vue @@ -221,7 +221,7 @@ if(!canJieZhang){ return } - const userId=orderDetail.info.userId||'' + const memberId=orderDetail.info.memberId||'' clearEmit() go.to('PAGES_ORDER_PAY', { tableId: options.tableId|| orderDetail.info.tableId, @@ -229,7 +229,7 @@ masterId: options.masterId, orderId: orderDetail.info.id, discount: 1, - userId + memberId }) } @@ -243,8 +243,8 @@ const options = reactive({}) async function init() { const res = await orderApi.tbOrderInfoDetail(options.id) - if(res.userId){ - queryAllShopUser({id:res.userId}).then(res=>{ + if(res.memberId){ + queryAllShopUser({id:res.memberId}).then(res=>{ if(res.content[0]){ user.value=res.content[0] } @@ -320,6 +320,7 @@ //更新选择用户 function setUser(par) { const submitPar = { + orderId:options.id||'', masterId: options.masterId, tableId: options.tableId|| orderDetail.info.tableId, vipUserId: user.value.id ? user.value.id : '', diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue index 551888e..50c53d9 100644 --- a/pagesOrder/pay-order/pay-order.vue +++ b/pagesOrder/pay-order/pay-order.vue @@ -42,13 +42,18 @@ - {{item.payName}} + {{item.payName}} - {{user.telephone||user.nickName}} - 余额: - ¥{{user.amount||'0'}} + + 会员: + {{user.telephone||user.nickName}} + + + 余额: + ¥{{user.amount||'0'}} + @@ -195,7 +200,7 @@ type: data.id ? 0 : 1 //0 设置 1 取消 }).then(res=>{ user.value = data - order.userId=data.id + order.memberId=data.id }) }) } @@ -286,7 +291,7 @@ masterId: order.masterId, orderId: order.id || order.orderId, payType, - vipUserId: order.userId, + vipUserId: order.memberId, discount: 1, code: '' }) @@ -337,11 +342,11 @@ }) let payCodeUrl = ref('') async function init() { - const res = await orderApi.tbOrderInfoDetail(order.orderId) - Object.assign(order, res) - if (order.userId) { + const orderRes = await orderApi.tbOrderInfoDetail(order.orderId) + Object.assign(order, orderRes) + if (orderRes.memberId) { queryAllShopUser({ - id: order.userId + id: orderRes.memberId }).then(res => { if(res.content[0]){ user.value =res.content[0]