diff --git a/src/components/order_list/club_rental/club_rental.vue b/src/components/order_list/club_rental/club_rental.vue
index a5565d2..416f691 100644
--- a/src/components/order_list/club_rental/club_rental.vue
+++ b/src/components/order_list/club_rental/club_rental.vue
@@ -31,9 +31,12 @@
             </block>
             
         </view>
-        <view class="vcc-total">
+        <view class="vcc-total" v-if="orderInfo.pay_status != 1">
             <view class="vt-view"><text class="vv-text">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view>
         </view>
+        <view class="vcc-end-btn" v-if="orderInfo.order_type != 'deposit'&&orderInfo.pay_status == 1">
+            <view class="veb-item" @click.stop="toInfo(1)">结束计费</view>
+        </view>
     </view>
 </template>
 
@@ -57,9 +60,9 @@ export default {
     mounted(){
     },
     methods: {
-        toInfo(){
+        toInfo(isEnd = 0){
             let { orderInfo } = this;
-            util.routeTo(`/subpackage/order/pages/club_rental/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
+            util.routeTo(`/subpackage/order/pages/club_rental/detail/detail?order_no=${orderInfo.order_no}&is_end=${ isEnd }`, 'nT');
         },
         getStatusTxt(status = -1){
             let _obj = {
@@ -81,6 +84,9 @@ export default {
         padding: 0 20upx 20upx;
         border-radius: 10upx;
     }
+    .vcc-info{
+        padding-top: 20upx;
+    }
     .crc-line{
         margin-top: 10upx;
         @include centerFlex(flex-start);
@@ -110,4 +116,19 @@ export default {
             }
         }
     }
+    .vcc-end-btn{
+        padding-top: 20upx;
+        @include centerFlex(flex-end);
+        .veb-item{
+            width: 192upx;
+            height: 80upx;
+            line-height: 80upx;
+            text-align: center;
+            border-radius: 10upx;
+            font-size: 32upx;
+            font-weight: 500;
+            color: #fff;
+            background-color: $themeColor;
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/src/static/images/code_null.png b/src/static/images/code_null.png
index 7364627..8b41375 100644
Binary files a/src/static/images/code_null.png and b/src/static/images/code_null.png differ
diff --git a/src/static/images/icon/invite.png b/src/static/images/icon/invite.png
index 73c3649..c3c87e2 100644
Binary files a/src/static/images/icon/invite.png and b/src/static/images/icon/invite.png differ
diff --git a/src/static/images/icon/location.png b/src/static/images/icon/location.png
index 068a335..99250d3 100644
Binary files a/src/static/images/icon/location.png and b/src/static/images/icon/location.png differ
diff --git a/src/static/images/icon/people.png b/src/static/images/icon/people.png
index 62c9373..847d541 100644
Binary files a/src/static/images/icon/people.png and b/src/static/images/icon/people.png differ
diff --git a/src/static/images/icon/selected_ring.png b/src/static/images/icon/selected_ring.png
index 280cd03..0f01616 100644
Binary files a/src/static/images/icon/selected_ring.png and b/src/static/images/icon/selected_ring.png differ
diff --git a/src/static/images/icon/success_tip.png b/src/static/images/icon/success_tip.png
index b11a50b..e621534 100644
Binary files a/src/static/images/icon/success_tip.png and b/src/static/images/icon/success_tip.png differ
diff --git a/src/static/images/icon/x_close.png b/src/static/images/icon/x_close.png
index d4f8de0..d8cc22a 100644
Binary files a/src/static/images/icon/x_close.png and b/src/static/images/icon/x_close.png differ
diff --git a/src/static/images/write_off/mall.png b/src/static/images/write_off/mall.png
index 2fe92fb..12e4248 100644
Binary files a/src/static/images/write_off/mall.png and b/src/static/images/write_off/mall.png differ
diff --git a/src/subpackage/device/static/images/i_voice_1.png b/src/subpackage/device/static/images/i_voice_1.png
index 70bed67..6b6fd80 100644
Binary files a/src/subpackage/device/static/images/i_voice_1.png and b/src/subpackage/device/static/images/i_voice_1.png differ
diff --git a/src/subpackage/device/static/images/i_voice_2.png b/src/subpackage/device/static/images/i_voice_2.png
index fce66a6..67f7c7a 100644
Binary files a/src/subpackage/device/static/images/i_voice_2.png and b/src/subpackage/device/static/images/i_voice_2.png differ
diff --git a/src/subpackage/device/static/images/i_voice_3.png b/src/subpackage/device/static/images/i_voice_3.png
index 0b603ee..97d28b8 100644
Binary files a/src/subpackage/device/static/images/i_voice_3.png and b/src/subpackage/device/static/images/i_voice_3.png differ
diff --git a/src/subpackage/device/static/images/i_voice_4.png b/src/subpackage/device/static/images/i_voice_4.png
index fce66a6..67f7c7a 100644
Binary files a/src/subpackage/device/static/images/i_voice_4.png and b/src/subpackage/device/static/images/i_voice_4.png differ
diff --git a/src/subpackage/device/static/images/in.png b/src/subpackage/device/static/images/in.png
index 60cc528..5daa490 100644
Binary files a/src/subpackage/device/static/images/in.png and b/src/subpackage/device/static/images/in.png differ
diff --git a/src/subpackage/device/static/images/scan_code.png b/src/subpackage/device/static/images/scan_code.png
index 06424ed..d695660 100644
Binary files a/src/subpackage/device/static/images/scan_code.png and b/src/subpackage/device/static/images/scan_code.png differ
diff --git a/src/subpackage/device/static/images/selected_987.png b/src/subpackage/device/static/images/selected_987.png
index 1e749ae..07846a5 100644
Binary files a/src/subpackage/device/static/images/selected_987.png and b/src/subpackage/device/static/images/selected_987.png differ
diff --git a/src/subpackage/device/static/images/start.png b/src/subpackage/device/static/images/start.png
index 49df949..c9a5f6f 100644
Binary files a/src/subpackage/device/static/images/start.png and b/src/subpackage/device/static/images/start.png differ
diff --git a/src/subpackage/device/static/images/sunblind.png b/src/subpackage/device/static/images/sunblind.png
index a262889..88491d0 100644
Binary files a/src/subpackage/device/static/images/sunblind.png and b/src/subpackage/device/static/images/sunblind.png differ
diff --git a/src/subpackage/device/static/images/sunblind_close.png b/src/subpackage/device/static/images/sunblind_close.png
index d42ff6b..81515cc 100644
Binary files a/src/subpackage/device/static/images/sunblind_close.png and b/src/subpackage/device/static/images/sunblind_close.png differ
diff --git a/src/subpackage/device/static/images/sunblind_open.png b/src/subpackage/device/static/images/sunblind_open.png
index bd3b110..96e5ee9 100644
Binary files a/src/subpackage/device/static/images/sunblind_open.png and b/src/subpackage/device/static/images/sunblind_open.png differ
diff --git a/src/subpackage/device/static/images/timing.png b/src/subpackage/device/static/images/timing.png
index 0cbdfeb..0e54143 100644
Binary files a/src/subpackage/device/static/images/timing.png and b/src/subpackage/device/static/images/timing.png differ
diff --git a/src/subpackage/device/static/images/windows.png b/src/subpackage/device/static/images/windows.png
index b402a33..d6ff823 100644
Binary files a/src/subpackage/device/static/images/windows.png and b/src/subpackage/device/static/images/windows.png differ
diff --git a/src/subpackage/order/components/club_rental/end_billing/end_billing.vue b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue
new file mode 100644
index 0000000..e31d5b0
--- /dev/null
+++ b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue
@@ -0,0 +1,156 @@
+<template>
+    <view class="end-billing">
+        <view class="end-mask" @click="close">
+            <view class="em-content" @click.stop="_=>false">
+                <image class="ec-close" src="/subpackage/order/static/images/close.png" @click="close"></image>
+                <view class="ec-main">
+                    <view class="em-tit">结束计费</view>
+                    <view class="em-line">订单号：{{ orderInfo.order_no || '-' }}</view>
+                    <view class="em-line">时长合计：<text class="el-txt">{{ orderInfo.rent_duration || '-' }}</text></view>
+                    <view class="em-settlement">
+                        <view class="es-tit">结算金额(元)</view>
+                        <view class="es-frame">
+                            <input class="ef-ipt" type="number" v-model="amount" />
+                        </view>
+                    </view>
+
+                    <view class="em-remark">
+                        <view class="er-view">备注：</view>
+                        <view class="er-view">1、请确保用户已将球归还到柜子后，才手动帮用户“结束计费”；</view>
+                        <view class="er-view">2、确认结束计费后将从用户押金里自动扣取相应费用，剩余的押金将会原路退还给用户</view>
+                    </view>
+
+                    
+                </view>
+                <view class="em-btns">
+                    <view class="eb-btn" @click="close">取消</view>
+                    <view class="eb-btn" @click="confirm">确认</view>
+                </view>
+                
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        orderInfo: {
+            type: Object,
+            default: {}
+        }
+    },
+    data(){
+        return {
+            amount: '',
+        }
+    },
+    methods: {
+        close(){
+            this.$emit('close');
+        },
+        confirm(){
+            let _amount = this.amount || 0;
+            this.$emit('confirm', { amount: +_amount });
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .end-mask{
+        position: fixed;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        right: 0;
+        background-color: rgba($color: #000000, $alpha: .5);
+    }
+    .em-content{
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        padding: 78upx 56upx 130upx;
+        width: 620upx;
+        border-radius: 10upx;
+        background-color: #fff;
+        .ec-main {
+            .em-tit{
+                margin-bottom: 34upx;
+                line-height: 44upx;
+                text-align: center;
+                font-weight: 500;
+                font-size: 32upx;
+                color: #333;
+            }
+
+            .em-line{
+                line-height: 48upx;
+                font-size: 28upx;
+                color: #1a1a1a;
+                .el-txt{
+                    color: $themeColor;
+                }
+            }
+            .em-settlement{
+                margin-top: 8upx;
+                margin-bottom: 28upx;
+                .es-tit{
+                    margin-bottom: 8upx;
+                    line-height: 48upx;
+                    font-size: 28upx;
+                    color: #1a1a1a;
+                }
+                .es-frame{
+                    padding: 0 24upx;
+                    height: 88upx;
+                    border-radius: 10upx;
+                    border: 2upx solid #D8D8D8;
+                    border-radius: 10upx;
+                    .ef-ipt{
+                        height: 100%;
+                        font-size: 28upx;
+                        color: #333;
+                    }
+                }
+
+            }
+
+        }       
+        .em-remark{
+            .er-view{
+                line-height: 48upx;
+                font-size: 28upx;
+                color: #1a1a1a;
+            }
+        }
+        .em-btns{
+            padding-top: 52upx;
+            @include centerFlex(space-between);
+            .eb-btn{
+                height: 88upx;
+                width: 240upx;
+                border-radius: 10upx;
+                border: 2upx solid $themeColor;
+                line-height: 84upx;
+                text-align: center;
+                font-size: 32upx;
+                font-weight: 500;
+                color: $themeColor;
+                &+.eb-btn{
+                    background-color: $themeColor;
+                    color: #fff;
+                }
+            }
+        }
+        .ec-close{
+            position: absolute;
+            right: 30upx;
+            top: 30upx;
+            width: 34upx;
+            height: 34upx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 74ca1f4..0c3e5b5 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -30,7 +30,8 @@ export const ORDER_API = {
 	ymCardUsage:`${ORIGIN}/admin/userMonthlyCard/usages`,  // 用户年月卡使用记录-后台
 	// 20220725 
 	userValueOrderGet:`${ORIGIN}/admin/userValueOrder/get`,  // 储值卡订单详情
-
+	// 20220726 
+	rentballEndBilling:`${ORIGIN}/admin/stadium/rentball/order/end`,  // 结束订单-后台
 }
 
 export default ORDER_API;
\ No newline at end of file
diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue
index 413ce8f..e45c4c6 100644
--- a/src/subpackage/order/pages/club_rental/detail/detail.vue
+++ b/src/subpackage/order/pages/club_rental/detail/detail.vue
@@ -134,6 +134,15 @@
         </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">结束计费</view>
+        <!-- <view class="cr-btn" @click="overBillingBtn">结束计费</view> -->
+
+        <end-billing
+            v-if = 'isShowEndBilling'
+            @close = 'isShowEndBilling = false'
+            @confirm = 'endBillingBtn'
+            :orderInfo = 'orderInfo'
+        ></end-billing>
+        
     </view>
 </template>
 
@@ -141,48 +150,87 @@
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
 import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import end_billing from '../../../components/club_rental/end_billing/end_billing.vue';
 import util from '../../../../../utils/util';
+
 // 租用中 1  已完成2   已退款4
 // 押金类型只有2,4
 export default {
     components: {
         'a-line': a_line,
+        'end-billing': end_billing
     },
     data(){
         return {
             orderInfo: {
                 extension: {},
                 cabinet: {},
-            }
+            },
+            isShowEndBilling: false,
         }
     },
     onLoad(options){
-        this.getOrderInfo(options.order_no);
+        this.getOrderInfo({ 
+            order_no: options.order_no,
+            isEndBilling: !!+options.is_end || false
+         });
     },
     methods: {
+        endBillingBtn: util.debounce(function(e){
+            this.isShowEndBilling = false;
+            util.showModal({
+                title: '提示',
+                content: `结算金额为${ e.amount || 0 }元`,
+                showCancel: true,
+                success: mRes => {
+                    if(mRes.confirm == true)this.endBillingReq(e.amount);
+                }
+            })
+
+        }, 300, true),
         overBillingBtn: util.debounce(function(){
+            let { orderInfo } = this;  
+            this.getOrderInfo({ 
+                order_no: orderInfo.order_no || '',
+                isEndBilling: true
+            });
+
+        }, 300, true), 
+        endBillingReq(amount = 0){
             util.showLoad();
             let { orderInfo } = this;
             server.post({
-                url: ORDER_API.rentballOrderEnd,
+                url: ORDER_API.rentballEndBilling,
                 data: {
-                    order_no: orderInfo.order_no
+                    order_no: orderInfo.order_no,
+                    pay_amount: amount,
+                    amount
                 },
                 isDefaultGet: false,
             })
             .then(res => {
                 util.hideLoad();
+                
                 if(res.data.code == 0){
                     util.showNone(res.data.message || '操作成功！');
-                    setTimeout(_=>this.getOrderInfo(orderInfo.order_no), 1200);
+                    setTimeout(_=>{
+                        this.getOrderInfo({ order_no: orderInfo.order_no });
+                        util.previousPageFunction({ // 刷新上一页
+                            fnName: 'refreshList',
+                            query: null
+                        })
+                    }, 1200);
                 }else{
                     util.showNone(res.data.message || '操作失败！');
                 }   
             })
             .catch(util.hideLoad)
-        }), 
+        },
         payTypeTxt: util.order_pay_type_txt,
-        getOrderInfo(order_no = ''){
+        getOrderInfo({
+            order_no = '',
+            isEndBilling = false
+        }){
             util.showLoad();
             server.get({
                 url: ORDER_API.hardwareOrderInfo,
@@ -193,6 +241,7 @@ export default {
                 util.hideLoad();
                 let _order = res || { extension: {} };
                 this.orderInfo = _order;
+                this.isShowEndBilling = isEndBilling;
             })
         },
         depositRefundBtn: util.debounce(function(){
@@ -348,4 +397,5 @@ export default {
             background-color: $themeColor;
         }
     }
+    
 </style>
\ No newline at end of file
diff --git a/src/subpackage/order/static/images/arrow.png b/src/subpackage/order/static/images/arrow.png
index 1ee4519..203450c 100644
Binary files a/src/subpackage/order/static/images/arrow.png and b/src/subpackage/order/static/images/arrow.png differ
diff --git a/src/subpackage/order/static/images/down_arrow.png b/src/subpackage/order/static/images/down_arrow.png
index 86bb83f..55747db 100644
Binary files a/src/subpackage/order/static/images/down_arrow.png and b/src/subpackage/order/static/images/down_arrow.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_1.png b/src/subpackage/order/static/images/order_manage/order_1.png
index 063a900..0e87fe1 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_1.png and b/src/subpackage/order/static/images/order_manage/order_1.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_10.png b/src/subpackage/order/static/images/order_manage/order_10.png
index 2702a58..d6099fc 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_10.png and b/src/subpackage/order/static/images/order_manage/order_10.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_12.png b/src/subpackage/order/static/images/order_manage/order_12.png
index 67d1e5b..1f812d3 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_12.png and b/src/subpackage/order/static/images/order_manage/order_12.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_13.png b/src/subpackage/order/static/images/order_manage/order_13.png
index 7aeff47..47274ec 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_13.png and b/src/subpackage/order/static/images/order_manage/order_13.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_14.png b/src/subpackage/order/static/images/order_manage/order_14.png
index 054fe66..e57cd90 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_14.png and b/src/subpackage/order/static/images/order_manage/order_14.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_15.png b/src/subpackage/order/static/images/order_manage/order_15.png
index 7e1bcf9..e52b79d 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_15.png and b/src/subpackage/order/static/images/order_manage/order_15.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_16.png b/src/subpackage/order/static/images/order_manage/order_16.png
index 5e505ea..edd3917 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_16.png and b/src/subpackage/order/static/images/order_manage/order_16.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_17.png b/src/subpackage/order/static/images/order_manage/order_17.png
index 7f7c188..35caf94 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_17.png and b/src/subpackage/order/static/images/order_manage/order_17.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_2.png b/src/subpackage/order/static/images/order_manage/order_2.png
index c49e233..2cba940 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_2.png and b/src/subpackage/order/static/images/order_manage/order_2.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_3.png b/src/subpackage/order/static/images/order_manage/order_3.png
index a7a14c0..72507fe 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_3.png and b/src/subpackage/order/static/images/order_manage/order_3.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_4.png b/src/subpackage/order/static/images/order_manage/order_4.png
index 59b359b..d8fc8b8 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_4.png and b/src/subpackage/order/static/images/order_manage/order_4.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_5.png b/src/subpackage/order/static/images/order_manage/order_5.png
index 8f61ebd..7b3363e 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_5.png and b/src/subpackage/order/static/images/order_manage/order_5.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_6.png b/src/subpackage/order/static/images/order_manage/order_6.png
index 1f608ed..1d9bce4 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_6.png and b/src/subpackage/order/static/images/order_manage/order_6.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_7.png b/src/subpackage/order/static/images/order_manage/order_7.png
index 9c83b57..28588f2 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_7.png and b/src/subpackage/order/static/images/order_manage/order_7.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_8.png b/src/subpackage/order/static/images/order_manage/order_8.png
index 04c623f..271504c 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_8.png and b/src/subpackage/order/static/images/order_manage/order_8.png differ
diff --git a/src/subpackage/order/static/images/order_manage/order_9.png b/src/subpackage/order/static/images/order_manage/order_9.png
index 7bdd3a0..884cb9e 100644
Binary files a/src/subpackage/order/static/images/order_manage/order_9.png and b/src/subpackage/order/static/images/order_manage/order_9.png differ
diff --git a/src/subpackage/order/static/images/selected.png b/src/subpackage/order/static/images/selected.png
index 12ad01b..8cf6f6f 100644
Binary files a/src/subpackage/order/static/images/selected.png and b/src/subpackage/order/static/images/selected.png differ