diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index b3f11b2..00ca434 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -40,6 +40,8 @@ export const ORDER_API = {
 	stadiumList: `${ORIGIN}/admin/stadium/list`,  //  店铺列表
 	billingOrderList: `${ORIGIN}/admin/stadium/billing/order/list`,  // 计时订单列表
 	billingOrderDetail: `${ORIGIN}/admin/stadium/billing/order/detail`,  // 散客计时订单详情
+	timeOrderEnd: `${ORIGIN}/admin/assistant/timeOrder/end`,            //k-订单管理-订单计时结束
+	timeOrderComplete:`${ORIGIN}/admin/assistant/timeOrder/complete`,  //【20220208】k-订单管理-计时订单完结
 }
 
 export default ORDER_API;
\ No newline at end of file
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue b/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue
index 7885cfd..214c9ab 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue
@@ -41,6 +41,9 @@
 </template>
 
 <script>
+import { ORDER_API } from '../../../../js/api';
+import server from '../../../../js/server';
+import { showLoad, hideLoad, formatDate, showNone } from '@/utils/util';
 export default {
     data(){
         return {
@@ -70,11 +73,50 @@ export default {
             this.initOptions = opts;
             this.show();
         },
-        confirmBtn(){
+        async confirmBtn(){
             let { end_type, amount, initOptions } = this;
-            initOptions?.success?.({ type: end_type, amount: +amount || 0 });
-            this.hide();
-        }
+            // initOptions?.success?.({ type: end_type, amount: +amount || 0 });
+            // this.hide();
+            try{
+                let { end_type, amount, initOptions } = this;
+                showLoad();
+                let _query = {
+                    brand_id: initOptions?.brand_id || '',
+                    order_no: initOptions?.order_no || '',
+                    end_type,
+                    pay_amount: +amount || 0
+                };
+                let _rRes = await this.cancelReq(_query);
+                hideLoad();
+                if(_rRes === 'end_success'){
+                    showNone('操作成功！');
+                    initOptions?.success?.(_query);
+                    this.hide();
+                }else{
+                    throw new Error(_rRes);
+                }
+                
+            }catch(err){
+                hideLoad();
+                showNone('操作失败！');
+                console.warn('end billing modal confirmBtn err -->', err);
+                initOptions?.fail?.(err);
+            }
+        },
+        cancelReq({
+            brand_id, order_no, pay_amount, end_type
+        }){
+            return server.get({
+			    url: ORDER_API.timeOrderEnd,
+			    data: { 
+                    brand_id, order_no, pay_amount, end_type
+				},
+			    failMsg: '加载失败！'
+			})
+			.then(res=>{
+                return 'end_success';
+			})
+        },
     }
 }
 </script>
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue
index 6f064f5..e41c60c 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue
@@ -4,6 +4,7 @@
         :status="order.status_text || ''"
         :price="order.pay_amount || ''"
         :price-show="true"
+        @click:item="toDetail"
     >
         <template v-slot:default>
             <view class="lc-info">
@@ -23,6 +24,7 @@
 <script>
 import kvLine from "../../../../components/kv_line.vue";
 import listItemTemp from "./item_temp.vue";
+import { routeTo } from '@/utils/util';
 export default {
     props: {
         order: {
@@ -33,6 +35,12 @@ export default {
     components: {
         'kv-line': kvLine,
         'list-item-temp': listItemTemp
+    },
+    methods: {
+        toDetail(){
+            let { order } = this;
+            routeTo(`/subpackage/order/pages/timekeeping/order_detail/deposit?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}`, 'nT');
+        }
     }
 }
 </script>
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/person.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/person.vue
index 76e0602..c1e25a0 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/person.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/person.vue
@@ -24,7 +24,7 @@
         </template>
         <template v-slot:bottom v-if="order.status_text === '计费中'">
             <view class="lc-btns">
-                <view class="lb-item">结束计费</view>
+                <view class="lb-item" @click.stop="endBilling">结束计费</view>
             </view>
         </template>
     </list-item-temp>
@@ -49,6 +49,10 @@ export default {
         toDetail(){
             let { order } = this;
             routeTo(`/subpackage/order/pages/timekeeping/order_detail/person?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}`, 'nT');
+        },
+        endBilling(){
+            let { order } = this;
+            routeTo(`/subpackage/order/pages/timekeeping/order_detail/person?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}&is_end=1`, 'nT');
         }
     }
 }
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
index 0443607..aad4d99 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
@@ -5,6 +5,7 @@
         :price="order.pay_amount || ''"
         :status-active="['待支付', '计费中','待使用', '使用中'].includes(order.status_text)"
         :price-show="['待支付', '待使用', '使用中', '已完成', '已失效', '已退款'].includes(order.status_text)"
+        @click:item="toDetail"
     >
         <template v-slot:default>
             <view class="lc-info">
@@ -35,6 +36,7 @@
 <script>
 import kvLine from "../../../../components/kv_line.vue";
 import listItemTemp from "./item_temp.vue";
+import { routeTo } from '@/utils/util';
 export default {
     props: {
         order: {
@@ -45,6 +47,16 @@ export default {
     components: {
         'kv-line': kvLine,
         'list-item-temp': listItemTemp
+    },
+    methods: {
+        toDetail(){
+            let { order } = this;
+            routeTo(`/subpackage/order/pages/timekeeping/order_detail/site?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}`, 'nT');
+        },
+        endBilling(){
+            let { order } = this;
+            routeTo(`/subpackage/order/pages/timekeeping/order_detail/site?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}&is_end=1`, 'nT');
+        }
     }
 }
 </script>
diff --git a/src/subpackage/order/pages/timekeeping/order_detail/deposit.vue b/src/subpackage/order/pages/timekeeping/order_detail/deposit.vue
index 5d82864..fed44ec 100644
--- a/src/subpackage/order/pages/timekeeping/order_detail/deposit.vue
+++ b/src/subpackage/order/pages/timekeeping/order_detail/deposit.vue
@@ -1,65 +1,68 @@
 <template>
     <view class="deposit-order-detail">
-        <header-temp>
+        <header-temp
+            :stadium-name="orderInfo.stadium_name"
+            :stadium-logo="orderInfo.stadium_logo"
+        >
             <kv-line label="订单编号：">
-                <template v-slot:default>qp20200150150245569qp20200150150245569qp20200150150245569</template>
+                <template v-slot:default>{{ orderInfo.order_no || '-' }}</template>
                 <template v-slot:right>
-                    <text class="dod-status">已完成</text>
+                    <text class="dod-status">{{ orderInfo.status_text || '-' }}</text>
                 </template>
             </kv-line>
-            <kv-line label="创建时间：">2019-08-17 18:02:58</kv-line>
-            <kv-line label="手机号码：">18316553478</kv-line>
-            <kv-line label="用户昵称：">i术生</kv-line>
-            <kv-line label="订单来源：">占用分享(张三)</kv-line>
-            <kv-line label="订单备注：">订单备注</kv-line>
+            <kv-line label="创建时间：">{{ orderInfo.created_at || '-' }}</kv-line>
+            <kv-line label="手机号码：">{{ orderInfo.mobile || '-' }}</kv-line>
+            <kv-line label="用户昵称：">{{ orderInfo.nickname || '-' }}</kv-line>
+            <kv-line label="订单来源：">{{ orderInfo.source || '-' }}</kv-line>
+            <kv-line label="订单备注：">{{ orderInfo.desc || '-' }}</kv-line>
         </header-temp>
 
         <view class="od-margin"></view>
-        <info-temp title="场地计时信息">
-            <kv-line label="项目类型：">茶室(1号茶室)</kv-line>
-            <kv-line label="进场时间：">2020-01-10 15:02:24</kv-line>
-            <kv-line label="离场时间：">现场扫码结算</kv-line>
-            <kv-line label="时长合计：">00小时00分00秒</kv-line>
+        <info-temp title="订单信息">
+            <kv-line label="项目类型：">{{ orderInfo.project_type_name || '-' }}</kv-line>
+            <kv-line label="押金金额：">{{ orderInfo.amount || '0' }}</kv-line>
 
             <view class="od-pay-info">
-                <kvs-line label="金额小计">¥10.5</kvs-line>
-                <kvs-line label="折扣金额">-¥0</kvs-line>
-                <kvs-line label="积分抵扣">-¥0</kvs-line>
-                <kvs-line label="优惠券优惠">-¥1</kvs-line>
+                <kvs-line label="金额小计">¥{{ orderInfo.amount || '0' }}</kvs-line>
+                <kvs-line label="折扣金额">-¥{{ orderInfo.discount_amount || '0' }}</kvs-line>
+                <kvs-line label="积分抵扣">-¥{{ orderInfo.deduction_amount || '0' }}</kvs-line>
+                <kvs-line label="优惠券优惠">-¥{{ orderInfo.coupons_amount || '0' }}</kvs-line>
             </view>
             <view class="od-total">
-                <text class="ot-name">合计支付：</text>￥9.5
+                <text class="ot-name">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}
             </view>
         </info-temp>
 
         <view class="od-margin"></view>
         <info-temp title="关联押金订单">
             <kv-line label="押金订单号：">
-                <template v-slot:default>qp20200150150245569</template>
+                <template v-slot:default>{{ link_order.order_no || '-' }}</template>
                 <template v-slot:right>
-                    <text class="od-check">查看押金订单</text>
+                    <text class="od-check" @click="toTimingOrder">查看计时订单</text>
                 </template>
             </kv-line>
-            <kv-line label="押金金额：">￥50</kv-line>
-            <kv-line label="订单状态：">已退款</kv-line>
+            <kv-line label="押金金额：">￥{{ orderInfo.amount || '-' }}</kv-line>
+            <kv-line label="订单状态：">{{ orderInfo.status_text || '-' }}</kv-line>
         </info-temp>
 
         <view class="od-margin"></view>
         <info-temp title="支付信息">
-            <kv-line label="支付方式：">微信支付</kv-line>
-            <kv-line label="支付时间：">2019-05-17 11:12:58</kv-line>
-            <kv-line label="交易流水：">4200225665566566565455</kv-line>
+            <kv-line label="支付方式：">{{ orderInfo.pay_type_text || '-' }}</kv-line>
+            <kv-line label="支付时间：">{{ orderInfo.pay_time || '-' }}</kv-line>
+            <kv-line label="交易流水：">{{ orderInfo.trade_no || '-' }}</kv-line>
         </info-temp>
 
-        <view class="od-margin"></view>
-        <info-temp title="退款信息2">
-            <kv-line label="退款金额：">￥998</kv-line>
-            <kv-line label="退款单号：">TF-20195171564566</kv-line>
-            <kv-line label="退款时间：">2019-05-17 11:12:58</kv-line>
-            <kv-line label="退款原因：">商家主动退款</kv-line>
-        </info-temp>
+        <block v-if="false">
+            <view class="od-margin"></view>
+            <info-temp title="退款信息2">
+                <kv-line label="退款金额：">￥998</kv-line>
+                <kv-line label="退款单号：">TF-20195171564566</kv-line>
+                <kv-line label="退款时间：">2019-05-17 11:12:58</kv-line>
+                <kv-line label="退款原因：">商家主动退款</kv-line>
+            </info-temp>
+        </block>
 
-        <bottom-fixed>
+        <bottom-fixed v-if="false">
             <fixed-button>退款</fixed-button>
         </bottom-fixed>
     </view>
@@ -72,6 +75,10 @@ import kvLine from "../../../components/kv_line.vue";
 import kvsLine from "../../../components/kvs_line.vue";
 import bottomFixed from "../modules/order_detail/bottom_fixed.vue";
 import fixedButton from "../modules/order_detail/fixed_button.vue";
+
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import { showLoad, hideLoad, formatDate, showNone, showModal, routeTo } from '@/utils/util';
 export default {
     components: {
         'header-temp': headerTemp,
@@ -80,6 +87,46 @@ export default {
         'kvs-line': kvsLine,
         'bottom-fixed': bottomFixed,
         'fixed-button': fixedButton,
+    },
+    computed: {
+        link_order(){
+            let { orderInfo } = this;
+            return orderInfo?.extension?.link_order || {};
+        }
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    },
+    async onLoad(options){
+        this.getOrderDetail({
+            brand_id: options?.brand_id || '',
+            order_no: options?.order_no || ''
+        })
+    },
+    methods: {
+        toTimingOrder(){
+            let { order, link_order } = this;
+            routeTo(`/subpackage/order/pages/timekeeping/order_detail/site?order_no=${link_order?.order_no || ''}&brand_id=${order?.brand_id || ''}`, 'rT');
+        },
+        getOrderDetail({ 
+            brand_id = '', order_no = ''
+        }){
+            showLoad();
+            return server.get({
+                url: ORDER_API.billingOrderDetail,
+                data: { 
+                    brand_id, order_no
+                },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                hideLoad();
+                this.orderInfo = res || {};
+                return res;
+            })
+        },
     }
 }
 </script>
diff --git a/src/subpackage/order/pages/timekeeping/order_detail/person.vue b/src/subpackage/order/pages/timekeeping/order_detail/person.vue
index d5fabaf..660c122 100644
--- a/src/subpackage/order/pages/timekeeping/order_detail/person.vue
+++ b/src/subpackage/order/pages/timekeeping/order_detail/person.vue
@@ -42,7 +42,7 @@
             <info-temp title="支付信息">
                 <kv-line label="支付方式：">{{ orderInfo.pay_type_text || '-' }}</kv-line>
                 <kv-line label="支付时间：">{{ orderInfo.pay_time || '-' }}</kv-line>
-                <kv-line label="微信交易号：">{{ orderInfo.trace_no || '-' }}</kv-line>
+                <kv-line label="微信交易号：">{{ orderInfo.trade_no || '-' }}</kv-line>
             </info-temp>
         </blcok>
 
@@ -58,7 +58,11 @@
 
         <view class="pod-margin"></view>
         <view class="pod-margin"></view>
-        <view class="pod-btn" v-if="false">完结订单</view>
+        <view 
+            class="pod-btn" 
+            v-if="orderInfo.status_text === '待支付'"
+            @click="finishOrder"
+        >完结订单</view>
         <view 
             class="pod-btn" 
             v-if="orderInfo.status_text === '计费中'"
@@ -68,7 +72,7 @@
         <!-- <view class="pod-fixed">
             <view class="pf-btn">取消预约</view>
         </view> -->
-        <bottom-fixed v-if="orderInfo.status_text === '已完成'">
+        <bottom-fixed v-if="false&&orderInfo.status_text === '已完成'">
             <fixed-button>退款</fixed-button>
         </bottom-fixed>
 
@@ -89,7 +93,7 @@ import fixedButton from "../modules/order_detail/fixed_button.vue";
 
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
-import { showLoad, hideLoad, formatDate, showNone } from '@/utils/util';
+import { showLoad, hideLoad, formatDate, showNone, showModal } from '@/utils/util';
 export default {
     components: {
         'header-temp': headerTemp,
@@ -105,10 +109,15 @@ export default {
             orderInfo: {}
         }
     },
-    onLoad(options){
+    async onLoad(options){
         this.getOrderDetail({
             brand_id: options?.brand_id || '',
             order_no: options?.order_no || ''
+        })
+        .then(res=>{
+            if(res?.status_text === '计费中'&&options?.is_end === '1'){
+                this.endOrder();
+            }
         });
     },
     methods: {
@@ -118,16 +127,69 @@ export default {
                 operator: orderInfo?.end_bill_operator_name,
                 duration: orderInfo?.extension?.duration,
                 amount: orderInfo?.amount,
+                brand_id: orderInfo?.brand_id,
+                order_no: orderInfo?.order_no,
                 success: res=>{
-                    console.log('endOrder res -->', res);
+                    setTimeout(()=>{
+                        this.getOrderDetail({
+                            brand_id: orderInfo?.brand_id,
+                            order_no: orderInfo?.order_no
+                        });
+                    }, 1000);
                 }
             });
         },
+        finishOrder(){
+            let { orderInfo } = this;
+            showModal({
+                title: '提示',
+                content: '是否确认完结订单？',
+                showCancel: true,
+                success: modalRes=>{
+                    if(modalRes.confirm)this.endOrderServer({
+                        brand_id: orderInfo?.brand_id || '',
+                        order_no: orderInfo?.order_no || '',
+                        stadium_id: orderInfo?.stadium_id || ''
+                    })
+                    .finally(res=>{
+                        setTimeout(()=>{
+                            this.getOrderDetail({
+                                brand_id: orderInfo?.brand_id,
+                                order_no: orderInfo?.order_no
+                            });
+                        }, 1000);
+                    });
+                }
+            })
+        },
+        endOrderServer({
+            brand_id, order_no, pay_amount, end_type
+        }){
+            showLoad();
+            return server.get({
+			    url: ORDER_API.timeOrderComplete,
+			    data: { 
+                    brand_id, order_no, pay_amount, end_type
+				},
+			    failMsg: '操作失败！'
+			})
+			.then(res=>{
+                hideLoad();
+                showNone('操作成功！');
+                return res;
+			})
+            .catch(err=>{
+                hideLoad();
+                showNone('操作失败！');
+                console.warn('end billing modal confirmBtn err -->', err);
+                return Promise.reject(err);
+            })
+        },
         getOrderDetail({ 
             brand_id = '', order_no = ''
         }){
             showLoad();
-            server.get({
+            return server.get({
                 url: ORDER_API.billingOrderDetail,
                 data: { 
                     brand_id, order_no
@@ -136,8 +198,8 @@ export default {
             })
             .then(res=>{
                 hideLoad();
-                console.log('person getOrderDetail -->', res);
                 this.orderInfo = res || {};
+                return res;
             })
         },
     }
diff --git a/src/subpackage/order/pages/timekeeping/order_detail/site.vue b/src/subpackage/order/pages/timekeeping/order_detail/site.vue
index 90a9564..6bbf555 100644
--- a/src/subpackage/order/pages/timekeeping/order_detail/site.vue
+++ b/src/subpackage/order/pages/timekeeping/order_detail/site.vue
@@ -1,71 +1,93 @@
 <template>
     <view class="site-order-detail">
-        <header-temp>
+        <header-temp
+            :stadium-name="orderInfo.stadium_name"
+            :stadium-logo="orderInfo.stadium_logo"
+        >
             <kv-line label="订单编号：">
-                <template v-slot:default>qp20200150150245569qp20200150150245569qp20200150150245569</template>
+                <template v-slot:default>{{ orderInfo.order_no || '-' }}</template>
                 <template v-slot:right>
-                    <text class="od-status">已完成</text>
+                    <text 
+                        class="od-status"
+                        :class="[ '待使用', '使用中', '待支付', '计费中' ].includes(orderInfo.status_text) ? 'active' : ''"
+                    >{{ orderInfo.status_text || '-' }}</text>
                 </template>
             </kv-line>
-            <kv-line label="创建时间：">2019-08-17 18:02:58</kv-line>
-            <kv-line label="手机号码：">18316553478</kv-line>
-            <kv-line label="用户昵称：">i术生</kv-line>
+            <kv-line label="创建时间：">{{ orderInfo.created_at || '-' }}</kv-line>
+            <kv-line label="手机号码：">{{ orderInfo.mobile || '-' }}</kv-line>
+            <kv-line label="用户昵称：">{{ orderInfo.nickname || '-' }}</kv-line>
         </header-temp>
 
         <view class="od-margin"></view>
         <info-temp title="场地计时信息">
-            <kv-line label="项目类型：">茶室(1号茶室)</kv-line>
-            <kv-line label="进场时间：">2020-01-10 15:02:24</kv-line>
-            <kv-line label="离场时间：">现场扫码结算</kv-line>
-            <kv-line label="时长合计：">00小时00分00秒</kv-line>
-
-            <view class="od-pay-info">
-                <kvs-line label="金额小计">¥10.5</kvs-line>
-                <kvs-line label="折扣金额">-¥0</kvs-line>
-                <kvs-line label="积分抵扣">-¥0</kvs-line>
-                <kvs-line label="优惠券优惠">-¥1</kvs-line>
-            </view>
-            <view class="od-total">
-                <text class="pt-name">合计支付：</text>￥9.5
-            </view>
-        </info-temp>
+            <kv-line label="项目类型：">({{ orderInfo.project_type_name || '-' }})</kv-line>
+            <kv-line label="进场时间：">{{ orderInfo.start_time || '-' }}</kv-line>
+            <kv-line 
+                label="离场时间：" 
+                v-if="[ '待使用', '已取消预约', '计费中', '使用中' ].includes(orderInfo.status_text)&&orderInfo.settlement_type === 1"
+            >现场扫码结算</kv-line>
+            <kv-line label="离场时间：" v-else>{{ orderInfo.end_time || '-' }}</kv-line>
+            <kv-line label="时长合计：">{{ orderInfo.extension&&orderInfo.extension.duration || '-' }}</kv-line>
 
-        <view class="od-margin"></view>
-        <info-temp title="关联押金订单">
-            <kv-line label="押金订单号：">
-                <template v-slot:default>qp20200150150245569</template>
-                <template v-slot:right>
-                    <text class="od-check">查看押金订单</text>
-                </template>
-            </kv-line>
-            <kv-line label="押金金额：">￥50</kv-line>
-            <kv-line label="订单状态：">
-                <template v-slot:default>已退款</template>
-                <template v-slot:right>
-                    <text class="od-deposit-explain">(押金已原路退返账户，请留意查收!)</text>
-                </template>
-            </kv-line>
+            <block
+                v-if="orderInfo.settlement_type === 1 || [ '已完成', '已退款', '待支付', '已失效' ].includes(orderInfo.status_text)"
+            >
+                <view class="od-pay-info">
+                    <kvs-line label="金额小计">¥{{ orderInfo.amount || '0' }}</kvs-line>
+                    <kvs-line label="折扣金额">-¥{{ orderInfo.discount_amount || '0' }}</kvs-line>
+                    <kvs-line label="积分抵扣">-¥{{ orderInfo.deduction_amount || '0' }}</kvs-line>
+                    <kvs-line label="优惠券优惠">-¥{{ orderInfo.coupons_amount || '0' }}</kvs-line>
+                </view>
+                <view class="od-total">
+                    <text class="pt-name">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}
+                </view>
+            </block>
         </info-temp>
 
-        <view class="od-margin"></view>
-        <info-temp>
-            <kv-line label="取消时间：">2019-05-17 11:12:58</kv-line>
-            <kv-line label="取消原因：">商家主动取消</kv-line>
-        </info-temp>
+        <block v-if="extension.show_deposit">
+            <view class="od-margin"></view>
+            <info-temp title="关联押金订单">
+                <kv-line label="押金订单号：">
+                    <template v-slot:default>{{ orderInfo.deposit_order_no || '-' }}</template>
+                    <template v-slot:right>
+                        <text class="od-check" @click="toDepoistDetail">查看押金订单</text>
+                    </template>
+                </kv-line>
+                <kv-line label="押金金额：">￥{{ extension.deposit_amount || '0' }}</kv-line>
+                <kv-line label="订单状态：">
+                    <template v-slot:default>{{ extension.deposit_status_text || '-' }}</template>
+                    <!-- <template v-slot:right>
+                        <text class="od-deposit-explain">(押金已原路退返账户，请留意查收!)</text>
+                    </template> -->
+                </kv-line>
+            </info-temp>
+        </block>
 
-        <view class="od-margin"></view>
-        <info-temp title="支付信息">
-            <kv-line label="支付方式：">微信支付</kv-line>
-            <kv-line label="支付时间：">2019-05-17 11:12:58</kv-line>
-            <kv-line label="交易流水：">4200225665566566565455</kv-line>
-        </info-temp>
+        <block v-if="orderInfo.status_text === '已取消预约'">
+            <view class="od-margin"></view>
+            <info-temp>
+                <kv-line label="取消时间：">{{ orderInfo.cancel_time || '-' }}</kv-line>
+                <kv-line label="取消原因：">{{ orderInfo.cancel_reason || '-' }}</kv-line>
+            </info-temp>
+        </block>
 
-        <view class="od-margin"></view>
-        <info-temp title="费用详情">
-            <kv-line label="产生费用："><text class="od-check">￥10</text></kv-line>
-        </info-temp>
+        <block v-if="orderInfo.settlement_type === 1 || [ '已完成', '已退款',  '已失效' ].includes(orderInfo.status_text)">
+            <view class="od-margin"></view>
+            <info-temp title="支付信息">
+                <kv-line label="支付方式：">{{ orderInfo.pay_type_text || '-' }}</kv-line>
+                <kv-line label="支付时间：">{{ orderInfo.pay_time || '-' }}</kv-line>
+                <kv-line label="交易流水：">{{ orderInfo.trade_no || '-' }}</kv-line>
+            </info-temp>
+        </block>
 
-        <view class="od-margin"></view>
+        <block v-if="orderInfo.status_text === '计费中'">
+            <view class="od-margin"></view>
+            <info-temp title="费用详情">
+                <kv-line label="产生费用："><text class="od-check">￥{{ orderInfo.amount || '0' }}</text></kv-line>
+            </info-temp>
+        </block>
+
+        <!-- <view class="od-margin"></view>
         <info-temp title="退款信息1">
             <kv-line label="退款金额：">￥998</kv-line>
             <kv-line label="退款单号：">TF-20195171564566</kv-line>
@@ -79,21 +101,61 @@
             <kv-line label="退款单号：">TF-20195171564566</kv-line>
             <kv-line label="退款时间：">2019-05-17 11:12:58</kv-line>
             <kv-line label="退款原因：">商家主动退款</kv-line>
-        </info-temp>
+        </info-temp> -->
+
+        <view class="od-margin"></view>
+        <view class="od-margin"></view>
+        <view 
+            class="pod-btn" 
+            v-if="orderInfo.status_text === '待支付'"
+            @click="finishOrder"
+        >完结订单</view>
+        <view 
+            class="pod-btn" 
+            v-if="orderInfo.status_text === '计费中'"
+            @click="endOrder"
+        >结束计费</view>
+        <view 
+            class="pod-btn" 
+            v-if="orderInfo.status_text === '待使用'"
+        >取消预约</view>
+
+        <end-billing-modal ref="endBillingModal"></end-billing-modal>
         
-        <bottom-fixed>
+        <!-- <bottom-fixed>
             <fixed-button>取消预约</fixed-button>
-        </bottom-fixed>
+        </bottom-fixed> -->
     </view>
 </template>
 
 <script>
+/*
+    这页面只是场时订单
+
+    type:
+
+    2是人时  1 3是场时
+    1是场时  3是场时的押金
+    预约订单是另外一个字段判断 -> enable_subscribe
+    ------------------
+    enable_subscribe= true&&type= 1 --> 预约订单
+    enable_subscribe= true&&type= 3 --> 预约的押金订单
+
+    settlement_type --> 结算方式[0离场结算1用前结算]
+
+    人时和场时分开，不考虑人时订单
+*/
 import headerTemp from "../modules/order_detail/header_temp.vue";
 import infoTemp from "../modules/order_detail/info_temp.vue";
 import kvLine from "../../../components/kv_line.vue";
 import kvsLine from "../../../components/kvs_line.vue";
 import bottomFixed from "../modules/order_detail/bottom_fixed.vue";
 import fixedButton from "../modules/order_detail/fixed_button.vue";
+import endBillingModal from "../modules/order_detail/end_billing_modal.vue";
+
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import { showLoad, hideLoad, formatDate, showNone, showModal, routeTo } from '@/utils/util';
 export default {
     components: {
         'header-temp': headerTemp,
@@ -102,6 +164,111 @@ export default {
         'kvs-line': kvsLine,
         'bottom-fixed': bottomFixed,
         'fixed-button': fixedButton,
+        'end-billing-modal': endBillingModal,
+    },
+    computed: {
+        extension(){
+            let { orderInfo } = this;
+            return orderInfo?.extension || {};
+        }
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    },
+    onLoad(options){
+        this.getOrderDetail({
+            brand_id: options?.brand_id || '',
+            order_no: options?.order_no || ''
+        })
+    },
+    methods: {
+        endOrder(){
+            let { orderInfo } = this;
+            this.$refs.endBillingModal.initModal({
+                operator: orderInfo?.end_bill_operator_name,
+                duration: orderInfo?.extension?.duration,
+                amount: orderInfo?.amount,
+                brand_id: orderInfo?.brand_id,
+                order_no: orderInfo?.order_no,
+                success: res=>{
+                    setTimeout(()=>{
+                        this.getOrderDetail({
+                            brand_id: orderInfo?.brand_id,
+                            order_no: orderInfo?.order_no
+                        });
+                    }, 1000);
+                }
+            });
+        },
+        finishOrder(){
+            let { orderInfo } = this;
+            showModal({
+                title: '提示',
+                content: '是否确认完结订单？',
+                showCancel: true,
+                success: modalRes=>{
+                    if(modalRes.confirm)this.endOrderServer({
+                        brand_id: orderInfo?.brand_id || '',
+                        order_no: orderInfo?.order_no || '',
+                        stadium_id: orderInfo?.stadium_id || ''
+                    })
+                    .finally(res=>{
+                        setTimeout(()=>{
+                            this.getOrderDetail({
+                                brand_id: orderInfo?.brand_id,
+                                order_no: orderInfo?.order_no
+                            });
+                        }, 1000);
+                    });
+                }
+            })
+        },
+        endOrderServer({
+            brand_id, order_no, stadium_id
+        }){
+            showLoad();
+            return server.get({
+			    url: ORDER_API.timeOrderComplete,
+			    data: { 
+                    brand_id, order_no, stadium_id
+				},
+			    failMsg: '操作失败！'
+			})
+			.then(res=>{
+                hideLoad();
+                showNone('操作成功！');
+                return res;
+			})
+            .catch(err=>{
+                hideLoad();
+                showNone('操作失败！');
+                console.warn('end billing modal confirmBtn err -->', err);
+                return Promise.reject(err);
+            })
+        },
+        toDepoistDetail(){
+            let { orderInfo } = this;
+            routeTo(`/subpackage/order/pages/timekeeping/order_detail/deposit?order_no=${orderInfo.deposit_order_no || ''}&brand_id=${orderInfo.brand_id || ''}`, 'rT');
+        },
+        getOrderDetail({ 
+            brand_id = '', order_no = ''
+        }){
+            showLoad();
+            return server.get({
+                url: ORDER_API.billingOrderDetail,
+                data: { 
+                    brand_id, order_no
+                },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                hideLoad();
+                this.orderInfo = res || {};
+                return res;
+            })
+        },
     }
 }
 </script>
@@ -147,4 +314,11 @@ export default {
         height: 24upx;
         background: transparent;
     }
+
+    .pod-btn{
+        text-align: center; 
+        border-radius: 10upx;
+        background: $mColor;
+        @include flcw(32upx, 112upx, #fff, 500);
+    }
 </style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/timekeeping/order_list.vue b/src/subpackage/order/pages/timekeeping/order_list.vue
index f473442..82188db 100644
--- a/src/subpackage/order/pages/timekeeping/order_list.vue
+++ b/src/subpackage/order/pages/timekeeping/order_list.vue
@@ -137,7 +137,7 @@ export default {
             let _title = '';
             switch(type){
                 case enumOrderType.site:
-                    _title = '场时订单';
+                    _title = '场地计时订单';
                     break;
                 case enumOrderType.person:
                     _title = '散客计时订单';
@@ -171,17 +171,12 @@ export default {
             let _obj = {
                 [enumOrderType.site]: [
                     { label: '全部', value: '' },
-                    { label: '已关闭', value: '已关闭' },
+                    { label: '待使用', value: '待使用' },
                     { label: '计费中', value: '计费中' },
                     { label: '待支付', value: '待支付' },
-                    { label: '待使用', value: '待使用' },
-                    { label: '使用中', value: '使用中' },
-                    { label: '已失效', value: '已失效' },
                     { label: '已完成', value: '已完成' },
-                    { label: '已抵扣', value: '已抵扣' },
-                    { label: '已退款', value: '已退款' },
-                    { label: '已取消预约', value: '已取消预约' },
                     { label: '已退款', value: '已退款' },
+                    { label: '押金', value: '押金' },
                 ],
                 [enumOrderType.person]: [
                     { label: '全部', value: '' },
@@ -245,7 +240,7 @@ export default {
                 data: { 
                     brand_id, stadium_id, status, 
                     start, end, order_type: this.getReqOrderType(order_type), page, page_size,
-                    status_text
+                    status_text: status_text === '押金' ? '' : status_text
                 },
                 failMsg: '加载失败！'
             })
@@ -266,6 +261,8 @@ export default {
         },
         // 获取请求订单类型
         getReqOrderType(type){
+            let { condition } = this;
+            if(type === enumOrderType.site&&condition.status_text === '押金')return '3'; // 场时需要同时加载押金订单
             if(type === enumOrderType.site)return '1,3'; // 场时需要同时加载押金订单
             return type;
         }