Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
This commit is contained in:
commit
2b8746abe4
|
|
@ -464,16 +464,8 @@ async function createOrder(key) {
|
|||
}
|
||||
}
|
||||
|
||||
// 取消历史订单
|
||||
async function clearOldOrder(params) {
|
||||
const res1 = params.placeNum
|
||||
? await orderApi.rmPlaceOrder(params)
|
||||
: await orderApi.cancelOrder(params);
|
||||
carts.clearHistory();
|
||||
ElMessage({
|
||||
type: res1 ? "success" : "error",
|
||||
message: res1 ? "删除成功" : "删除失败",
|
||||
});
|
||||
// 清空历史订单回调
|
||||
async function clearOldOrderCallback() {
|
||||
// 获取历史订单数据
|
||||
const res = await orderApi.getHistoryList({
|
||||
orderId: carts.oldOrder.id,
|
||||
|
|
@ -492,6 +484,22 @@ async function clearOldOrder(params) {
|
|||
carts.setOldOrder(res);
|
||||
}
|
||||
}
|
||||
// 取消历史订单
|
||||
async function clearOldOrder(params) {
|
||||
try {
|
||||
const res1 = params.placeNum
|
||||
? await orderApi.rmPlaceOrder(params)
|
||||
: await orderApi.cancelOrder(params);
|
||||
carts.clearHistory();
|
||||
ElMessage({
|
||||
type: res1 ? "success" : "error",
|
||||
message: res1 ? "删除成功" : "删除失败",
|
||||
});
|
||||
clearOldOrderCallback();
|
||||
} catch (error) {
|
||||
clearOldOrderCallback();
|
||||
}
|
||||
}
|
||||
|
||||
//可选套餐商品
|
||||
const refAddTaocan = ref();
|
||||
|
|
|
|||
Loading…
Reference in New Issue