diff --git a/src/components/order_list/rent_and_sale/rent_and_sale.vue b/src/components/order_list/rent_and_sale/rent_and_sale.vue
index dc914c5..bdd428b 100644
--- a/src/components/order_list/rent_and_sale/rent_and_sale.vue
+++ b/src/components/order_list/rent_and_sale/rent_and_sale.vue
@@ -1,27 +1,32 @@
 <template>
-    <view class="rent-and-sale">
-        <a-header :source="'地址'" :status="'状态'">
+    <view class="rent-and-sale" @click="toInfo">
+        <a-header :source="orderInfo.extension.stadium_name || '-'" :status="statusTxt(orderInfo.pay_status)">
             <view slot="line" class="ras-line">
                 <image class="rl-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
-                <view class="rl-view">储物柜-B柜</view>
+                <view class="rl-view">{{ orderInfo.extension.hardware_name || '-' }}</view>
             </view> 
         </a-header>
         <view class="ras-info">
-            <a-line :value="'sc20 0822 0815 6894'">
+            <a-line :value="orderInfo.order_no || '-'">
                 <block slot="name">订单编号：</block> 
             </a-line>
-            <a-line :value="'1小时58分46秒'">
-                <block slot="name">租借时长：</block> 
-            </a-line>
-            <a-line :value="'2020-08-22   10:30:40'">
-                <block slot="name">租借时间：</block> 
-            </a-line>
-            <a-line :value="'KARAKAL球拍'">
-                <block slot="name">商品名称：</block> 
-            </a-line>
-            <a-line :value="'2020-08-22   10:30:40'">
-                <block slot="name">购买时间：</block> 
-            </a-line>
+            <block v-if="orderInfo.lease_cabinet_type == 'rent'">
+                <a-line :value="orderInfo.extension.duration || '-'">
+                    <block slot="name">租借时长：</block> 
+                </a-line>
+                <a-line :value="orderInfo.start_time || '-'">
+                    <block slot="name">租借时间：</block> 
+                </a-line>
+            </block>
+            <block v-if="orderInfo.lease_cabinet_type == 'sell'">
+                <a-line :value="orderInfo.goods_name || '-'">
+                    <block slot="name">商品名称：</block> 
+                </a-line>
+                <a-line :value="orderInfo.pay_time || '-'">
+                    <block slot="name">购买时间：</block> 
+                </a-line>
+            </block>
+            
         </view>
         <view class="ras-total">
             <view class="rt-view"><text class="rv-text">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view>
@@ -30,13 +35,42 @@
 </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';
+// lease_cabinet_type  柜子类型  rent 租借   sell 售卖
+// 租借柜子的  pay_status   租用中 1     已完成 2   退款完成4
+// 售卖的柜子   pay_status   已购买 2    退款完成 4
 export default {
     components: {
         'a-header': a_header,
         'a-line': a_line,
     },
+    props: {
+        orderInfo: {
+            default: {
+                extension: {},
+                lease_cabinet: {}
+            },
+            type: Object,
+        },
+    },
+    methods: {
+        toInfo(){
+            let { orderInfo } = this;
+            util.routeTo(`/subpackage/order/pages/rent_and_sale/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
+        },
+        statusTxt(status = ''){
+            let { orderInfo } = this;
+            let _obj = {
+                '1': '租用中',
+                '2': '已完成',
+                '4': '退款完成',
+            };
+            if(orderInfo.lease_cabinet_type == 'sell')delete _obj['1'],_obj['2'] = '已购买';
+            return _obj[ status + '' ] || '-';
+        }
+    }
 }
 </script>
 
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index e55b026..ea1a32d 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -61,7 +61,7 @@
                 <locker :order-info="e" v-if="orderType == 7"></locker>
                 <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>
@@ -410,7 +410,7 @@
             // 设备接口/不同模板
             isNotDeviceTemp(){
                 let { orderType } = this;
-                return orderType == 7 || orderType == 16
+                return orderType == 7 || orderType == 16 || orderType == 8
             },
             // 请求列表订单参数
 			getQueryForList(){
@@ -475,6 +475,7 @@
             11: 'water_valve_order',
             9: 'coffee_order',
             7: 'locker_order',
+            8: 'lease_order',
         }
         return _obj
     }
@@ -517,6 +518,8 @@
                 return '赛事订单列表';
             case 2:
                 return '商城订单列表';
+            case 8:
+                return '租售柜订单列表';
             default: 
                 return '订单'
         }
@@ -554,6 +557,8 @@
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}];
             case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6
                 return [ {id: '1,2,3,6', name: '全部'}, {id: 0, name: '待支付'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '已完成 '}, {id: 4, name: '已关闭 '}, {id: 5, name: '退款中 '}, {id: 6, name: '已退款 '}];
+            case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成 '}, {id: 4, name: '已退款 '},{id: 5, name: '已购买 '}];
             default:  
                 return []
         }
diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue
index 8ad6c6f..274ca4b 100644
--- a/src/pages/order_search/order_search.vue
+++ b/src/pages/order_search/order_search.vue
@@ -25,6 +25,12 @@
                     <value-card :order-info="e" v-if="orderType == 18"></value-card>
                     <spectacular-monent :order-info="e" v-if="orderType == 15"></spectacular-monent>
                     <club-rental :order-info="e" v-if="orderType == 16"></club-rental>
+
+                    <device :order-info="e" v-if="isDevice()&&!isNotDeviceTemp()" :order-type="orderType"></device>
+                    <locker :order-info="e" v-if="orderType == 7"></locker>
+                    <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>
         </view>
@@ -43,6 +49,12 @@ import curriculum from '../../components/order_list/curriculum/curriculum.vue';
 import spectacular_monent from '../../components/order_list/spectacular_monent/spectacular_monent.vue';
 import club_rental from '../../components/order_list/club_rental/club_rental.vue';
 
+import locker from '../../components/order_list/locker/locker.vue';
+import rent_and_sale from '../../components/order_list/rent_and_sale/rent_and_sale.vue';
+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 { API } from '../../js/api';
 import { servers } from '../../js/server';
 import util from '../../utils/util';
@@ -60,6 +72,12 @@ export default {
         'value-card': value_card,
         'curriculum': curriculum,
         'club-rental': club_rental,
+
+        'locker': locker,
+        'rent-and-sale': rent_and_sale,
+        'mall': mall,
+        'device': device,
+        'competition': competition,
     },
     computed: {
         ...mapState(['brandInfo']),
@@ -117,8 +135,19 @@ export default {
             if(type == 18)return API.userValueCardList; // 储值卡订单
             if(type == 15)return API.momentOrderList; // 高光时刻
             if(type in deviceTypeObj())return API.hardwareOrderList; // 硬件管理
+            if(type == 14)return API.appointmentOrderList; // 高光时刻
+            if(type == 2)return API.shop2OrderList; // 商城订单
+        },
+        // 是否为设备，统一接口
+        isDevice(){
+            let { orderType } = this;
+            return orderType in deviceTypeObj()
+        },
+        // 设备接口/不同模板
+        isNotDeviceTemp(){
+            let { orderType } = this;
+            return orderType == 7 || orderType == 16 || orderType == 8
         },
-        
         getOrderList({
             key = "",
             page = 1,
@@ -171,6 +200,11 @@ function deviceTypeObj(){
     */
     let _obj = {
         16: 'rent_ball_order',
+        6: 'vending_order',
+        11: 'water_valve_order',
+        9: 'coffee_order',
+        7: 'locker_order',
+        8: 'lease_order',
     }
     return _obj
 }
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 5aab618..1f67d9c 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -22,6 +22,7 @@ export const ORDER_API = {
 	logisticsCompanyLs:`${ORIGIN}/shop2/logisticsCompany/List`,  // 商城订单管理 - 快递公司列表
 	orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`,  // 商城-商品退款_copy
 	rentballOrderEnd:`${ORIGIN}/admin/assistant/rentball/order/end`,  // 租球机-结束计费
+	leaseOrderEnd:`${ORIGIN}/admin/stadium/leaseOrder/endBill`,  // 租售柜-结束计费
 
 }
 
diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue
index d63d202..264c0d7 100644
--- a/src/subpackage/order/pages/club_rental/detail/detail.vue
+++ b/src/subpackage/order/pages/club_rental/detail/detail.vue
@@ -77,7 +77,7 @@
                 <a-line :value="orderInfo.amount ">
                     <block slot="name">产生费用：</block> 
                 </a-line>
-                <a-line :value="orderInfo.pay_amount " v-if="orderInfo.order_type == 'buy'&&orderInfo.pay_status == 2">
+                <a-line :value="orderInfo.buy_price " v-if="orderInfo.order_type == 'buy'&&orderInfo.pay_status == 2">
                     <block slot="name">购买金额：</block> 
                 </a-line>
                 <view class="cei-line">
@@ -133,7 +133,7 @@
 
         </view>
         <view class="cr-btn" @click="depositRefundBtn" v-if="orderInfo.order_type == 'deposit'&&orderInfo.pay_status == 2">退押金</view>
-        <view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type != 'deposit'&&orderInfo.pay_status == 1 || true">结束计费</view>
+        <view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type != 'deposit'&&orderInfo.pay_status == 1">结束计费</view>
     </view>
 </template>
 
diff --git a/src/subpackage/order/pages/devices/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue
index da782f2..a31d26a 100644
--- a/src/subpackage/order/pages/devices/detail/detail.vue
+++ b/src/subpackage/order/pages/devices/detail/detail.vue
@@ -51,11 +51,12 @@
 <script>
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
+import util from '../../../../../utils/util';
 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,
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index d7f178b..7ddd02a 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 ];
+            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12 ];
             return _endKeyArr.includes(key);
         }
     }
diff --git a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
index a863333..d0555e4 100644
--- a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
+++ b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
@@ -1,115 +1,136 @@
 <template>
     <view class="rent-and-sale">
-        <o-header></o-header>
+        <o-header
+            :logo='orderInfo.extension.stadium_logo'
+            :source='orderInfo.extension.stadium_name'
+            :phone='orderInfo.mobile'
+            :name='orderInfo.name'
+            :status='statusTxt(orderInfo.pay_status)'
+        ></o-header>
         <!-- 出租 -->
-        <block v-if="false">
+        <block v-if="orderInfo.lease_cabinet_type == 'rent'">
             <view class="ras-box">
                 <view class="ras-tit">租用详情</view>
-                <a-line :value="'欧轩智能租售柜' || '-'">
+                <a-line :value="orderInfo.extension.hardware_name || '-'">
                     <block slot="name">设备名称：</block> 
                 </a-line>
-                <a-line :value="'球拍' || '-'">
+                <a-line :value="orderInfo.goods_name || '-'">
                     <block slot="name">租用设备：</block> 
                 </a-line>
-                <a-line :value="'7号柜' || '-'">
+                <a-line :value="orderInfo.lease_cabinet.cabinet_name || '-'">
                     <block slot="name">柜子编号：</block> 
                 </a-line>
-                <a-line :value="'2020-01-10 15:02:24 ' || '-'">
+                <a-line :value="orderInfo.start_time || '-'">
                     <block slot="name">租借时间：</block> 
                 </a-line>
-                <a-line :value="'2020-01-10 17:37:33' || '-'">
+                <a-line :value="orderInfo.end_time || '-'">
                     <block slot="name">归还时间：</block> 
                 </a-line>
-                <a-line :value="'2小时35分9秒' || '-'" value-color="#009874">
+                <a-line :value="orderInfo.extension.duration  || '-'" value-color="#009874">
                     <block slot="name">租借时长：</block> 
                 </a-line>
             </view>
             <view class="ras-box ras-price-info">
                 <view class="ras-tit">费用详情</view>
-                <a-line :value="'20元/小时' || '-'">
+                <a-line :value="orderInfo.extension.cost_standard || '-'">
                     <block slot="name">收费标准：</block> 
                 </a-line>
-                <a-line :value="'¥100' || '-'">
+                <a-line :value="orderInfo.extension.deposit_text  || '0'">
                     <block slot="name">支付押金：</block> 
                 </a-line>
-                <a-line :value="'¥60' || '-'">
+                <a-line :value="'￥' + (orderInfo.extension.rent_generate_fee || '0')">
                     <block slot="name">产生费用：</block> 
                 </a-line>
-                <s-line :keyname="'积分抵扣'" :value="'¥6'"></s-line>
-                <s-line :keyname="'折扣金额'" :value="'¥6'"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="'¥6'"></s-line>
-                <view class="rpi-total"><text>合计支付：</text>￥5</view>
-                <view class="ras-border"></view>
-                <view class="rpi-refund-info">
-                    <view>应退还金额：¥40</view>
-                    <view>（注：应退还金额=支付押金-合计应支付金额）</view>
-                </view>
+                <block v-if="orderInfo.pay_status == 2">
+                    <s-line :keyname="'积分抵扣'" :value="orderInfo.deduction_amount || '0'"></s-line>
+                    <s-line :keyname="'折扣金额'" :value="orderInfo.discount_amount || '0'"></s-line>
+                    <s-line :keyname="'优惠券优惠'" :value="orderInfo.coupons_amount || '0'"></s-line>
+                    <view class="rpi-total"><text>合计支付：</text>￥{{ orderInfo.rent_amount || '0' }}</view>
+                    <view class="ras-border"></view>
+                    <view class="rpi-refund-info">
+                        <view>应退还金额：¥{{ orderInfo.refund_amount  || '0' }}</view>
+                        <view>（注：应退还金额=支付押金-合计应支付金额）</view>
+                    </view>
+                </block>
             </view>
-            <view class="ras-box">
+            <view class="ras-box" v-if="orderInfo.deposit_type == 0 || (orderInfo.extension&&orderInfo.extension.is_over_deposit)">
                 <view class="ras-tit">支付详情</view>
-                <p-line :keyname="'订单编号'" :value="'sc20 0822 0815 1234'" isbtn></p-line>
-                <p-line :keyname="'支付方式'" :value="'会员卡支付'"></p-line>
-                <p-line :keyname="'支付金额'" :value="'50元'"></p-line>
-                <p-line :keyname="'支付时间'" :value="'2020-08-22 10:12:25'"></p-line>
-                <p-line :keyname="'交易流水号'" :value="'20200918125536456408765'"></p-line>
-                <view class="ras-border"></view>
-                <p-line :keyname="'订单编号'" :value="'sc20 0822 0815 1234'"></p-line>
-                <p-line :keyname="'支付方式'" :value="'会员卡支付'"></p-line>
-                <p-line :keyname="'支付金额'" :value="'50元'"></p-line>
-                <p-line :keyname="'支付时间'" :value="'2020-08-22 10:12:25'"></p-line>
-                <p-line :keyname="'交易流水号'" :value="'20200918125536456408765'"></p-line>
+                <block v-if="orderInfo.deposit_type == 0">
+                    <!-- 押金订单 -->
+                    <p-line :keyname="'订单编号'" :value="orderInfo.order_no || '-'" isbtn></p-line>
+                    <p-line :keyname="'支付方式'" :value="payTypeTxt(orderInfo.pay_type)"></p-line>
+                    <p-line :keyname="'支付金额'" :value="orderInfo.pay_amount || '0'"></p-line>
+                    <p-line :keyname="'支付时间'" :value="orderInfo.pay_time || '-'"></p-line>
+                    <p-line :keyname="'交易流水号'" :value="orderInfo.trade_no || '-'"></p-line>
+                </block>
+                <block v-if="orderInfo.extension&&orderInfo.extension.is_over_deposit">
+                    <view class="ras-border"></view>
+                    <!-- 超押订单 -->
+                    <p-line :keyname="'订单编号'" :value="orderInfo.late_order.order_no || '-'"></p-line>
+                    <p-line :keyname="'支付方式'" :value="payTypeTxt(orderInfo.late_order.pay_type)"></p-line>
+                    <p-line :keyname="'支付金额'" :value="orderInfo.late_order.pay_amount || '0'"></p-line>
+                    <p-line :keyname="'支付时间'" :value="orderInfo.late_order.pay_time || '-'"></p-line>
+                    <p-line :keyname="'交易流水号'" :value="orderInfo.late_order.trade_no || '-'"></p-line>
+                </block>
+                
             </view>
-            <view class="ras-box">
-                <view class="ras-tit">退款详情</view>
-                <p-line :keyname="'退款编号'" :value="'sc20 0822 0815 6894'" isbtn></p-line>
-                <p-line :keyname="'退款方式'" :value="'原路退还'"></p-line>
-                <p-line :keyname="'退款状态'" :value="'退款成功'"></p-line>
-                <p-line :keyname="'退款金额'" :value="'40元'"></p-line>
-                <p-line :keyname="'退款时间'" :value="'2020-08-23 10:12:25'"></p-line>
+            <view class="ras-box" v-if="orderInfo.pay_status == 4">
+                <view class="ras-tit">退押详情</view>
+                <p-line :keyname="'退款编号'" :value="orderInfo.refund_no || '-'" isbtn></p-line>
+                <p-line :keyname="'退款方式'" :value="orderInfo.extension.refund_type_text || '-'"></p-line>
+                <p-line :keyname="'退款状态'" :value="orderInfo.extension.refund_status_text || '-'"></p-line>
+                <p-line :keyname="'退款金额'" :value="orderInfo.refund_amount || '0'"></p-line>
+                <p-line :keyname="'退款时间'" :value="orderInfo.refund_time || '-'"></p-line>
             </view>
-            <view class="ras-fixd-bar">
-                <view>结束计费</view>
+            <view class="ras-fixd-bar" v-if="orderInfo.pay_status == 1">
+                <view @click="endBillingBtn">结束计费</view>
             </view>
         </block>
         <!-- 销售 -->
-        <block>
+        <block v-if="orderInfo.lease_cabinet_type == 'sell'">
             <view class="ras-box">
                 <view class="ras-tit">商品详情</view>
-                <a-line :value="'欧轩智能租售柜' || '-'">
+                <a-line :value="orderInfo.extension.hardware_name || '-'">
                     <block slot="name">设备名称：</block> 
                 </a-line>
-                <a-line :value="'球拍' || '-'">
+                <a-line :value="orderInfo.goods_name || '-'">
                     <block slot="name">租用设备：</block> 
                 </a-line>
-                <a-line :value="'7号柜' || '-'">
+                <a-line :value="orderInfo.lease_cabinet.cabinet_name || '-'">
                     <block slot="name">柜子编号：</block> 
                 </a-line>
-                <a-line :value="'￥198' || '-'">
+                <a-line :value="orderInfo.amount || 0">
                     <block slot="name">价格：</block> 
                 </a-line>
             </view>
             <view class="ras-box ras-price-info">
                 <view class="ras-tit">费用详情</view>
-                <s-line :keyname="'金额小计'" :value="'¥6'"></s-line>
-                <s-line :keyname="'积分抵扣'" :value="'¥6'"></s-line>
-                <s-line :keyname="'折扣金额'" :value="'¥6'"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="'¥6'"></s-line>
-                <view class="rpi-total"><text>合计支付：</text>￥5</view>
+                <s-line :keyname="'金额小计'" :value="orderInfo.amount || '0'"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="orderInfo.deduction_amount || '0'"></s-line>
+                <s-line :keyname="'折扣金额'" :value="orderInfo.discount_amount || '0'"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="orderInfo.coupons_amount || '0'"></s-line>
+                <view class="rpi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view>
             </view>
             <view class="ras-box">
                 <view class="ras-tit">支付详情</view>
-                <p-line :keyname="'订单编号'" :value="'sc20 0822 0815 1234'" 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="'20200918125536456408765'"></p-line>
-                <p-line :keyname="'退款单号'" :value="'sc20 0822 0815 6894'"></p-line>
-                <p-line :keyname="'退款时间'" :value="'2020-08-23 10:12:25'"></p-line>
+                <p-line :keyname="'订单编号'" :value="orderInfo.order_no || '-'" isbtn></p-line>
+                <p-line :keyname="'支付方式'" :value="payTypeTxt(orderInfo.pay_type)"></p-line>
+                <p-line :keyname="'支付时间'" :value="orderInfo.pay_time || '-'"></p-line>
+                <p-line :keyname="'交易流水号'" :value="orderInfo.trade_no || '-'"></p-line>
+                <block v-if="orderInfo.pay_status == 4">
+                    <p-line :keyname="'退款单号'" :value="orderInfo.refund_no || '-'"></p-line>
+                    <p-line :keyname="'退款时间'" :value="orderInfo.refund_time || '-'"></p-line>
+                </block>
+                
             </view>
         </block>
     </view>
 </template>
 
 <script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import util from '../../../../../utils/util';
 import header from '../../../components/header/header.vue';
 import a_line from '../../../../../components/order_list/a_line/a_line.vue';
 import s_line from '../../../components/s_line/s_line.vue';
@@ -121,6 +142,64 @@ export default {
         's-line': s_line,
         'p-line': p_line,
     },
+    data(){
+        return {
+            orderInfo: {
+                extension: {}, // 
+                lease_cabinet: {}, // 柜子信息
+                late_order: {}, // 超押金订单
+            }
+        }
+    },
+    onLoad(options){
+        this.getInfo(options.order_no);
+    },
+    methods: {
+        endBillingBtn: util.debounce(function(){
+            util.showLoad();
+            let { orderInfo } = this;
+            server.post({
+                url: ORDER_API.leaseOrderEnd,
+                data: {
+                    order_no: orderInfo.order_no
+                },
+                isDefaultGet: false,
+            })
+            .then(res => {
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                    setTimeout(_=>this.getOrderInfo(orderInfo.order_no), 1200);
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }   
+            })
+            .catch(util.hideLoad)
+        }, 300, true),
+        payTypeTxt: util.order_pay_type_txt,
+        statusTxt(status = ''){
+            let { orderInfo } = this;
+            let _obj = {
+                '1': '租用中',
+                '2': '已完成',
+                '4': '退款完成',
+            };
+            if(orderInfo.lease_cabinet_type == 'sell')delete _obj['1'],_obj['2'] = '已购买';
+            return _obj[ status + '' ] || '-';
+        },
+        getInfo(order_no){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.hardwareOrderGet,
+                data: { order_no },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                this.orderInfo = res || {};
+            })
+        },
+    }
 }
 </script>