yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复结账金额和后台类型

Browse Source
This commit is contained in:
yml
2026-05-27 10:28:05 +08:00
parent 6fb5de204c
commit c54e3936ab
7 changed files with 311 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/account/OrderDetailView.vue
+8 -8
View File
@@ -550,7 +550,7 @@ function linesToList(value: string) {
<div class="checkout-resource-panel panel-action">
<div class="checkout-resource-head">
<strong>额外消耗品</strong>
<span>金额合计：¥{{ money(resourceChargeAmount) }}</span>
<span>已用金额：¥{{ money(resourceChargeAmount) }}</span>
</div>
<el-empty v-if="checkoutResources.length === 0" description="订单快照中暂无额外消耗品" />
<div v-for="item in checkoutResources" v-else :key="item.key" class="checkout-resource-row">
@@ -573,7 +573,7 @@ function linesToList(value: string) {
<el-input-number v-model="checkoutForm.coin_consumed_m" class="full-control" :min="0" :max="snapshotHafCoinM" :precision="2" controls-position="right" />
<span class="field-hint">订单快照 {{ quantity(snapshotHafCoinM) }}M，预计剩余 {{ quantity(remainingHafCoinM) }}M</span>
</el-form-item>
<el-form-item label="其他扣款（元）">
<el-form-item label="其他押金扣款（元）">
<el-input-number v-model="checkoutForm.other_amount" class="full-control" :min="0" :precision="0" controls-position="right" />
</el-form-item>
</el-form>
@@ -589,10 +589,10 @@ function linesToList(value: string) {
<div v-if="order && order.checkout && ['pending_checkout_confirm', 'pending_checkout_accept'].includes(order.status)" class="order-panel">
<h2>结账明细</h2>
<p>{{ orderAmountLabel }}：¥{{ money(order.checkout.display_amount) }}，押金：¥{{ money(order.checkout.deposit_amount) }}</p>
<p>额外消耗品金额：¥{{ money(order.checkout.consumable_amount) }}，押金扣除：¥{{ money(order.checkout.deposit_deduct_amount) }}</p>
<p v-if="isRenter">退还租客：¥{{ money(order.checkout.renter_refund_amount) }}</p>
<p v-if="isOwner">号主收入：¥{{ money(order.checkout.owner_income_amount) }}</p>
<p>实际结算租金：¥{{ money(order.checkout.display_amount) }}，预收押金：¥{{ money(order.checkout.deposit_amount) }}</p>
<p>额外消耗品已用：¥{{ money(order.checkout.consumable_amount) }}，押金赔付扣除：¥{{ money(order.checkout.deposit_deduct_amount) }}</p>
<p v-if="isRenter">退还租客（未使用租金 + 剩余押金）：¥{{ money(order.checkout.renter_refund_amount) }}</p>
<p v-if="isOwner">号主最终收入（租金 + 押金赔付）：¥{{ money(order.checkout.owner_income_amount) }}</p>
<p v-if="order.checkout.content">说明：{{ order.checkout.content }}</p>
<p v-if="order.checkout.owner_adjustment_reason">修正原因：{{ order.checkout.owner_adjustment_reason }}</p>
</div>
@@ -604,13 +604,13 @@ function linesToList(value: string) {
<h2 class="panel-action">修改结账</h2>
<el-form class="form-grid" label-position="top">
<el-form-item label="额外消耗品金额（已含租金）">
<el-form-item label="额外消耗品已用金额">
<el-input-number v-model="counterForm.consumable_amount" class="full-control" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="消耗哈夫币（M）">
<el-input-number v-model="counterForm.coin_consumed_m" class="full-control" :min="0" :precision="2" controls-position="right" />
</el-form-item>
<el-form-item label="其他扣款（元）">
<el-form-item label="其他押金扣款（元）">
<el-input-number v-model="counterForm.other_amount" class="full-control" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="押金扣除（元）">