From 63524edd7ce5ade03f39a01fe5d19f70fcaf3592 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 22 Oct 2021 18:00:35 +0800 Subject: [PATCH] add order --- .../order_list/rent_and_sale/rent_and_sale.vue | 66 +++++-- src/pages/order_list/order_list.vue | 9 +- src/pages/order_search/order_search.vue | 36 +++- src/subpackage/order/js/api.js | 1 + .../order/pages/club_rental/detail/detail.vue | 4 +- .../order/pages/devices/detail/detail.vue | 3 +- .../order/pages/order_manage/order_manage.vue | 2 +- .../order/pages/rent_and_sale/detail/detail.vue | 193 +++++++++++++++------ 8 files changed, 234 insertions(+), 80 deletions(-) diff --git a/src/components/order_list/rent_and_sale/rent_and_sale.vue b/src/components/order_list/rent_and_sale/rent_and_sale.vue index dc914c5..bdd428b 100644 --- a/src/components/order_list/rent_and_sale/rent_and_sale.vue +++ b/src/components/order_list/rent_and_sale/rent_and_sale.vue @@ -1,27 +1,32 @@ diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index e55b026..ea1a32d 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -61,7 +61,7 @@ - + - + 租用详情 - + 设备名称: - + 租用设备: - + 柜子编号: - + 租借时间: - + 归还时间: - + 租借时长: 费用详情 - + 收费标准: - + 支付押金: - + 产生费用: - - - - 合计支付:¥5 - - - 应退还金额:¥40 - (注:应退还金额=支付押金-合计应支付金额) - + + + + + 合计支付:¥{{ orderInfo.rent_amount || '0' }} + + + 应退还金额:¥{{ orderInfo.refund_amount || '0' }} + (注:应退还金额=支付押金-合计应支付金额) + + - + 支付详情 - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - 退款详情 - - - - - + + 退押详情 + + + + + - - 结束计费 + + 结束计费 - + 商品详情 - + 设备名称: - + 租用设备: - + 柜子编号: - + 价格: 费用详情 - - - - - 合计支付:¥5 + + + + + 合计支付:¥{{ orderInfo.pay_amount || '0' }} 支付详情 - - - - - - + + + + + + + + +