diff --git a/src/components/order_list/a_line/a_line.vue b/src/components/order_list/a_line/a_line.vue index 9a25563..53900c3 100644 --- a/src/components/order_list/a_line/a_line.vue +++ b/src/components/order_list/a_line/a_line.vue @@ -3,9 +3,9 @@ - {{ e || '-' }} + {{ e || '-' }} - {{ value || '-' }} + {{ value || '-' }} @@ -13,15 +13,24 @@ diff --git a/src/js/api.js b/src/js/api.js index c52c467..5c6fe85 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -32,6 +32,7 @@ export const API = { // 20210916 订单列表接口 venueCourseOrderList: `${ORIGIN}/admin/venueCourse/orderList`, // 课程订单 - 列表 + userValueCardList: `${ORIGIN}/admin/userValueCard/list`, // 用户储值卡-扣费_copy // 营业额统计 diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index c8d2ad7..7580fa2 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -52,6 +52,7 @@ + @@ -201,7 +204,7 @@ - + @@ -221,9 +224,46 @@ diff --git a/src/subpackage/order/pages/value_card/xpense_tracker/xpense_tracker.vue b/src/subpackage/order/pages/value_card/xpense_tracker/xpense_tracker.vue index f709ab2..2ab5fd7 100644 --- a/src/subpackage/order/pages/value_card/xpense_tracker/xpense_tracker.vue +++ b/src/subpackage/order/pages/value_card/xpense_tracker/xpense_tracker.vue @@ -2,35 +2,35 @@ 日期 - + - + - + - - 广州欧轩智能羽毛球馆(永泰店) - + + {{ e.brand_or_stadium.name || '-' }} + - 12月7日 13:25 + {{ e.created_at || '-' }} - 消费-预订场地 - -100 + {{ e.desc || '-' }} + {{ e.amount || '-' }} - - yiming + + {{ e.operator || '-' }} - 余额 10000.09 + 余额 {{ e.balance || '-' }} @@ -40,8 +40,47 @@ @@ -87,7 +126,6 @@ export default { >image{ width: 52upx; height: 52upx; - background-color: skyblue; } } .xt-list{ @@ -108,7 +146,6 @@ export default { margin-right: 24upx; width: 60upx; height: 60upx; - background-color: skyblue; } >view{ flex-grow: 1; @@ -121,7 +158,6 @@ export default { flex-shrink: 0; width: 32upx; height: 32upx; - background-color: skyblue; } } .xh-time{ @@ -161,7 +197,6 @@ export default { margin-right: 8upx; width: 28upx; height: 28upx; - background-color: skyblue; } } &+view{ diff --git a/src/subpackage/order/static/images/value_card/arrow.png b/src/subpackage/order/static/images/value_card/arrow.png new file mode 100644 index 0000000..1ee4519 Binary files /dev/null and b/src/subpackage/order/static/images/value_card/arrow.png differ diff --git a/src/subpackage/order/static/images/value_card/failure.png b/src/subpackage/order/static/images/value_card/failure.png new file mode 100644 index 0000000..0d13c7e Binary files /dev/null and b/src/subpackage/order/static/images/value_card/failure.png differ diff --git a/src/subpackage/order/static/images/value_card/filtrate.png b/src/subpackage/order/static/images/value_card/filtrate.png new file mode 100644 index 0000000..f5679c4 Binary files /dev/null and b/src/subpackage/order/static/images/value_card/filtrate.png differ diff --git a/src/subpackage/order/static/images/value_card/personal_icon.png b/src/subpackage/order/static/images/value_card/personal_icon.png new file mode 100644 index 0000000..fab1432 Binary files /dev/null and b/src/subpackage/order/static/images/value_card/personal_icon.png differ diff --git a/src/subpackage/order/static/images/value_card/using.png b/src/subpackage/order/static/images/value_card/using.png new file mode 100644 index 0000000..b8a08ce Binary files /dev/null and b/src/subpackage/order/static/images/value_card/using.png differ