From 1954307cabc79084943efad88dcaaa94e1ef9ae5 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 18 Mar 2025 17:42:46 +0800 Subject: [PATCH] finish tid1929 --- src/pages.json | 12 + .../order/components/order_list/header.vue | 2 +- src/subpackage/order/components/search_bar.vue | 68 ++++++ src/subpackage/order/js/api.js | 7 + src/subpackage/order/js/handle.js | 18 ++ .../pages/booking_card/modules/refund_modal.vue | 261 +++++++++++++++++++++ .../order/pages/booking_card/modules/time_zone.vue | 84 +++++++ .../order/pages/booking_card/order_info.vue | 153 ++++++++++-- .../order/pages/booking_card/order_list.vue | 155 +++++++++++- src/subpackage/order/pages/booking_card/search.vue | 116 +++++++++ .../order/pages/booking_card/use_record.vue | 191 +++++++++++++++ .../modules/order_search/search_bar.vue | 2 +- 12 files changed, 1031 insertions(+), 38 deletions(-) create mode 100644 src/subpackage/order/components/search_bar.vue create mode 100644 src/subpackage/order/js/handle.js create mode 100644 src/subpackage/order/pages/booking_card/modules/refund_modal.vue create mode 100644 src/subpackage/order/pages/booking_card/modules/time_zone.vue create mode 100644 src/subpackage/order/pages/booking_card/search.vue diff --git a/src/pages.json b/src/pages.json index e30adf4..8d0be2c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -657,6 +657,18 @@ "style" : { "navigationBarTitleText": "订场卡订单详情" } + }, + { + "path": "pages/booking_card/use_record", + "style" : { + "navigationBarTitleText": "使用记录" + } + }, + { + "path": "pages/booking_card/search", + "style" : { + "navigationBarTitleText": "搜索订单" + } } ] }, diff --git a/src/subpackage/order/components/order_list/header.vue b/src/subpackage/order/components/order_list/header.vue index cf0884f..004d704 100644 --- a/src/subpackage/order/components/order_list/header.vue +++ b/src/subpackage/order/components/order_list/header.vue @@ -14,7 +14,7 @@ - 成功交易{{ successCount || 0 }}笔,退款{{ refundCount || 0 }}笔 + 成功交易{{ successCount || 0 }}笔,退款{{ refundCount || 0 }}笔 diff --git a/src/subpackage/order/components/search_bar.vue b/src/subpackage/order/components/search_bar.vue new file mode 100644 index 0000000..b431404 --- /dev/null +++ b/src/subpackage/order/components/search_bar.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js index 69aac1c..08aa0ac 100644 --- a/src/subpackage/order/js/api.js +++ b/src/subpackage/order/js/api.js @@ -49,6 +49,13 @@ export const ORDER_API = { userValueCardRefundFixed:`${ORIGIN}/admin/userValueCard/refundFixed`, // 储值卡订单-退款 orderRefund:`${ORIGIN}/admin/stadium/order/refund`, // A订单管理-场馆预订订单-订单退款 (零售订单、场地、次卡) userMonthlyCardRefundFixed:`${ORIGIN}/admin/userMonthlyCard/refundFixed`, // 年月卡订单-订单退款 + + // 20250318 tid1929 订场卡 + cardOrderList:`${ORIGIN}/admin/venue/number/card/order/list`, // 订场卡订单 - 列表 + cardOrderGet:`${ORIGIN}/admin/venue/number/card/order/get`, // 订场卡订单 - 详情 + cardOrderRefund:`${ORIGIN}/admin/venue/number/card/order/refund`, // 订场卡订单 - 退款 + cardSoldUsage:`${ORIGIN}/admin/venue/number/card/sold/usage`, // 已售订场卡 - 使用记录 + } export default ORDER_API; \ No newline at end of file diff --git a/src/subpackage/order/js/handle.js b/src/subpackage/order/js/handle.js new file mode 100644 index 0000000..84e441c --- /dev/null +++ b/src/subpackage/order/js/handle.js @@ -0,0 +1,18 @@ +import { formatDate } from '@/utils/util'; + +// 初始化默认时间 +export function initPeriod({ beforeDays, afterDays }) { + let _dateTimeStemp = new Date().getTime(); + let _daysTimeStemp = (beforeDays || afterDays || 0) * 24 * 60 * 60 * 1000; + let _curDate = formatDate({}); + if (beforeDays) return { + start: formatDate({ date: _dateTimeStemp - _daysTimeStemp }), + end: _curDate + } + if (afterDays) return { + start: _curDate, + end: formatDate({ date: _dateTimeStemp + _daysTimeStemp }) + } + return {}; + +} \ No newline at end of file diff --git a/src/subpackage/order/pages/booking_card/modules/refund_modal.vue b/src/subpackage/order/pages/booking_card/modules/refund_modal.vue new file mode 100644 index 0000000..abea108 --- /dev/null +++ b/src/subpackage/order/pages/booking_card/modules/refund_modal.vue @@ -0,0 +1,261 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/booking_card/modules/time_zone.vue b/src/subpackage/order/pages/booking_card/modules/time_zone.vue new file mode 100644 index 0000000..d89a2e5 --- /dev/null +++ b/src/subpackage/order/pages/booking_card/modules/time_zone.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/booking_card/order_info.vue b/src/subpackage/order/pages/booking_card/order_info.vue index fae2e24..e049eac 100644 --- a/src/subpackage/order/pages/booking_card/order_info.vue +++ b/src/subpackage/order/pages/booking_card/order_info.vue @@ -2,8 +2,8 @@ - - {{ 'stadiumName' || '-' }} + + {{ extension.stadium_name || '-' }} @@ -11,8 +11,8 @@ {{ orderInfo.created_at || '-' }} @@ -23,12 +23,12 @@ 订场卡信息 - 使用记录 + 使用记录 - {{ orderInfo.created_at || '-' }} - {{ orderInfo.mobile || '-' }} - {{ orderInfo.nickname || '-' }} + {{ orderInfo.card_info_name || '-' }} + {{ orderInfo.user_card_no || '-' }} + {{ orderInfo.source || '-' }} ¥{{ orderInfo.amount || '0' }} @@ -45,13 +45,24 @@ 支付信息 - 支付方式支付方式支付方式支付方式支付方式支付方式支付方式支付方式支付方式 - {{ orderInfo.mobile || '-' }} - {{ orderInfo.nickname || '-' }} + {{ orderInfo.pay_type_text || '-' }} + {{ orderInfo.pay_time || '-' }} + {{ orderInfo.trade_no || '-' }} + + + + + - + 退款 @@ -63,8 +74,12 @@ \ No newline at end of file diff --git a/src/subpackage/order/pages/booking_card/use_record.vue b/src/subpackage/order/pages/booking_card/use_record.vue index e69de29..41d71c1 100644 --- a/src/subpackage/order/pages/booking_card/use_record.vue +++ b/src/subpackage/order/pages/booking_card/use_record.vue @@ -0,0 +1,191 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/timekeeping/modules/order_search/search_bar.vue b/src/subpackage/order/pages/timekeeping/modules/order_search/search_bar.vue index 2b11c53..5c274fa 100644 --- a/src/subpackage/order/pages/timekeeping/modules/order_search/search_bar.vue +++ b/src/subpackage/order/pages/timekeeping/modules/order_search/search_bar.vue @@ -2,7 +2,7 @@ - +