From 5b1b663f77cb59599302a93fb6cb2da208602c34 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 三月 2025 14:26:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/business/wxBill.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/wxBill.vue b/admin/src/views/business/wxBill.vue
index 0f5042d..3f014da 100644
--- a/admin/src/views/business/wxBill.vue
+++ b/admin/src/views/business/wxBill.vue
@@ -55,6 +55,14 @@
<div>缁撶畻閲戦(鍏�)</div>
<div>{{ sumData.total }}</div>
</div>
+ <div class="sum-value">
+ <div>楠戣鏀跺叆(鍏�)</div>
+ <div>{{ sumData.bikeFee }}</div>
+ </div>
+ <div class="sum-value">
+ <div>濂楅鏀跺叆(鍏�)</div>
+ <div>{{ sumData.discountFee }}</div>
+ </div>
</div>
<el-table
v-loading="isWorking.search"
@@ -70,12 +78,9 @@
<el-table-column prop="sumRefundBill" label="閫�娆剧瑪鏁�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="sumRefundFee" label="閫�娆鹃噾棰�(鍏�)" min-width="100px" align="center"></el-table-column>
<el-table-column prop="sumRefundCmmsAmt" label="閫�娆炬墜缁垂(鍏�)" min-width="100px" align="center"></el-table-column>
-
- <!-- <el-table-column prop="sumSuccessFee" label="搴旂粨璁㈠崟鎬婚噾棰�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="sumCouponRefundFee" label="鍏呭�煎埜閫�娆炬�婚噾棰�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="sumApplyRefundFee" label="鐢宠閫�娆炬�婚噾棰�" min-width="100px" align="center"></el-table-column> -->
<el-table-column prop="total" label="缁撶畻閲戦(鍏�)" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="bikeFee" label="鑷杞︽敹鍏�(鍏�)" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="bikeFee" label="楠戣鏀跺叆(鍏�)" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="discountFee" label="濂楅鏀跺叆(鍏�)" min-width="100px" align="center"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
--
Gitblit v1.9.3