vtest 1.1.72 & fix md0612

src/subpackage/order/pages/timekeeping/modules/order_detail/end_billing_modal.vue

@@ -7,7 +7,7 @@
                 <view class="ec-info">
                     <view class="ei-line"><text class="el-txt">操作人：</text>{{ info.operator || '-' }}</view>
                     <view class="ei-line"><text class="el-txt">时长合计：</text>{{ info.duration || '-' }}</view>
-                    <view class="ei-line"><text class="el-txt">金额合计：</text>{{ info.amount || '-' }}</view>
+                    <view class="ei-line"><text class="el-txt">金额合计：</text>{{ info.amount || '0' }}</view>
                 </view>
 
                 <view class="ec-opts">
@@ -77,9 +77,9 @@ export default {
             let { operator, duration, amount, ...opts } = data;
             this.info.operator = operator || '';
             this.info.duration = duration || '';
-            this.info.amount = amount || '';
+            this.info.amount = amount ?? '';
             this.initOptions = opts;
-            if(amount)this.amount = amount;
+            this.amount = amount ?? '';
             this.show();
         },
         async confirmBtn(){

src/subpackage/order/pages/timekeeping/modules/order_list/site.vue

@@ -2,7 +2,7 @@
     <list-item-temp
         :stadium="order.stadium_name || ''"
         :status="order.status_text || ''"
-        :price="order.pay_amount || ''"
+        :price="getPayAmount"
         :status-active="['待支付', '计费中','待使用', '使用中'].includes(order.status_text)"
         :price-show="['待支付', '待使用', '使用中', '已完成', '已失效', '已退款'].includes(order.status_text)"
         @click:item="toDetail"
@@ -52,6 +52,13 @@ export default {
         'kv-line': kvLine,
         'list-item-temp': listItemTemp
     },
+    computed: {
+        getPayAmount(){
+            let { order } = this;
+            if(order?.pay_type_text === '押金抵扣')return order?.deposit_deduction_amount ?? 0
+            return order?.pay_amount ?? 0;
+        },
+    },
     methods: {
         toDetail(){
             let { order } = this;