diff --git a/src/components/order_list/timing/site.vue b/src/components/order_list/timing/site.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages.json b/src/pages.json
index 4e3ef45..32d8d2f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -492,6 +492,12 @@
}
},
{
+ "path": "pages/timekeeping/order_list",
+ "style" : {
+ "navigationBarTitleText": "计时订单"
+ }
+ },
+ {
"path": "pages/stored_value_card/detail/detail",
"style" : {
"navigationBarTitleText": "储值卡订单详情"
diff --git a/src/subpackage/order/components/kv_line.vue b/src/subpackage/order/components/kv_line.vue
new file mode 100644
index 0000000..19b6a81
--- /dev/null
+++ b/src/subpackage/order/components/kv_line.vue
@@ -0,0 +1,27 @@
+
+
+ key:
+ value
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/order/components/order_list/filter_modal.vue b/src/subpackage/order/components/order_list/filter_modal.vue
index b11a8b7..7a85c34 100644
--- a/src/subpackage/order/components/order_list/filter_modal.vue
+++ b/src/subpackage/order/components/order_list/filter_modal.vue
@@ -1,6 +1,6 @@
-
-
+
+ false">
标题
8848
@@ -11,7 +11,19 @@
diff --git a/src/subpackage/order/components/order_list/header.vue b/src/subpackage/order/components/order_list/header.vue
index 4d7f21a..e4db694 100644
--- a/src/subpackage/order/components/order_list/header.vue
+++ b/src/subpackage/order/components/order_list/header.vue
@@ -1,14 +1,17 @@
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index 1c32702..2e1c109 100644
--- a/src/subpackage/order/pages/order_manage/order_manage.vue
+++ b/src/subpackage/order/pages/order_manage/order_manage.vue
@@ -57,7 +57,7 @@ function getTabList(){
tabArr: [
{ id: 1, name: '订场订单', key: 1, iconName: 'order_14', orderType: 3 },
{ id: 2, name: '次卡订单', key: 2, iconName: 'order_2', orderType: 3 },
- // { id: 3, name: '计时订单', key: 3, iconName: 'order_6', orderType: 1 },
+ { id: 3, name: '计时订单', key: 3, iconName: 'order_6', orderType: 1 },
{ id: 4, name: '储值卡订单', key: 4, iconName: 'order_1', orderType: 21 },
{ id: 10, name: '年月卡订单', key: 19, iconName: 'order_19', orderType: 20 },
{ id: 5, name: '课程订单', key: 5, iconName: 'order_8', orderType: 12 },
diff --git a/src/subpackage/order/pages/timekeeping/modules/person_list_item.vue b/src/subpackage/order/pages/timekeeping/modules/person_list_item.vue
new file mode 100644
index 0000000..8f043dd
--- /dev/null
+++ b/src/subpackage/order/pages/timekeeping/modules/person_list_item.vue
@@ -0,0 +1,105 @@
+
+
+
+
+ 欧轩智能场馆(永泰店)
+ 计费中
+
+
+
+ 订单编号:
+ qp20200150150245569
+
+
+
+
+
+ 项目类型:
+ 人时(1号门闸)
+
+
+ 计费时长:
+ 1小时58分46秒
+
+
+ 创建时间:
+ 2019-08-17 18:02:58
+
+
+
+ 结束计费
+
+
+ 支付金额¥240
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/order/pages/timekeeping/order_list.vue b/src/subpackage/order/pages/timekeeping/order_list.vue
new file mode 100644
index 0000000..3cd6b7b
--- /dev/null
+++ b/src/subpackage/order/pages/timekeeping/order_list.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file