From 5a9818ad8c4428df03e30856f0cd028054002ed7 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 25 Oct 2021 18:00:45 +0800
Subject: [PATCH] add ym card order

---
 src/components/order_list/ym_card/ym_card.vue      |  45 ++++++
 src/pages.json                                     |   6 +
 src/pages/order_list/order_list.vue                |  10 +-
 .../order/pages/order_manage/order_manage.vue      |   3 +-
 .../order/pages/ym_card/detail/detail.vue          | 165 +++++++++++++++++++++
 .../order/static/images/order_manage/order_18.png  | Bin 0 -> 409 bytes
 6 files changed, 223 insertions(+), 6 deletions(-)
 create mode 100644 src/components/order_list/ym_card/ym_card.vue
 create mode 100644 src/subpackage/order/pages/ym_card/detail/detail.vue
 create mode 100644 src/subpackage/order/static/images/order_manage/order_18.png

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 @@
+<template>
+    <view class="ym-card-container" @click="toInfo">
+        <a-header :source="'nnnnaaaaammmmeeee' || '-'" :status="'ssttaattuuss'"></a-header>
+        <view class="ycc-info">
+            <a-line :value="'年卡' || '-'">
+                <block slot="name">卡名称：</block> 
+            </a-line>
+            <a-line :value="'20195171564566' || '-'">
+                <block slot="name">年月卡号：</block> 
+            </a-line>
+            <a-line :value="'18316553478' || '-'">
+                <block slot="name">手机号码：</block> 
+            </a-line>
+            <a-line :value="'至2022.08.28' || '-'">
+                <block slot="name">有效期：</block> 
+            </a-line>
+        </view>
+    </view>
+</template>
+
+<script>
+import util from '../../../utils/util';
+import a_header from '../a_header/a_header.vue';
+import a_line from '../a_line/a_line.vue';
+export default {
+    components: {
+        'a-header': a_header,
+        'a-line': a_line,
+    },
+    methods: {
+        toInfo(){
+            util.routeTo(`/subpackage/order/pages/ym_card/detail/detail`, 'nT');
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .ym-card-container{
+        background-color: #fff;
+        padding: 0 20upx 20upx;
+        border-radius: 10upx;
+    }
+</style>
\ 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 @@
                 <competition :order-info="e" v-if="orderType == 14"></competition>
                 <mall v-if="orderType == 2" :order-info="e"></mall>
                 <rent-and-sale v-if="orderType == 8" :order-info="e"></rent-and-sale>
-            </view>
-            <!-- <view class="ool-item">
-                <mall></mall>
+                
             </view>
             <view class="ool-item">
-                <rent-and-sale></rent-and-sale>
-            </view> -->
+                <ym-card></ym-card>
+            </view>
             
       </view>
       <!-- 分类tab -->
@@ -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 @@
+<template>
+    <view class="ym-card-info">
+        <view class="yci-main">
+            <view class="yci-box ym-card-info">
+                <view class="yci-stadium-name">欧轩智能场馆(羽毛球永泰店)</view>
+                <view class="yci-line">
+                    <view>年月卡名称：年卡</view>
+                    <view>年月卡卡号：124646</view>
+                    <view>有效期：至2022.08.28</view>
+                </view>
+                <view class="yci-btn">
+                    <view>使用记录</view>
+                </view>
+            </view>
+            
+            <view class="yci-box ym-user">
+                <view class="yci-tit">持卡人信息</view>
+                <a-line :value="'18316567789' || '-'">
+                    <block slot="name">手机号码：</block> 
+                </a-line>
+                <a-line :value="'yiming' || '-'">
+                    <block slot="name">用户昵称：</block> 
+                </a-line>
+                <view class="yu-line">照片：<text>更改照片</text></view>
+                <image class="yu-img"></image>
+            </view>
+
+            <view class="yci-box yci-buy-info">
+                <view class="yci-tit">购卡信息</view>
+                <view class="ybi-name">年月卡名称：年卡</view>
+                <s-line :keyname="'金额小计'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <view class="ybi-total"><text>合计支付：</text>￥5</view>
+            </view>
+
+            <view class="yci-pay-info">
+                <view class="yci-tit">支付信息</view>
+                <p-line :keyname="'订单编号：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'支付方式：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'支付时间：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'微信交易号：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'创建途径：'" :value="orderInfo.created_at || '-'" ></p-line>
+            </view>
+
+        </view>
+    </view>
+</template>
+
+<script>
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+export default {
+    components: {
+        'a-line': a_line,
+        's-line': s_line,
+        'p-line': p_line,
+        
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .ym-card-info{
+        
+    }
+    .yci-box{
+        padding: 30upx;
+        margin-bottom: 24upx;
+        border-radius: 10upx;
+        background-color: #fff;
+    }
+    .yci-tit{
+        margin-bottom: 20upx;
+        line-height: 40upx;
+        font-size: 28upx;
+        color: #9C9C9F;
+    }
+    .yci-main{
+        padding: 24upx;
+        .ym-card-info{
+            .yci-stadium-name{
+                margin-bottom: 22upx;
+                padding-bottom: 26upx;
+                line-height: 40upx;
+                font-size: 28upx;
+                font-weight: 500;
+                border-bottom: 2upx solid #D8D8D8;
+                @include textHide(1);
+            }
+            .yci-line{
+                margin-bottom: 32upx;
+                >view{
+                    line-height: 48upx;
+                    font-size: 28upx;
+                    color: #333;
+                    @include textHide(1);
+                }
+            }
+            .yci-btn{
+                @include centerFlex(flex-end);
+                >view{
+                    width: 176upx;
+                    line-height: 80upx;
+                    text-align: center;
+                    border-radius: 10upx;
+                    border: 2upx solid #9A9A9D;
+                    font-size: 32upx;
+                    color: #9A9A9D;
+                }
+            }
+        }
+        .ym-user{
+            .yu-line{
+                margin-bottom: 16upx;
+                font-size: 28upx;
+                line-height: 52upx;
+                color: #9a9a9d;
+                >text{
+                    color: $themeColor;
+                    text-decoration: underline;
+                }
+            }
+            .yu-img{
+                display: block;
+                width: 218upx;
+                height: 218upx;
+                border-radius: 10upx;
+                background-color: skyblue;
+
+            }
+        }
+        .yci-buy-info{
+            .ybi-name{
+                margin-bottom: 22upx;
+                padding-bottom: 30upx;
+                font-size: 28upx;
+                line-height: 40upx;
+                color: #1a1a1a;
+                border-bottom: 2upx solid #D8D8D8;
+
+            }
+            .ybi-total{
+                text-align: right;
+                font-size: 28upx;
+                font-weight: 500;
+                line-height: 40upx;
+                color: #333;
+                @include textHide(1);
+                >text{
+                    color: #9A9A9D;
+                }
+            }
+        }
+    }
+    
+</style>
\ 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 0000000000000000000000000000000000000000..c4c174c79ccd552fc15168ba849bac0dbce619ab
GIT binary patch
literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbVv;urWT!Hk=nKP$PpFVBcv>7vI
z0NFqi2!J9$0O3N|Vwp2#fvR~+g8YIRIKNh3yesbeYKdyf?o;QoV;LA21wCCHLo80e
zowAYZkONO!b$3%R*CXZ~<*zjOntpIK1#D0_r&r6tUM_y{sCvOS!I&r(*Ux(M_MYaP
z-p0(%{!!hzpa0UG`QD4-r*-W-aPi!>^IPu;+a*j+Ybo#j;Z}byVLtczgu<X_Yc|CN
z?KAvvx<*htE{cz@__4s&!WP!Y9NfnuWxS6?>PWap?2~?Y&Cr*<SWrJ8`w<TV|9qh%
zpX5Zhty|gN-fv<XuI0R#yJAO>0Z*c$W#UQ`FTeA0Qr?%-H8d>u&$#sb%+zDKi8E%t
zQoVlH<+{*%6Jr;B9;qL)iv>lbve+XIJzHESQ5e$x;mYmDQ#;e{9G%$7@K2?Z&pWj#
rpP{n8Wqbdg-AuFfH<<qy`oiK_;wiA&tLiy0)EGQn{an^LB{Ts5JyEGm

literal 0
HcmV?d00001