From 36d667326ef5358b2c48a8cb1c9edc266f917f0d Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Tue, 22 Oct 2024 13:28:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E6=AC=BE=E9=80=80?= =?UTF-8?q?=E8=8F=9C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/table.js | 11 ++ .../order_manage/components/orderDetail.vue | 62 ++++++- .../tool/Instead/components/cart-item.vue | 2 +- .../tool/Instead/components/return-cart.vue | 14 +- .../tool/Instead/components/return-money.vue | 175 ++++++++++++++++++ 5 files changed, 254 insertions(+), 10 deletions(-) create mode 100644 src/views/tool/Instead/components/return-money.vue diff --git a/src/api/table.js b/src/api/table.js index 34af13a..57bf688 100644 --- a/src/api/table.js +++ b/src/api/table.js @@ -439,3 +439,14 @@ export function $getOrderPayUrl(data) { } }); } +//退款 +export function $returnOrder(data) { + return request({ + url: '/api/place/returnOrder', + method: "post", + data:{ + shopId: localStorage.getItem("shopId"), + ...data + } + }); +} diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue index 86127d7..c8007f7 100644 --- a/src/views/order_manage/components/orderDetail.vue +++ b/src/views/order_manage/components/orderDetail.vue @@ -130,12 +130,12 @@ ¥{{ scope.row.priceAmount }} - + @@ -199,6 +199,19 @@ --> + + @@ -206,8 +219,14 @@ import orderEnum from "../orderEnum"; import dayjs from "dayjs"; import { tbOrderInfoDetail, tbOrderInfoData } from "@/api/order"; - +import returnCart from "@/views/tool/Instead/components/return-cart.vue"; +import returnMoney from "@/views/tool/Instead/components/return-money.vue"; +import { + $returnCart,$returnOrder +} from "@/api/table"; export default { + components: { returnCart,returnMoney }, + data() { return { orderEnum, @@ -215,7 +234,8 @@ export default { type: "1", detail: "", loading: false, - refoundList: [] + refoundList: [], + selGoods:{num:1} }; }, filters: { @@ -249,11 +269,37 @@ export default { } }, methods: { - tuikuan(item){ - + async refReturnMoneyConfirm(e){ + const res = await $returnOrder({ + ...e, + orderId:this.detail.id, + orderDetails:[{ + id:this.selGoods.id, + num:e.num + }] + }); + this.update(); }, - tuiCaidan(item){ - + update(){ + this.tbOrderInfoDetail(this.detail.id); + }, + async refReturnCartConfirm(e){ + const res = await $returnCart({ + ...e, + cartId: this.selGoods.id, + tableId: this.detail.tableId, + }); + this.update(); + }, + tuikuan(item){ + this.selGoods=item; + console.log(item); + this.$refs.refReturnMoney.open(item); + }, + tuiCai(item){ + this.selGoods=item; + console.log(item); + this.$refs.refReturnCart.open(item); }, // 切换类型 getTableData() { diff --git a/src/views/tool/Instead/components/cart-item.vue b/src/views/tool/Instead/components/cart-item.vue index 9b84f2e..f88f087 100644 --- a/src/views/tool/Instead/components/cart-item.vue +++ b/src/views/tool/Instead/components/cart-item.vue @@ -76,7 +76,7 @@ }" > ¥{{ item.totalAmount }} - ¥{{ item.salePrice }} + ¥{{ item.totalAmount }} diff --git a/src/views/tool/Instead/components/return-cart.vue b/src/views/tool/Instead/components/return-cart.vue index 5937eb0..c99550d 100644 --- a/src/views/tool/Instead/components/return-cart.vue +++ b/src/views/tool/Instead/components/return-cart.vue @@ -1,5 +1,5 @@