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

[Snow Team] frontend-fixer: auto-commit work

Browse Source
This commit is contained in:
yml
2026-06-09 16:33:54 +08:00
parent f5b38ff772
commit aa71532a05
10 changed files with 237 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/features/admin/api/adminWallet.ts
+2 -2
View File
@@ -12,8 +12,8 @@ export interface AdminWalletLedger {
order_id?: number
order_no: string
direction: LedgerDirection
amount: number
balance_after: number
amount_cent: number
balance_after_cent: number
balance_type: BalanceType
biz_type: string
biz_no: string
frontend/src/features/admin/api/adminWithdrawal.ts
+3 -3
View File
@@ -9,9 +9,9 @@ export interface WithdrawalDetail {
user_id: number
user_nickname: string
user_phone: string
amount: number
fee: number
actual_amount: number
amount_cent: number
fee_cent: number
actual_amount_cent: number
payment_account_id: number | null
account_type: string
account_name: string
frontend/src/features/admin/components/WithdrawalDetailDialog.vue
+5 -5
View File
@@ -4,7 +4,7 @@ import { ref } from 'vue'
import type { WithdrawalDetail } from '@/features/admin/api/adminWithdrawal'
import { reviewWithdrawal, confirmPayment } from '@/features/admin/api/adminWithdrawal'
import { formatMoney } from '@/shared/utils/money'
import { formatCent } from '@/shared/utils/money'
const props = defineProps<{
modelValue: boolean
@@ -161,15 +161,15 @@ function accountTypeLabel(type: string) {
<el-descriptions :column="2" border>
<el-descriptions-item label="提现金额">
<span style="color: #f56c6c; font-weight: 600; font-size: 16px">
¥{{ formatMoney(withdrawal.amount) }}
¥{{ formatCent(withdrawal.amount_cent) }}
</span>
</el-descriptions-item>
<el-descriptions-item label="手续费">
¥{{ formatMoney(withdrawal.fee) }}
¥{{ formatCent(withdrawal.fee_cent) }}
</el-descriptions-item>
<el-descriptions-item label="实际到账" :span="2">
<span style="color: #67c23a; font-weight: 600; font-size: 16px">
¥{{ formatMoney(withdrawal.actual_amount) }}
¥{{ formatCent(withdrawal.actual_amount_cent) }}
</span>
</el-descriptions-item>
</el-descriptions>
@@ -274,7 +274,7 @@ function accountTypeLabel(type: string) {
>
<template #title>
<div style="font-size: 13px">
请手动转账 <strong>¥{{ formatMoney(withdrawal.actual_amount) }}</strong> 到用户收款账号，
请手动转账 <strong>¥{{ formatCent(withdrawal.actual_amount_cent) }}</strong> 到用户收款账号，
完成后点击"确认打款"按钮。
</div>
</template>
frontend/src/features/admin/views/AdminWalletLedgerView.vue
+9 -9
View File
@@ -3,7 +3,7 @@ import { Search } from '@element-plus/icons-vue'
import { computed, onMounted, reactive, ref } from 'vue'
import { fetchAdminWalletLedger, type AdminWalletLedger } from '@/features/admin/api/adminWallet'
import { formatMoneyWithSymbol } from '@/shared/utils/money'
import { formatCentWithSymbol } from '@/shared/utils/money'
import { balanceTypeLabel, ledgerDirectionLabel } from '@/utils/statusLabels'
import { formatDateTime } from '@/utils/time'
import AdminTablePagination from '../components/AdminTablePagination.vue'
@@ -22,12 +22,12 @@ const filters = reactive({
const inAmount = computed(() =>
ledger.value
.filter(item => item.direction === 'in')
.reduce((sum, item) => sum + Number(item.amount || 0), 0)
.reduce((sum, item) => sum + Number(item.amount_cent || 0), 0)
)
const outAmount = computed(() =>
ledger.value
.filter(item => item.direction === 'out')
.reduce((sum, item) => sum + Number(item.amount || 0), 0)
.reduce((sum, item) => sum + Number(item.amount_cent || 0), 0)
)
onMounted(loadLedger)
@@ -64,8 +64,8 @@ async function handlePageChange() {
await loadLedger()
}
function money(value: number) {
return formatMoneyWithSymbol(value)
function moneyCent(value: number) {
return formatCentWithSymbol(value)
}
function directionType(direction: string) {
@@ -102,11 +102,11 @@ function directionLabel(direction: string) {
</div>
<div class="metric-card">
<span>入账合计</span>
<strong>{{ money(inAmount) }}</strong>
<strong>{{ moneyCent(inAmount) }}</strong>
</div>
<div class="metric-card">
<span>出账合计</span>
<strong>{{ money(outAmount) }}</strong>
<strong>{{ moneyCent(outAmount) }}</strong>
</div>
</div>
@@ -149,13 +149,13 @@ function directionLabel(direction: string) {
</template>
</el-table-column>
<el-table-column label="金额" width="110">
<template #default="{ row }">{{ money(Number(row.amount)) }}</template>
<template #default="{ row }">{{ moneyCent(Number(row.amount_cent)) }}</template>
</el-table-column>
<el-table-column label="余额类型" width="110">
<template #default="{ row }">{{ balanceTypeLabel(row.balance_type) }}</template>
</el-table-column>
<el-table-column label="变化后余额" width="130">
<template #default="{ row }">{{ money(Number(row.balance_after)) }}</template>
<template #default="{ row }">{{ moneyCent(Number(row.balance_after_cent)) }}</template>
</el-table-column>
<el-table-column label="创建时间" min-width="180">
<template #default="{ row }">{{ formatDateTime(row.created_at) }}</template>
frontend/src/features/admin/views/AdminWithdrawalsView.vue
+2 -2
View File
@@ -8,7 +8,7 @@ import {
confirmPayment,
type WithdrawalDetail,
} from '@/features/admin/api/adminWithdrawal'
import { formatMoney } from '@/shared/utils/money'
import { formatCent } from '@/shared/utils/money'
import WithdrawalDetailDialog from '../components/WithdrawalDetailDialog.vue'
@@ -220,7 +220,7 @@ function onDetailDialogSaved() {
</el-table-column>
<el-table-column label="提现金额" width="120" align="right">
<template #default="{ row }">
<span style="color: #f56c6c; font-weight: 600"> ¥{{ formatMoney(row.amount) }} </span>
<span style="color: #f56c6c; font-weight: 600"> ¥{{ formatCent(row.amount_cent) }} </span>
</template>
</el-table-column>
<el-table-column label="收款方式" min-width="180">
frontend/src/features/orders/api/orders.ts
+165 -30
View File
@@ -1,5 +1,5 @@
import { apiClient } from '@/shared/api/client'
import type { ApiResponse } from '@/shared/types/types'
import type { ApiResponse, PaginatedResult } from '@/shared/types/types'
import type { HandoffStatus, OrderStatus, SettlementStatus } from '@/shared/types/status'
export interface Order {
@@ -19,12 +19,26 @@ export interface Order {
estimated_duration_hours: number
price_role?: 'renter' | 'owner' | 'admin' | string
display_amount_cent: number
/** @deprecated use display_amount_cent */
display_amount?: number
rent_amount_cent?: number
/** @deprecated use rent_amount_cent */
rent_amount?: number
owner_rent_amount_cent?: number
/** @deprecated use owner_rent_amount_cent */
owner_rent_amount?: number
deposit_amount_cent: number
/** @deprecated use deposit_amount_cent */
deposit_amount?: number
deposit_original_amount_cent: number
/** @deprecated use deposit_original_amount_cent */
deposit_original_amount?: number
deposit_waived_amount_cent: number
/** @deprecated use deposit_waived_amount_cent */
deposit_waived_amount?: number
platform_fee_cent?: number
/** @deprecated use platform_fee_cent */
platform_fee?: number
account_snapshot?: Record<string, unknown>
listing_snapshot?: string
checkout_info?: string
@@ -45,16 +59,34 @@ export interface Checkout {
status: SettlementStatus
price_role?: 'renter' | 'owner' | 'admin' | string
display_amount_cent: number
/** @deprecated use display_amount_cent */
display_amount?: number
rent_amount_cent?: number
/** @deprecated use rent_amount_cent */
rent_amount?: number
owner_rent_amount_cent?: number
/** @deprecated use owner_rent_amount_cent */
owner_rent_amount?: number
platform_fee_cent?: number
deposit_amount_cent: number
/** @deprecated use deposit_amount_cent */
deposit_amount?: number
consumable_amount_cent: number
/** @deprecated use consumable_amount_cent */
consumable_amount?: number
coin_consumed_m: number
other_amount_cent: number
/** @deprecated use other_amount_cent */
other_amount?: number
deposit_deduct_amount_cent: number
/** @deprecated use deposit_deduct_amount_cent */
deposit_deduct_amount?: number
renter_refund_amount_cent?: number
/** @deprecated use renter_refund_amount_cent */
renter_refund_amount?: number
owner_income_amount_cent?: number
/** @deprecated use owner_income_amount_cent */
owner_income_amount?: number
content: string
evidence_urls: string[]
owner_adjustment_reason: string
@@ -98,13 +130,37 @@ export interface PaymentOrder {
updated_at: string
}
// API functions below remain the same, TypeScript will catch any mismatches
export interface CheckoutPayload {
consumable_amount: number
coin_consumed_m: number
other_amount: number
deposit_deduct_amount?: number
content: string
evidence_urls: string[]
reason?: string
}
export interface RefundStatus {
order_id: number
order_no: string
refund_status: string
refund_amount_cent: number
refunded_at?: string
total_amount_cent: number
}
export interface AdminActionResponse {
updated?: boolean
closed?: boolean
refunded?: boolean
}
export async function fetchOrders() {
const { data } = await apiClient.get<ApiResponse<Order[]>>('/orders')
return data.data
}
export async function fetchOrder(id: number) {
export async function fetchOrder(id: string | number) {
const { data } = await apiClient.get<ApiResponse<Order>>(`/orders/${id}`)
return data.data
}
@@ -119,53 +175,132 @@ export async function cancelOrder(id: number) {
return data.data
}
export async function startPayment(orderId: number, payWay: string, jsPayFlag?: string) {
const { data } = await apiClient.post<ApiResponse<PaymentOrder>>(`/orders/${orderId}/pay`, {
pay_way: payWay,
jspay_flag: jsPayFlag || '',
})
export async function fetchHandoffRecords(id: string | number) {
const { data } = await apiClient.get<ApiResponse<HandoffRecord[]>>(`/orders/${id}/handoff-records`)
return data.data ?? []
}
export async function submitHandoff(id: number, content: string) {
const { data } = await apiClient.post<ApiResponse<HandoffRecord>>(`/orders/${id}/handoff`, { content })
return data.data
}
export async function queryPayment(orderId: number) {
const { data } = await apiClient.post<ApiResponse<PaymentOrder>>(`/orders/${orderId}/pay/query`)
return data.data
}
export async function confirmHandoff(orderId: number, type: string, content: string) {
export async function confirmReceive(id: number) {
const { data } = await apiClient.post<ApiResponse<{ confirmed: boolean }>>(
`/orders/${orderId}/handoff/${type}/confirm`,
{ content }
`/orders/${id}/confirm-receive`
)
return data.data
}
export async function createCheckout(
export async function startOrderPayment(
orderId: number,
payload: {
consumable_amount: number
coin_consumed_m: number
other_amount: number
deposit_deduct_amount: number
content: string
evidence_urls: string[]
}
options: { pay_way?: string; jspay_flag?: string } = {}
) {
const { data } = await apiClient.post<ApiResponse<PaymentOrder>>(
`/orders/${orderId}/start-payment`,
{
pay_way: options.pay_way || '',
jspay_flag: options.jspay_flag || '',
}
)
return data.data
}
export async function queryOrderPayment(orderId: number) {
const { data } = await apiClient.get<ApiResponse<PaymentOrder>>(`/orders/${orderId}/query-payment`)
return data.data
}
export async function submitCheckout(orderId: number, payload: CheckoutPayload) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(`/orders/${orderId}/checkout`, payload)
return data.data
}
export async function confirmCheckout(orderId: number) {
const { data } = await apiClient.post<ApiResponse<{ confirmed: boolean }>>(
`/orders/${orderId}/checkout/confirm`
)
return data.data
}
export async function acceptCheckout(orderId: number) {
const { data } = await apiClient.post<ApiResponse<{ accepted: boolean }>>(`/orders/${orderId}/checkout/accept`)
const { data } = await apiClient.post<ApiResponse<{ accepted: boolean }>>(
`/orders/${orderId}/checkout/accept`
)
return data.data
}
export async function rejectCheckout(orderId: number) {
const { data } = await apiClient.post<ApiResponse<{ rejected: boolean }>>(`/orders/${orderId}/checkout/reject`)
export async function rejectCheckout(orderId: number, reason?: string) {
const { data } = await apiClient.post<ApiResponse<{ rejected: boolean }>>(
`/orders/${orderId}/checkout/reject`,
{ reason: reason || '' }
)
return data.data
}
export async function counterCheckout(orderId: number, checkoutId: number) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(`/orders/${orderId}/checkout/${checkoutId}/counter`)
export async function counterCheckout(orderId: number, payload: CheckoutPayload) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(
`/orders/${orderId}/checkout/counter`,
payload
)
return data.data
}
export async function fetchAdminOrders(page = 1, pageSize = 20) {
const { data } = await apiClient.get<ApiResponse<PaginatedResult<Order>>>('/admin/orders', {
params: { page, page_size: pageSize },
})
const result = data.data
return {
items: Array.isArray(result?.items) ? result.items : [],
total: Number(result?.total ?? 0),
page: Number(result?.page ?? page),
page_size: Number(result?.page_size ?? pageSize),
}
}
export async function fetchAdminOrder(id: string | number) {
const { data } = await apiClient.get<ApiResponse<Order>>(`/admin/orders/${id}`)
return data.data
}
export async function fetchAdminHandoffRecords(id: string | number) {
const { data } = await apiClient.get<ApiResponse<HandoffRecord[]>>(
`/admin/orders/${id}/handoff-records`
)
return data.data ?? []
}
export async function adminCloseOrder(id: number, reason: string) {
const { data } = await apiClient.post<ApiResponse<AdminActionResponse>>(`/admin/orders/${id}/close`, {
reason,
})
return data.data
}
export async function adminMarkOrderAbnormal(id: number, reason: string) {
const { data } = await apiClient.post<ApiResponse<AdminActionResponse>>(
`/admin/orders/${id}/mark-abnormal`,
{ reason }
)
return data.data
}
export async function adminRefundOrder(id: number) {
const { data } = await apiClient.post<ApiResponse<RefundStatus>>(`/admin/orders/${id}/refund`)
return data.data
}
export async function adminRefundStatus(id: number) {
const { data } = await apiClient.get<ApiResponse<RefundStatus>>(
`/admin/orders/${id}/refund-status`
)
return data.data
}
// Backward-compatible names kept for existing pages/composables.
export const startPayment = (orderId: number, payWay: string, jsPayFlag?: string) =>
startOrderPayment(orderId, { pay_way: payWay, jspay_flag: jsPayFlag })
export const queryPayment = queryOrderPayment
export const createCheckout = submitCheckout
export const confirmHandoff = confirmReceive
frontend/src/features/orders/views/MobileOrderDetailView.vue
+16 -16
View File
@@ -6,7 +6,7 @@ import { showToast, showDialog } from 'vant'
import { fetchOrderChat } from '@/features/chats/api/chats'
import { createDispute } from '@/features/disputes/api/disputes'
import { uploadFile } from '@/shared/api/files'
import { formatMoney } from '@/shared/utils/money'
import { centToYuan, formatMoney } from '@/shared/utils/money'
import {
acceptCheckout,
cancelOrder,
@@ -555,15 +555,15 @@ function formatHandoffRecordType(type: string) {
function orderRentAmount(item: Order) {
if (item.owner_id === session.userId)
return Number(item.owner_rent_amount ?? item.display_amount ?? 0)
if (item.renter_id === session.userId) return Number(item.rent_amount ?? item.display_amount ?? 0)
return Number(item.display_amount ?? 0)
return centToYuan(item.owner_rent_amount_cent ?? item.display_amount_cent)
if (item.renter_id === session.userId) return centToYuan(item.rent_amount_cent ?? item.display_amount_cent)
return centToYuan(item.display_amount_cent)
}
function ownerActualIncome(item: Order) {
if (item.owner_id !== session.userId) return null
const value = item.checkout?.owner_income_amount
return typeof value === 'number' ? value : null
const value = item.checkout?.owner_income_amount_cent
return typeof value === 'number' ? centToYuan(value) : null
}
function quantity(value: unknown) {
@@ -676,9 +676,9 @@ async function copyListingCode() {
</div>
<div class="meta-item">
<span class="meta-label">押金</span>
<strong class="meta-value">¥{{ money(order.deposit_amount) }}</strong>
<span v-if="order.deposit_waived_amount > 0" class="meta-note"
>已免押 ¥{{ money(order.deposit_waived_amount) }}</span
<strong class="meta-value">¥{{ money(centToYuan(order.deposit_amount_cent)) }}</strong>
<span v-if="order.deposit_waived_amount_cent > 0" class="meta-note"
>已免押 ¥{{ money(centToYuan(order.deposit_waived_amount_cent)) }}</span
>
</div>
<div class="meta-item">
@@ -929,30 +929,30 @@ async function copyListingCode() {
>
<h3 class="section-title">结账结算账单</h3>
<van-cell-group inset :border="false">
<van-cell title="实际结算租金" :value="`¥${money(order.checkout.display_amount)}`" />
<van-cell title="实际结算租金" :value="`¥${money(centToYuan(order.checkout.display_amount_cent))}`" />
<van-cell
title="押金总额"
:label="
order.deposit_waived_amount > 0 ? `已免押 ¥${money(order.deposit_waived_amount)}` : ''
order.deposit_waived_amount_cent > 0 ? `已免押 ¥${money(centToYuan(order.deposit_waived_amount_cent))}` : ''
"
:value="`¥${money(order.checkout.deposit_amount)}`"
:value="`¥${money(centToYuan(order.checkout.deposit_amount_cent))}`"
/>
<van-cell title="额外消耗品已用" :value="`¥${money(order.checkout.consumable_amount)}`" />
<van-cell title="额外消耗品已用" :value="`¥${money(centToYuan(order.checkout.consumable_amount_cent))}`" />
<van-cell
title="押金赔付扣除"
:value="`¥${money(order.checkout.deposit_deduct_amount)}`"
:value="`¥${money(centToYuan(order.checkout.deposit_deduct_amount_cent))}`"
value-class="red-text"
/>
<van-cell
v-if="isRenter"
title="退还租客"
:value="`¥${money(order.checkout.renter_refund_amount)}`"
:value="`¥${money(centToYuan(order.checkout.renter_refund_amount_cent))}`"
value-class="green-text"
/>
<van-cell
v-if="isOwner"
title="号主最终收入"
:value="`¥${money(order.checkout.owner_income_amount)}`"
:value="`¥${money(centToYuan(order.checkout.owner_income_amount_cent))}`"
value-class="green-text"
/>
<van-cell
frontend/src/features/orders/views/MobileOrdersView.vue
+8 -8
View File
@@ -10,7 +10,7 @@ import {
type Order,
type PaymentOrder,
} from '@/features/orders/api/orders'
import { formatMoney } from '@/shared/utils/money'
import { centToYuan, formatMoney } from '@/shared/utils/money'
import { useSessionStore } from '@/stores/session'
import { formatDateMinute } from '@/utils/time'
import { formatListingNo } from '@/utils/listingDisplay'
@@ -132,14 +132,14 @@ function amountLabel(order: Order) {
}
function orderRentAmount(order: Order) {
if (isOwner(order)) return Number(order.owner_rent_amount ?? order.display_amount ?? 0)
return Number(order.rent_amount ?? order.display_amount ?? 0)
if (isOwner(order)) return centToYuan(order.owner_rent_amount_cent ?? order.display_amount_cent)
return centToYuan(order.rent_amount_cent ?? order.display_amount_cent)
}
function ownerActualIncome(order: Order) {
if (!isOwner(order)) return null
const value = order.checkout?.owner_income_amount
return typeof value === 'number' ? value : null
const value = order.checkout?.owner_income_amount_cent
return typeof value === 'number' ? centToYuan(value) : null
}
function formatListingCode(order: Order) {
@@ -232,9 +232,9 @@ async function copyListingCode(order: Order) {
<div class="price-item">
<span class="price-label">押金金额</span>
<span class="price-val deposit">
¥{{ money(order.deposit_amount) }}
<em v-if="order.deposit_waived_amount > 0"
>免 ¥{{ money(order.deposit_waived_amount) }}</em
¥{{ money(centToYuan(order.deposit_amount_cent)) }}
<em v-if="order.deposit_waived_amount_cent > 0"
>免 ¥{{ money(centToYuan(order.deposit_waived_amount_cent)) }}</em
>
</span>
</div>
frontend/src/features/orders/views/OrderDetailView.vue
+18 -18
View File
@@ -8,7 +8,7 @@ import QRCode from 'qrcode'
import { fetchOrderChat } from '@/features/chats/api/chats'
import { createDispute } from '@/features/disputes'
import { uploadFile } from '@/shared/api/files'
import { formatMoney } from '@/shared/utils/money'
import { centToYuan, formatMoney } from '@/shared/utils/money'
import {
acceptCheckout,
cancelOrder,
@@ -602,15 +602,15 @@ function money(value: unknown) {
function orderRentAmount(item: Order) {
if (item.owner_id === session.userId)
return Number(item.owner_rent_amount ?? item.display_amount ?? 0)
if (item.renter_id === session.userId) return Number(item.rent_amount ?? item.display_amount ?? 0)
return Number(item.display_amount ?? 0)
return centToYuan(item.owner_rent_amount_cent ?? item.display_amount_cent)
if (item.renter_id === session.userId) return centToYuan(item.rent_amount_cent ?? item.display_amount_cent)
return centToYuan(item.display_amount_cent)
}
function ownerActualIncome(item: Order) {
if (item.owner_id !== session.userId) return null
const value = item.checkout?.owner_income_amount
return typeof value === 'number' ? value : null
const value = item.checkout?.owner_income_amount_cent
return typeof value === 'number' ? centToYuan(value) : null
}
function quantity(value: unknown) {
@@ -767,9 +767,9 @@ async function copyListingCode() {
</div>
<div class="metric-card">
<span class="metric-label">押金</span>
<strong class="metric-value">¥{{ money(order.deposit_amount) }}</strong>
<span v-if="order.deposit_waived_amount > 0" class="metric-note"
>已免押 ¥{{ money(order.deposit_waived_amount) }}</span
<strong class="metric-value">¥{{ money(centToYuan(order.deposit_amount_cent)) }}</strong>
<span v-if="order.deposit_waived_amount_cent > 0" class="metric-note"
>已免押 ¥{{ money(centToYuan(order.deposit_waived_amount_cent)) }}</span
>
</div>
</div>
@@ -951,32 +951,32 @@ async function copyListingCode() {
<div class="checkout-summary-card">
<div class="summary-row">
<span>实际结算租金</span>
<strong>¥{{ money(order.checkout.display_amount) }}</strong>
<strong>¥{{ money(centToYuan(order.checkout.display_amount_cent)) }}</strong>
</div>
<div class="summary-row">
<span>预收押金</span>
<strong>
¥{{ money(order.checkout.deposit_amount) }}
<em v-if="order.deposit_waived_amount > 0"
>已免押 ¥{{ money(order.deposit_waived_amount) }}</em
¥{{ money(centToYuan(order.checkout.deposit_amount_cent)) }}
<em v-if="order.deposit_waived_amount_cent > 0"
>已免押 ¥{{ money(centToYuan(order.deposit_waived_amount_cent)) }}</em
>
</strong>
</div>
<div class="summary-row">
<span>额外消耗品已用</span>
<strong class="warning">¥{{ money(order.checkout.consumable_amount) }}</strong>
<strong class="warning">¥{{ money(centToYuan(order.checkout.consumable_amount_cent)) }}</strong>
</div>
<div class="summary-row">
<span>押金赔付扣除</span>
<strong class="warning">¥{{ money(order.checkout.deposit_deduct_amount) }}</strong>
<strong class="warning">¥{{ money(centToYuan(order.checkout.deposit_deduct_amount_cent)) }}</strong>
</div>
<div v-if="isRenter" class="summary-row highlight">
<span>退还租客（未使用租金 + 剩余押金）</span>
<strong class="amount">¥{{ money(order.checkout.renter_refund_amount) }}</strong>
<strong class="amount">¥{{ money(centToYuan(order.checkout.renter_refund_amount_cent)) }}</strong>
</div>
<div v-if="isOwner" class="summary-row highlight">
<span>号主最终收入（租金 + 押金赔付）</span>
<strong class="amount">¥{{ money(order.checkout.owner_income_amount) }}</strong>
<strong class="amount">¥{{ money(centToYuan(order.checkout.owner_income_amount_cent)) }}</strong>
</div>
<div v-if="order.checkout.content" class="summary-note">
<label>说明：</label>
@@ -1031,7 +1031,7 @@ async function copyListingCode() {
v-model="counterForm.deposit_deduct_amount"
class="full-control"
:min="0"
:max="order.deposit_amount"
:max="centToYuan(order.deposit_amount_cent)"
:precision="0"
controls-position="right"
/>
frontend/src/features/orders/views/OrdersView.vue
+9 -9
View File
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router'
import { CopyDocument, Search } from '@element-plus/icons-vue'
import { fetchOrders, type Order } from '@/features/orders'
import { formatMoney } from '@/shared/utils/money'
import { centToYuan, formatMoney } from '@/shared/utils/money'
import { useSessionStore } from '@/stores/session'
import { orderStatusLabel } from '@/utils/statusLabels'
import { formatDateTime } from '@/utils/time'
@@ -128,15 +128,15 @@ function amountLabel(order: Order) {
}
function orderRentAmount(order: Order) {
if (isOwner(order)) return Number(order.owner_rent_amount ?? order.display_amount ?? 0)
if (isRenter(order)) return Number(order.rent_amount ?? order.display_amount ?? 0)
return Number(order.display_amount ?? 0)
if (isOwner(order)) return centToYuan(order.owner_rent_amount_cent ?? order.display_amount_cent)
if (isRenter(order)) return centToYuan(order.rent_amount_cent ?? order.display_amount_cent)
return centToYuan(order.display_amount_cent)
}
function ownerActualIncome(order: Order) {
if (!isOwner(order)) return null
const value = order.checkout?.owner_income_amount
return typeof value === 'number' ? value : null
const value = order.checkout?.owner_income_amount_cent
return typeof value === 'number' ? centToYuan(value) : null
}
function money(value: unknown) {
@@ -351,9 +351,9 @@ function getCountdownMinutes(order: Order) {
<div class="meta-row">
<span class="meta-label">押金</span>
<span class="meta-value">
¥{{ money(order.deposit_amount) }}
<em v-if="order.deposit_waived_amount > 0"
>免 ¥{{ money(order.deposit_waived_amount) }}</em
¥{{ money(centToYuan(order.deposit_amount_cent)) }}
<em v-if="order.deposit_waived_amount_cent > 0"
>免 ¥{{ money(centToYuan(order.deposit_waived_amount_cent)) }}</em
>
</span>
</div>