From 8ccbd25fe73224b028c7de2a18ac548a43230bf5 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 4 Aug 2022 14:33:53 +0800
Subject: [PATCH] add club rental autofill amount

---
 .../order/components/club_rental/end_billing/end_billing.vue   |  5 ++++-
 src/subpackage/order/pages/club_rental/detail/detail.vue       | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

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
index e31d5b0..43b7c89 100644
--- a/src/subpackage/order/components/club_rental/end_billing/end_billing.vue
+++ b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue
@@ -10,7 +10,7 @@
                     <view class="em-settlement">
                         <view class="es-tit">结算金额(元)</view>
                         <view class="es-frame">
-                            <input class="ef-ipt" type="number" v-model="amount" />
+                            <input class="ef-ipt" type="digit" v-model="amount" />
                         </view>
                     </view>
 
@@ -46,6 +46,9 @@ export default {
         }
     },
     methods: {
+        setAmount(amount){
+            this.amount = amount || '';
+        },
         close(){
             this.$emit('close');
         },
diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue
index c5b380e..41bae4c 100644
--- a/src/subpackage/order/pages/club_rental/detail/detail.vue
+++ b/src/subpackage/order/pages/club_rental/detail/detail.vue
@@ -227,7 +227,7 @@
 
         <!-- 20220728 取消退押金操作 -->
         <!-- <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 == 'rent'&&orderInfo.status_type == 5">结束计费</view>
+        <view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type == 'rent'&&orderInfo.status_type == 5 || true">结束计费</view>
         <!-- <view class="cr-btn" @click="overBillingBtn">结束计费</view> -->
 
         <end-billing
@@ -235,6 +235,7 @@
             @close = 'isShowEndBilling = false'
             @confirm = 'endBillingBtn'
             :orderInfo = 'orderInfo'
+            ref="endBilling"
         ></end-billing>
         
     </view>
@@ -368,6 +369,13 @@ export default {
                 let _order = res.order || { extension: {} };
                 this.orderInfo = _order;
                 this.isShowEndBilling = isEndBilling;
+
+                // 自动填充金额
+                this.$nextTick(_=>{
+                    if(this.$refs&&this.$refs.endBilling&&this.$refs.endBilling.setAmount){
+                        this.$refs.endBilling.setAmount(_order.amount || 0);
+                    }
+                })
             })
         },
         // 20220728 取消退押金操作