diff --git a/src/components/order_list/a_header/a_header.vue b/src/components/order_list/a_header/a_header.vue index 911878c..bc5e0df 100644 --- a/src/components/order_list/a_header/a_header.vue +++ b/src/components/order_list/a_header/a_header.vue @@ -1,8 +1,8 @@ @@ -38,6 +116,9 @@ export default { background-color: #fff; } .club-rental{ + padding-bottom: 0upx; + padding-bottom: calc( 0upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ + padding-bottom: calc( 0upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ .cr-header{ .ch-stadium{ @include centerFlex(flex-start); @@ -79,8 +160,71 @@ export default { } } } + .cr-tit{ + margin-bottom: 14upx; + line-height: 44upx; + font-size: 32upx; + color: #333; + } .cr-rent-info{ } + .cr-expense-info{ + .cei-line{ + margin-bottom: 26upx; + @include centerFlex(space-between); + >view{ + color: #1a1a1a; + @include textHide(1); + &:first-child{ + flex-shrink: 0; + font-size: 28upx; + } + &+view{ + font-size: 24upx; + } + } + } + .cei-total{ + text-align: right; + line-height: 40upx; + font-size: 28upx; + font-weight: 500; + color: #1a1a1a; + @include textHide(1); + >text{ + font-weight: 400; + color: #9a9a9d; + } + } + } + .cr-pay-info{ + .cpi-line{ + @include centerFlex(flex-start); + >view{ + font-size: 28upx; + line-height: 52upx; + color: #1a1a1a; + &:first-child{ + flex-shrink: 0; + width: 150upx; + color: #9A9A9D; + } + &+view{ + @include textHide(1); + } + } + } + } + .cr-btn{ + margin: 0 auto; + width: 702upx; + line-height: 112upx; + border-radius: 10upx; + text-align: center; + font-size: 32upx; + color: #fff; + background-color: $themeColor; + } } \ No newline at end of file diff --git a/src/subpackage/order/pages/curriculum/detail/detail.vue b/src/subpackage/order/pages/curriculum/detail/detail.vue index 0e7ed11..a47f18e 100644 --- a/src/subpackage/order/pages/curriculum/detail/detail.vue +++ b/src/subpackage/order/pages/curriculum/detail/detail.vue @@ -2,64 +2,64 @@ - 欧轩智能场馆(永泰店) - 进行中 + {{ orderInfo.source || '-' }} + {{ orderInfo.order_status_text || '-' }} - 手机号码:18316553478 - 用户昵称:yiming - 学员信息:梁小姐(女) + 手机号码:{{ orderInfo.student_phone || '-' }} + 用户昵称:{{ orderInfo.user_info&&orderInfo.user_info.user_nickname || '-' }} + 学员信息:{{ orderInfo.student_name || '-' }}({{ orderInfo.student_gender || '-' }}) 课程信息 - 课程名称:羽毛球杀球训练(私教课) - + 课程名称:{{ orderInfo.course_name || '-' }} + 课程类型: - + 课程价格: - + 总课时: - + 购买课时: - + 赠送课时: - + 课时时长: - + 课程价格: - + 上课教练: - + 课程内容: - + 上课是否需要场地: - 金额小计¥6 + 金额小计¥{{ orderInfo.amount || 0 }} - 积分抵扣¥6 + 积分抵扣¥{{ orderInfo.deduction_amount || 0 }} - 折扣金额-¥0 + 折扣金额¥{{ orderInfo.discount_amount || 0 }} - 优惠券优惠-¥1 + 优惠券优惠¥{{ orderInfo.coupons_amount || 0 }} - 合计支付:¥5 + 合计支付:¥{{ orderInfo.pay_amount || 0 }} @@ -67,28 +67,28 @@ 支付信息 - + 下单时间: - + 订单编号: - + 支付时间: - + 支付方式: - + 交易流水: - + 退款单号: - + 退款时间: - + 退款金额: @@ -98,9 +98,33 @@ diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue new file mode 100644 index 0000000..fcc9b24 --- /dev/null +++ b/src/subpackage/order/pages/order_manage/order_manage.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/static/images/order_manage/order_0.png b/src/subpackage/order/static/images/order_manage/order_0.png new file mode 100644 index 0000000..d2fe7af Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_0.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_1.png b/src/subpackage/order/static/images/order_manage/order_1.png new file mode 100644 index 0000000..063a900 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_1.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_10.png b/src/subpackage/order/static/images/order_manage/order_10.png new file mode 100644 index 0000000..2702a58 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_10.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_12.png b/src/subpackage/order/static/images/order_manage/order_12.png new file mode 100644 index 0000000..67d1e5b Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_12.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_13.png b/src/subpackage/order/static/images/order_manage/order_13.png new file mode 100644 index 0000000..7aeff47 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_13.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_14.png b/src/subpackage/order/static/images/order_manage/order_14.png new file mode 100644 index 0000000..054fe66 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_14.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_15.png b/src/subpackage/order/static/images/order_manage/order_15.png new file mode 100644 index 0000000..7e1bcf9 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_15.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_16.png b/src/subpackage/order/static/images/order_manage/order_16.png new file mode 100644 index 0000000..5e505ea Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_16.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_17.png b/src/subpackage/order/static/images/order_manage/order_17.png new file mode 100644 index 0000000..7f7c188 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_17.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_2.png b/src/subpackage/order/static/images/order_manage/order_2.png new file mode 100644 index 0000000..c49e233 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_2.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_3.png b/src/subpackage/order/static/images/order_manage/order_3.png new file mode 100644 index 0000000..a7a14c0 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_3.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_4.png b/src/subpackage/order/static/images/order_manage/order_4.png new file mode 100644 index 0000000..59b359b Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_4.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_5.png b/src/subpackage/order/static/images/order_manage/order_5.png new file mode 100644 index 0000000..8f61ebd Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_5.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_6.png b/src/subpackage/order/static/images/order_manage/order_6.png new file mode 100644 index 0000000..1f608ed Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_6.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_7.png b/src/subpackage/order/static/images/order_manage/order_7.png new file mode 100644 index 0000000..9c83b57 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_7.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_8.png b/src/subpackage/order/static/images/order_manage/order_8.png new file mode 100644 index 0000000..04c623f Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_8.png differ diff --git a/src/subpackage/order/static/images/order_manage/order_9.png b/src/subpackage/order/static/images/order_manage/order_9.png new file mode 100644 index 0000000..7bdd3a0 Binary files /dev/null and b/src/subpackage/order/static/images/order_manage/order_9.png differ