diff --git a/src/api/table.js b/src/api/table.js index 1a691c3..4e7cb83 100644 --- a/src/api/table.js +++ b/src/api/table.js @@ -461,3 +461,14 @@ export function $returnTableDetail(data) { } }); } +//获取订单可用优惠券 +export function $activateByOrderId(data) { + return request({ + url: '/api/tbShopCoupon/activateByOrderId', + method: "get", + params:{ + shopId: localStorage.getItem("shopId"), + ...data + } + }); +} \ No newline at end of file diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index e219e29..e11e399 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -825,7 +825,7 @@ - +
@@ -1287,6 +1287,7 @@ import { tbShopTableGet, $changeUseType, $returnTableDetail, + $activateByOrderId } from "@/api/table"; import { tbShopCategoryGet } from "@/api/shop"; import { @@ -1745,6 +1746,7 @@ export default { tableId: this.table.tableId, masterId: this.masterId, vipUserId: val, + orderId:this.createOrder.data.id||'', type: val === "" ? 1 : 0, }); }, @@ -3407,9 +3409,17 @@ export default { this.table = params.tableId ? item : ""; }, async getOrderData(params) { + const orderId= params ? params.orderId : this.createOrder.data.id + const res = await tbOrderInfoDetail( params ? params.orderId : this.createOrder.data.id ); + if(res.memberId){ + $activateByOrderId({ + orderId,memberId:res.memberId + }) + } + if (res.status != "unpaid") { return res; }