From 658107c8a09e2ef74bab1ad7114eeaf367848a25 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 七月 2026 18:14:16 +0800
Subject: [PATCH] Merge branch '3.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 3.0.1
---
admin/src/views/business/wxBill.vue | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/wxBill.vue b/admin/src/views/business/wxBill.vue
index ad11cba..2167718 100644
--- a/admin/src/views/business/wxBill.vue
+++ b/admin/src/views/business/wxBill.vue
@@ -13,6 +13,10 @@
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
@change="selectDate"
></el-date-picker>
+ <el-button-group class="date-shortcuts">
+ <el-button size="mini" @click="setDateRange(7)">杩�7澶�</el-button>
+ <el-button size="mini" @click="setDateRange(30)">杩�30澶�</el-button>
+ </el-button-group>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -55,6 +59,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 +82,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"
@@ -107,7 +116,6 @@
startDate: ''
},
sumData: {
-
},
pickerOptions: {}
}
@@ -145,6 +153,23 @@
this.searchForm.startDate = v[0]
this.searchForm.endDate = v[1]
}
+ this.search()
+ },
+ setDateRange (days) {
+ const end = new Date()
+ end.setHours(23, 59, 59, 999)
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * (days - 1))
+ start.setHours(0, 0, 0, 0)
+ const formatDate = (date) => {
+ const y = date.getFullYear()
+ const m = String(date.getMonth() + 1).padStart(2, '0')
+ const d = String(date.getDate()).padStart(2, '0')
+ return `${y}-${m}-${d}`
+ }
+ this.value1 = [`${formatDate(start)} 00:00:00`, `${formatDate(end)} 00:00:00`]
+ this.searchForm.startDate = this.value1[0]
+ this.searchForm.endDate = this.value1[1]
this.search()
},
// 椤电爜鍙樻洿澶勭悊
@@ -197,4 +222,7 @@
}
}
}
+.date-shortcuts {
+ margin-left: 10px;
+}
</style>
--
Gitblit v1.9.3