From f5cdce240a8ff20b83e0001360753dabb81384ca Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 28 Sep 2021 18:00:27 +0800
Subject: [PATCH] add order

---
 src/js/api.js                                      |   4 +-
 src/pages.json                                     |  22 ++-
 src/subpackage/order/components/p_line/p_line.vue  |  56 +++++++
 .../order/pages/devices/detail/detail.vue          |  93 +++++++++++
 .../order/pages/display_cabinets/detail/detail.vue |  87 ----------
 .../order/pages/events/detail/detail.vue           | 177 +++++++++++++++++++++
 .../order/pages/events/member_info/member_info.vue |  68 ++++++++
 .../order/pages/events/member_list/member_list.vue |  95 +++++++++++
 8 files changed, 511 insertions(+), 91 deletions(-)
 create mode 100644 src/subpackage/order/components/p_line/p_line.vue
 create mode 100644 src/subpackage/order/pages/devices/detail/detail.vue
 delete mode 100644 src/subpackage/order/pages/display_cabinets/detail/detail.vue
 create mode 100644 src/subpackage/order/pages/events/detail/detail.vue
 create mode 100644 src/subpackage/order/pages/events/member_info/member_info.vue
 create mode 100644 src/subpackage/order/pages/events/member_list/member_list.vue

diff --git a/src/js/api.js b/src/js/api.js
index 05dec09..e01de78 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,6 +1,6 @@
-// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
 // export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
-export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
+// export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
 export const API = {
diff --git a/src/pages.json b/src/pages.json
index 72db8c9..88af8ec 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -390,15 +390,33 @@
 			"root": "subpackage/order",
 			"pages": [
 				{
+					"path": "pages/events/member_info/member_info",
+					"style" : {
+						"navigationBarTitleText": "查看成员" 
+					}
+				},
+				{
+					"path": "pages/events/member_list/member_list",
+					"style" : {
+						"navigationBarTitleText": "查看成员" 
+					}
+				},
+				{
+					"path": "pages/events/detail/detail",
+					"style" : {
+						"navigationBarTitleText": "赛事订单列表" 
+					}
+				},
+				{
 					"path": "pages/value_card/detail/detail",
 					"style" : {
 						"navigationBarTitleText": "储值卡详情" 
 					}
 				},
 				{
-					"path": "pages/display_cabinets/detail/detail",
+					"path": "pages/devices/detail/detail",
 					"style" : {
-						"navigationBarTitleText": "售货柜订单详情" 
+						"navigationBarTitleText": "订单详情" 
 					}
 				},
 				{
diff --git a/src/subpackage/order/components/p_line/p_line.vue b/src/subpackage/order/components/p_line/p_line.vue
new file mode 100644
index 0000000..5df4ef4
--- /dev/null
+++ b/src/subpackage/order/components/p_line/p_line.vue
@@ -0,0 +1,56 @@
+<template>
+    <view class="p-line">
+        <view class="pl-key">{{ keyname || '-' }}</view>
+        <view class="pl-value">{{ value || '-' }}</view>
+        <view class="pl-btn" v-if="isbtn">复制</view>
+    </view>
+</template>
+
+<script>
+export default {    
+    props: {
+        isbtn: {
+            default: false,
+            type: Boolean
+        },
+        keyname: {
+            default: '-',
+            type: String
+        },
+        value: {
+            default: '-',
+            type: String
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .p-line{
+        display: flex;
+        align-items: flex-start;
+        .pl-key{
+            flex-shrink: 0;
+            width: 160upx;
+            flex-grow: 0;
+            line-height: 52upx;
+            font-size: 28upx;
+            color: #9A9A9D;
+        }
+        .pl-value{
+            line-height: 52upx;
+            font-size: 28upx;
+            color: #333333;
+            word-break: break-all;
+        }
+        .pl-btn{
+            margin-left: 20upx;
+            flex-shrink: 0;
+            line-height: 52upx;
+            font-size: 28upx;
+            color: $themeColor;
+        }
+
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/devices/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue
new file mode 100644
index 0000000..f0bf994
--- /dev/null
+++ b/src/subpackage/order/pages/devices/detail/detail.vue
@@ -0,0 +1,93 @@
+<template>
+    <!-- 售货柜/浴室/咖啡订单详情 -->
+    <view class="display_cabinets_detail">
+        <o-header></o-header>
+        <view class="rent-info dcd-box">
+            <view class="dc-tit">商品详情</view>
+            <a-line :value="'豆奶' || '-'">
+                <block slot="name">产品名称：</block> 
+            </a-line>
+            <a-line :value="'250ml' || '-'">
+                <block slot="name">规格：</block> 
+            </a-line>
+            <a-line :value="'1' || '-'">
+                <block slot="name">数量：</block> 
+            </a-line>
+            <a-line :value="'￥2' || '-'">
+                <block slot="name">价格：</block> 
+            </a-line>
+            <view class="ri-line"></view>
+            <view class="ri-price">
+                <s-line :keyname="'积分抵扣'" :value="'¥6'"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'¥6'"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'¥6'"></s-line>
+                <view class="rp-total"><text>合计支付：</text>￥5</view>
+            </view>
+        </view>
+        <view class="dcd-box">
+            <view class="dc-tit">支付详情</view>
+            <p-line :keyname="'订单编号'" :value="'sc20 0822 0815 6894'" isbtn></p-line>
+            <p-line :keyname="'支付方式'" :value="'会员卡支付'"></p-line>
+            <p-line :keyname="'支付时间'" :value="'2020-08-22 10:12:25'"></p-line>
+            <p-line :keyname="'交易流水号'" :value="'202009181255364564612622'"></p-line>
+            <p-line :keyname="'退款单号'" :value="'tk20201112456556'"></p-line>
+            <p-line :keyname="'退款时间'" :value="'2020-08-22 08:12:25'"></p-line>
+        </view>
+    </view>
+</template>
+
+<script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import header from '../../../components/header/header.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+import util from '../../../../../utils/util';
+export default {
+    components: {
+        'a-line': a_line,
+        'o-header': header,
+        's-line': s_line,
+        'p-line': p_line,
+    },
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .dcd-box{
+        margin-bottom: 24upx;
+        padding: 30upx;
+        background-color: #fff;
+
+    }
+    .dc-tit{
+        margin-bottom: 20upx;
+        line-height: 44upx;
+        font-size: 32upx;
+        color: #333;
+    }
+    .rent-info{
+        .ri-line{
+            margin: 30upx 0;
+            height: 2upx;
+            background-color: #D8D8D8;
+        }
+        .ri-price{
+            .rp-total{
+                text-align: right;
+                line-height: 40upx;
+                font-weight: 500;
+                font-size: 28upx;
+                color: #333;
+                @include textHide(1);
+                >text{
+                    font-weight: 400;
+                    color: #9A9A9D;
+                }
+            }
+        }
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/display_cabinets/detail/detail.vue b/src/subpackage/order/pages/display_cabinets/detail/detail.vue
deleted file mode 100644
index c6a0ae9..0000000
--- a/src/subpackage/order/pages/display_cabinets/detail/detail.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-    <view class="display_cabinets_detail">
-        <o-header></o-header>
-        
-        <view class="rent-info dcd-box">
-            <view class="dc-tit">商品详情</view>
-            <a-line :value="'豆奶' || '-'">
-                <block slot="name">产品名称：</block> 
-            </a-line>
-            <a-line :value="'250ml' || '-'">
-                <block slot="name">规格：</block> 
-            </a-line>
-            <a-line :value="'1' || '-'">
-                <block slot="name">数量：</block> 
-            </a-line>
-            <a-line :value="'￥2' || '-'">
-                <block slot="name">价格：</block> 
-            </a-line>
-            <view class="ri-line"></view>
-            <view class="ri-price">
-                <s-line :keyname="'积分抵扣'" :value="'¥6'"></s-line>
-                <s-line :keyname="'折扣金额'" :value="'¥6'"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="'¥6'"></s-line>
-                <view class="rp-total"><text>合计支付：</text>￥5</view>
-            </view>
-        </view>
-
-        <view class="dcd-box">
-            <view class="dc-tit">支付详情</view>
-            
-        </view>
-    </view>
-</template>
-
-<script>
-import { ORDER_API } from '../../../js/api';
-import server from '../../../js/server';
-import a_line from '../../../../../components/order_list/a_line/a_line.vue';
-import header from '../../../components/header/header.vue';
-import s_line from '../../../components/s_line/s_line.vue';
-import util from '../../../../../utils/util';
-export default {
-    components: {
-        'a-line': a_line,
-        'o-header': header,
-        's-line': s_line,
-    },
-}
-</script>
-
-<style lang="scss">
-    @import '~style/public.scss';
-    .dcd-box{
-        margin-bottom: 24upx;
-        padding: 30upx;
-        background-color: #fff;
-
-    }
-    .dc-tit{
-        margin-bottom: 20upx;
-        line-height: 44upx;
-        font-size: 32upx;
-        color: #333;
-    }
-    .rent-info{
-        .ri-line{
-            margin: 30upx 0;
-            height: 2upx;
-            background-color: #D8D8D8;
-        }
-        .ri-price{
-            .rp-total{
-                text-align: right;
-                line-height: 40upx;
-                font-weight: 500;
-                font-size: 28upx;
-                color: #333;
-                @include textHide(1);
-                >text{
-                    font-weight: 400;
-                    color: #9A9A9D;
-                }
-            }
-        }
-    }
-
-</style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/events/detail/detail.vue b/src/subpackage/order/pages/events/detail/detail.vue
new file mode 100644
index 0000000..e523fa9
--- /dev/null
+++ b/src/subpackage/order/pages/events/detail/detail.vue
@@ -0,0 +1,177 @@
+<template>
+    <view class="events-detail">
+        <o-header></o-header>
+        <!-- 个人 -->
+        <block v-if="false">
+            <view class="ed-type-box">
+                <view class="ed-tit">保险信息</view>
+                <a-line :value="'阿拉斯加山脉'">
+                    <block slot="name">姓名：</block> 
+                </a-line>
+                <a-line :value="'4409531656666'">
+                    <block slot="name">身份证号码：</block> 
+                </a-line>
+            </view>
+            <view class="ed-box">
+                <view class="ed-tit">参赛资料</view>
+                <a-line :value="'阿拉斯加山脉'">
+                    <block slot="name">姓名：</block> 
+                </a-line>
+                <a-line :value="'18316535485'">
+                    <block slot="name">手机号码：</block> 
+                </a-line>
+                <a-line :value="'男'">
+                    <block slot="name">性别：</block> 
+                </a-line>
+                <a-line :value="'60kg'">
+                    <block slot="name">体重：</block> 
+                </a-line>
+                <view class="ed-tit">资质证书</view>
+                <view class="ed-img-list">
+                    <image></image>
+                    <image></image>
+                    <image></image>
+                    <image></image>
+                    <image></image>
+                </view>
+            </view>
+        </block>
+
+        <!-- 团队 -->
+        <block>
+            <view class="ed-type-box">
+                <view class="ed-tit">团队负责人信息</view>
+                <a-line :value="'阿拉斯加山脉'">
+                    <block slot="name">姓名：</block> 
+                </a-line>
+                <a-line :value="'15440953165'">
+                    <block slot="name">手机号码：</block> 
+                </a-line>
+            </view>
+            <view class="ed-box">
+                <view class="ed-tit">赛事信息</view>
+                <s-line :keyname="'参赛成员'" :value="'已选参赛人员：6人'"></s-line>
+                <a-line :value="'白云冲锋队'">
+                    <block slot="name">团队名称：</block> 
+                </a-line>
+                <a-line :value="'待确认'" value-color="#ea5061">
+                    <block slot="name">参赛成员确认状态：</block> 
+                </a-line>
+                <view class="eb-btn">查看参赛成员</view>
+            </view>
+        </block>
+        <view class="ed-box">
+            <view class="ed-tit">赛事信息</view>
+            <a-line :value="'欧轩科技篮球赛事'">
+                <block slot="name">赛事名称：</block> 
+            </a-line>
+            <a-line :value="'个人赛'">
+                <block slot="name">赛事类型：</block> 
+            </a-line>
+            <a-line :value="'广州市白云区永泰路'">
+                <block slot="name">赛事地址：</block> 
+            </a-line>
+            <a-line :value="'2020/09/25 7:00  ~  2020/-9/25 15:00'">
+                <block slot="name">活动时间：</block> 
+            </a-line>
+            <a-line :value="'55/人'">
+                <block slot="name">活动费用：</block> 
+            </a-line>
+        </view>
+        
+        <view class="ed-box">
+            <view class="ed-tit">赛事信息</view>
+            <s-line :keyname="'金额小计'" :value="'¥99.99'"></s-line>
+            <s-line :keyname="'积分抵扣'" :value="'¥99.99'"></s-line>
+            <s-line :keyname="'折扣金额'" :value="'¥99.99'"></s-line>
+            <s-line :keyname="'优惠券优惠'" :value="'¥99.99'"></s-line>
+            <view class="total-line">
+                <text>合计支付：</text>￥98.99
+            </view>
+        </view>
+        <view class="ed-box">
+            <view class="ed-tit">支付详情</view>
+            <p-line :keyname="'订单编号'" :value="'sc20 0822 0815 6894'" isbtn></p-line>
+            <p-line :keyname="'支付方式'" :value="'微信支付'"></p-line>
+            <p-line :keyname="'支付时间'" :value="'2020-08-22 10:12:25'"></p-line>
+            <p-line :keyname="'交易流水号'" :value="'202009181255364564612622'"></p-line>
+            <p-line :keyname="'退款编号'" :value="'kc20201230181914997632'"></p-line>
+            <p-line :keyname="'退款时间'" :value="'2020-12-30 18:19:14'"></p-line>
+            <p-line :keyname="'退款金额'" :value="'￥2300'"></p-line>
+            <p-line :keyname="'退款原因'" :value="'自动退款，赛程报名人数未达到最低报名人数条件'"></p-line>
+        </view>
+    </view>
+</template>
+
+<script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import header from '../../../components/header/header.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+import util from '../../../../../utils/util';
+export default {
+    components: {
+        'a-line': a_line,
+        'o-header': header,
+        's-line': s_line,
+        'p-line': p_line,
+    },
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .ed-box{
+        margin-bottom: 24upx;
+        padding: 30upx;
+        background-color: #fff;
+    }
+    .ed-tit{
+        margin-bottom: 20upx;
+        font-size: 32upx;
+        line-height: 44upx;
+        color: #1a1a1a;
+    }
+    .total-line{
+        text-align: right;
+        font-size: 32upx;
+        font-weight: 500;
+        line-height: 52upx;
+        color: #1a1a1a;
+        @include textHide(1);
+        >text{
+            font-size: 28upx;
+            font-weight: 400;
+            color: #9a9a9d;
+        }
+    }
+    .ed-type-box{
+        padding: 30upx;
+        margin-bottom: 2upx;
+        background-color: #fff;
+    }
+    .ed-img-list{
+        display: flex;
+        flex-wrap: wrap;
+        align-content: flex-start;
+        image{
+            margin-right: 30upx;
+            margin-bottom: 30upx;
+            width: 180upx;
+            height: 180upx;
+            background-color: skyblue;
+        }
+    }
+    .eb-btn{
+        margin-top: 48upx;
+        line-height: 88upx;
+        text-align: center;
+        border-radius: 10upx;
+        font-size: 32upx;
+        background-color: $themeColor;
+        color: #fff;
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/events/member_info/member_info.vue b/src/subpackage/order/pages/events/member_info/member_info.vue
new file mode 100644
index 0000000..18699f2
--- /dev/null
+++ b/src/subpackage/order/pages/events/member_info/member_info.vue
@@ -0,0 +1,68 @@
+<template>
+    <view class="menber-info">
+        <view class="ed-type-box">
+            <view class="ed-tit">保险信息</view>
+            <a-line :value="'阿拉斯加山脉'">
+                <block slot="name">姓名：</block> 
+            </a-line>
+            <a-line :value="'4409531656666'">
+                <block slot="name">身份证号码：</block> 
+            </a-line>
+        </view>
+        <view class="ed-box">
+            <view class="ed-tit">参赛资料</view>
+            <a-line :value="'阿拉斯加山脉'">
+                <block slot="name">姓名：</block> 
+            </a-line>
+            <a-line :value="'18316535485'">
+                <block slot="name">手机号码：</block> 
+            </a-line>
+            <a-line :value="'男'">
+                <block slot="name">性别：</block> 
+            </a-line>
+            <a-line :value="'60kg'">
+                <block slot="name">体重：</block> 
+            </a-line>
+            <view class="ed-tit">资质证书</view>
+            <view class="ed-img-list">
+                <image></image>
+                <image></image>
+                <image></image>
+                <image></image>
+                <image></image>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import header from '../../../components/header/header.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+import util from '../../../../../utils/util';
+export default {
+    components: {
+        'a-line': a_line,
+        'o-header': header,
+        's-line': s_line,
+        'p-line': p_line,
+    },
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .ed-box{
+        margin-bottom: 24upx;
+        padding: 30upx;
+        background-color: #fff;
+    }
+    .ed-type-box{
+        padding: 30upx;
+        margin-bottom: 2upx;
+        background-color: #fff;
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/events/member_list/member_list.vue b/src/subpackage/order/pages/events/member_list/member_list.vue
new file mode 100644
index 0000000..ffd9ae8
--- /dev/null
+++ b/src/subpackage/order/pages/events/member_list/member_list.vue
@@ -0,0 +1,95 @@
+<template>
+    <view class="member-list">
+        <view class="ml-header">
+            <view class="mh-tit">团队名称：白云冲锋队</view>
+            <a-line :value="'待确认'" value-color="#ea5061">
+                <block slot="name">参赛成员确认状态：</block> 
+            </a-line>
+        </view>
+        <view class="ml-bar"><text>参赛成员</text>   <text>已选：</text>6人</view>
+        <view class="ml-list">
+            <view class="ml-item" v-for="i in 10" :key="i">
+                <view class="mi-name">成员1：林花花</view>
+                <view><text>已完善</text><image></image></view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+export default {
+    components: {
+        'a-line': a_line,
+    },
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .member-list{
+        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 */
+    }
+    .mh-tit{
+        margin-bottom: 10upx;
+        font-size: 32upx;
+        line-height: 44upx;
+        color: #333;
+    }
+    .ml-header{
+        padding: 30upx;
+        margin-bottom: 30upx;
+        background-color: #fff;
+    }
+    .ml-bar{
+        padding: 0 30upx;
+        line-height: 100upx;
+        margin-bottom: 2upx;
+        background-color: #fff;
+        font-size: 28upx;
+        color: $themeColor;
+        @include textHide(1);
+        >text{
+            &:first-child{
+                margin-right: 20upx;
+                font-size: 32upx;
+                font-weight: 500;
+                color: #333;
+            }
+            &+text{
+                color: #9a9a9d;
+            }
+        }
+    }
+    .ml-list{
+        .ml-item{
+            margin-bottom: 2upx;
+            padding: 0 34upx;
+            height: 136upx;            
+            background-color: #fff;
+            @include centerFlex(space-between);
+            >view{
+                &:first-child{
+                    font-size: 28upx;
+                    color: #333;
+                    @include textHide(1);
+                }
+                &+view{
+                    margin-left: 20upx;
+                    flex-shrink: 0;
+                    font-size: 28upx;
+                    color: #9a9a9d;
+                    image{
+                        margin-left: 24upx;
+                        vertical-align: middle;
+                        width: 24upx;
+                        height: 24upx;
+                        background-color: skyblue;
+                    }
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file