diff --git a/src/components/order_list/ym_card/ym_card.vue b/src/components/order_list/ym_card/ym_card.vue
new file mode 100644
index 0000000..95d5552
--- /dev/null
+++ b/src/components/order_list/ym_card/ym_card.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+ 卡名称:
+
+
+ 年月卡号:
+
+
+ 手机号码:
+
+
+ 有效期:
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 42816ea..f6463f6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -390,6 +390,12 @@
"root": "subpackage/order",
"pages": [
{
+ "path": "pages/ym_card/detail/detail",
+ "style" : {
+ "navigationBarTitleText": "年月卡详情"
+ }
+ },
+ {
"path": "pages/mall/refund_list/refund_list",
"style" : {
"navigationBarTitleText": "退款"
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index cc6bf85..18e294c 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -62,13 +62,11 @@
-
-
+
+
@@ -132,6 +130,7 @@
import mall from '../../components/order_list/mall/mall.vue';
import device from '../../components/order_list/device/device.vue'; // 售货柜/浴室/咖啡
import competition from '../../components/order_list/competition/competition.vue'; // 赛事
+ import ym_card from '../../components/order_list/ym_card/ym_card.vue'; // 年月卡
import util from '../../utils/util';
import { servers } from '../../js/server';
@@ -156,6 +155,7 @@
'mall': mall,
'device': device,
'competition': competition,
+ 'ym-card': ym_card,
},
computed:{
isStoreInfo(){
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index 7ddd02a..0a01d65 100644
--- a/src/subpackage/order/pages/order_manage/order_manage.vue
+++ b/src/subpackage/order/pages/order_manage/order_manage.vue
@@ -38,7 +38,7 @@ export default {
util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT');
},
isFinish(key){
- let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12 ];
+ let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12, 18 ];
return _endKeyArr.includes(key);
}
}
@@ -59,6 +59,7 @@ function getTabList(){
{ id: 2, name: '次卡订单', key: 2, iconName: 'order_2', orderType: 3 },
{ id: 3, name: '计时订单', key: 3, iconName: 'order_6', orderType: 1 },
{ id: 4, name: '储值卡订单', key: 4, iconName: 'order_1', orderType: 18 },
+ { id: 10, name: '年月卡订单', key: 18, iconName: 'order_18', orderType: 19 },
{ id: 5, name: '课程订单', key: 5, iconName: 'order_8', orderType: 12 },
{ id: 6, name: '赛事订单', key: 6, iconName: 'order_9', orderType: 14 },
{ id: 7, name: '约玩订单', key: 7, iconName: 'order_15', orderType: 10 },
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
new file mode 100644
index 0000000..608e350
--- /dev/null
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -0,0 +1,165 @@
+
+
+
+
+ 欧轩智能场馆(羽毛球永泰店)
+
+ 年月卡名称:年卡
+ 年月卡卡号:124646
+ 有效期:至2022.08.28
+
+
+ 使用记录
+
+
+
+
+ 持卡人信息
+
+ 手机号码:
+
+
+ 用户昵称:
+
+ 照片:更改照片
+
+
+
+
+ 购卡信息
+ 年月卡名称:年卡
+
+
+
+
+ 合计支付:¥5
+
+
+
+ 支付信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/order/static/images/order_manage/order_18.png b/src/subpackage/order/static/images/order_manage/order_18.png
new file mode 100644
index 0000000..c4c174c
Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_18.png differ