From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/components/business/billDetail.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/business/billDetail.vue b/admin/src/components/business/billDetail.vue
index 7b9c974..6511742 100644
--- a/admin/src/components/business/billDetail.vue
+++ b/admin/src/components/business/billDetail.vue
@@ -12,11 +12,24 @@
>
<el-table-column prop="openid" label="鐢ㄦ埛" min-width="100px" align="center"></el-table-column>
<el-table-column prop="code" label="璁㈠崟缂栧彿" min-width="100px" align="center"></el-table-column>
+ <el-table-column label="璁㈠崟绫诲瀷" min-width="100px" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.bikeType === 1">濂楅璁㈠崟</span>
+ <span v-else-if="scope.row.bikeType === 3">鑷杞﹁鍗�</span>
+ <span v-else-if="scope.row.bikeType === 4">鐢靛姩杞﹁鍗�</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
<el-table-column prop="payDate" label="鏀粯鏃堕棿" min-width="100px" align="center"></el-table-column>
<el-table-column prop="money" label="鏀粯閲戦" width="80px" align="center"></el-table-column>
<el-table-column prop="refundDate" label="閫�娆炬椂闂�" width="150px" align="center"></el-table-column>
<el-table-column prop="refundMoney" label="閫�娆鹃噾棰�" width="80px" align="center"></el-table-column>
- <el-table-column prop="closeMoney" label="缁撶畻閲戦" width="80px" align="center"></el-table-column>
+ <el-table-column label="缁撶畻閲戦" width="80px" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.bikeType === 1">-</span>
+ <span v-else>{{scope.row.closeMoney}}</span>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
--
Gitblit v1.9.3