diff --git a/src/components/order_list/a_header/a_header.vue b/src/components/order_list/a_header/a_header.vue
index ff6efc7..911878c 100644
--- a/src/components/order_list/a_header/a_header.vue
+++ b/src/components/order_list/a_header/a_header.vue
@@ -1,7 +1,11 @@
@@ -17,19 +21,28 @@ export default {
.header-container{
padding: 30upx 0;
border-bottom: 2upx solid #D8D8D8;
- @include centerFlex(space-between);
- .hc-view{
- font-size: 28upx;
- line-height: 40upx;
- &:first-child{
- font-weight: 500;
- color: #1a1a1a;
- }
- &+.hc-view{
- flex-shrink: 0;
- margin-left: 10upx;
- color: $themeColor;
+ .hc-bar{
+ @include centerFlex(space-between);
+ .hc-view{
+ font-size: 28upx;
+ line-height: 40upx;
+ &:first-child{
+ font-weight: 500;
+ color: #1a1a1a;
+ }
+ &+.hc-view{
+ flex-shrink: 0;
+ margin-left: 10upx;
+ color: $themeColor;
+ }
}
+
+ }
+ .hc-line{
+ margin-top: 12upx;
+ font-size: 24upx;
+ line-height: 34upx;
+ color: #9A9A9D;
}
}
\ No newline at end of file
diff --git a/src/components/order_list/curriculum/curriculum.vue b/src/components/order_list/curriculum/curriculum.vue
index b1febde..f155c20 100644
--- a/src/components/order_list/curriculum/curriculum.vue
+++ b/src/components/order_list/curriculum/curriculum.vue
@@ -1,8 +1,15 @@
-
+
+ 下单时间:2021-07-01 15:25:25
+
-
+
+ 订单编号:
+
+
+
+ 支付金额:¥24
@@ -22,10 +29,24 @@ export default {
@import '~style/public.scss';
.value-card-container{
background-color: #fff;
- padding: 0 20upx;
+ padding: 0 20upx 20upx;
border-radius: 10upx;
.vcc-info{
- padding: 20upx 0;
+ padding-top: 20upx;
+ }
+ }
+ .vcc-total{
+ padding: 10upx 0;
+ @include centerFlex(flex-end);
+ .vt-view{
+ font-weight: 500;
+ font-size: 28upx;
+ color: #333;
+ @include textHide(1);
+ .vv-text{
+ font-weight: 400;
+ color: #9A9A9D;
+ }
}
}
\ No newline at end of file
diff --git a/src/components/order_list/spectacular_monent/spectacular_monent.vue b/src/components/order_list/spectacular_monent/spectacular_monent.vue
index 852bda8..1fa009b 100644
--- a/src/components/order_list/spectacular_monent/spectacular_monent.vue
+++ b/src/components/order_list/spectacular_monent/spectacular_monent.vue
@@ -1,13 +1,55 @@
- 23
+
+
+ 购买时间:2021-07-01 15:25:25
+
+
+
+ 订单编号:
+
+
+ 类型:
+
+
+
+ 支付金额:¥24
+
+
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 116db35..ebce81d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -385,6 +385,17 @@
}
}
]
+ },
+ {
+ "root": "subpackage/order",
+ "pages": [
+ {
+ "path": "pages/value_card/value_card",
+ "style" : {
+ "navigationBarTitleText": "储值卡详情"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 3d0c7ea..d8d4387 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -48,13 +48,15 @@
-
+
-
-
+
+
+
+
+
-
@@ -105,11 +107,12 @@
import reservation_order from '../../components/reservation_order/reservation_order';
import integral_order from '../../components/integral_order/integral_order';
import membership_order from '../../components/membership_order/membership_order';
- import timing_order from '../../components/timing_order/timing_order.vue'
- import organize_order from '../../components/organize_order/organize_order.vue'
+ import timing_order from '../../components/timing_order/timing_order.vue';
+ import organize_order from '../../components/organize_order/organize_order.vue';
// 20210910 新增订单模块
- import spectacular_monent from '../../components/order_list/spectacular_monent/spectacular_monent.vue'
- import value_card from '../../components/order_list/value_card/value_card.vue'
+ import spectacular_monent from '../../components/order_list/spectacular_monent/spectacular_monent.vue';
+ import value_card from '../../components/order_list/value_card/value_card.vue';
+ import curriculum from '../../components/order_list/curriculum/curriculum.vue';
import util from '../../utils/util';
import { servers } from '../../js/server';
@@ -127,6 +130,7 @@
'organize-order': organize_order,
'spectacular-monent': spectacular_monent,
'value-card': value_card,
+ 'curriculum': curriculum,
},
computed:{
isStoreInfo(){
diff --git a/src/subpackage/order/pages/value_card/value_card.vue b/src/subpackage/order/pages/value_card/value_card.vue
new file mode 100644
index 0000000..c46adfd
--- /dev/null
+++ b/src/subpackage/order/pages/value_card/value_card.vue
@@ -0,0 +1,170 @@
+
+
+
+
+ 储值卡信息
+
+ 微信昵称:
+
+
+ 储值卡名称:
+
+
+ 卡类型:
+
+
+ 有效期:
+
+
+
+
+ 购卡记录
+ 升级 2020-05-23 13:25
+
+ 名称:
+
+
+ 面值:
+
+
+ 售价:
+
+
+ 支付金额:
+
+
+ 赠送金额:
+
+
+ 途径:
+
+
+
+
+ 升级 2020-05-23 13:25
+
+ 名称:
+
+
+ 面值:
+
+
+ 售价:
+
+
+ 支付金额:
+
+
+ 赠送金额:
+
+
+ 途径:
+
+
+
+
+
+
+
+
\ No newline at end of file