dachui/hfb_sys
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yml
2026-06-09 17:04:40 +08:00
parent f5b38ff772
commit 42a54b474a
16 changed files with 376 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/features/orders/api/orders.ts
+182 -31
View File
@@ -1,6 +1,7 @@
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'
import { yuanToCent } from '@/shared/utils/money'
export interface Order {
id: number
@@ -25,6 +26,14 @@ export interface Order {
deposit_original_amount_cent: number
deposit_waived_amount_cent: number
platform_fee_cent?: number
// Legacy yuan fields may be present from cached/older API payloads during rollout.
display_amount?: number
rent_amount?: number
owner_rent_amount?: number
deposit_amount?: number
deposit_original_amount?: number
deposit_waived_amount?: number
platform_fee?: number
account_snapshot?: Record<string, unknown>
listing_snapshot?: string
checkout_info?: string
@@ -55,6 +64,16 @@ export interface Checkout {
deposit_deduct_amount_cent: number
renter_refund_amount_cent?: number
owner_income_amount_cent?: number
display_amount?: number
rent_amount?: number
owner_rent_amount?: number
platform_fee?: number
deposit_amount?: number
consumable_amount?: number
other_amount?: number
deposit_deduct_amount?: number
renter_refund_amount?: number
owner_income_amount?: number
content: string
evidence_urls: string[]
owner_adjustment_reason: string
@@ -98,13 +117,77 @@ export interface PaymentOrder {
updated_at: string
}
// API functions below remain the same, TypeScript will catch any mismatches
export interface OrderAgreements {
virtual_asset_purchase: { title: string; content: string }
renter_agreement: { title: string; content: string }
}
export interface PostRentalNotice {
title: string
content: string
}
export interface SubmitCheckoutPayload {
content: string
consumable_amount?: number
coin_consumed_m: number
other_amount?: number
deposit_deduct_amount?: number
evidence_urls: string[]
reason?: string
}
interface SubmitCheckoutRequest {
content: string
consumable_amount_cent?: number
coin_consumed_m: number
other_amount_cent?: number
deposit_deduct_amount_cent?: number
evidence_urls: string[]
reason?: string
}
export interface StartOrderPaymentRequest {
pay_way?: string
jspay_flag?: string
}
export interface RefundStatus {
order_id: number
refund_status: string
refund_amount_cent: number
refund_no?: string
refunded_at?: string
}
function toCheckoutRequest(payload: SubmitCheckoutPayload): SubmitCheckoutRequest {
return {
content: payload.content,
consumable_amount_cent: yuanToCent(payload.consumable_amount),
coin_consumed_m: payload.coin_consumed_m,
other_amount_cent: yuanToCent(payload.other_amount),
deposit_deduct_amount_cent: yuanToCent(payload.deposit_deduct_amount),
evidence_urls: payload.evidence_urls,
reason: payload.reason,
}
}
export async function fetchOrderAgreements() {
const { data } = await apiClient.get<ApiResponse<OrderAgreements>>('/order-agreements')
return data.data
}
export async function fetchPostRentalNotice() {
const { data } = await apiClient.get<ApiResponse<PostRentalNotice>>('/post-rental-notice')
return data.data
}
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,16 +202,8 @@ 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 || '',
})
return data.data
}
export async function queryPayment(orderId: number) {
const { data } = await apiClient.post<ApiResponse<PaymentOrder>>(`/orders/${orderId}/pay/query`)
export async function submitHandoff(id: number, content: string) {
const { data } = await apiClient.post<ApiResponse<HandoffRecord>>(`/orders/${id}/handoffs`, { content })
return data.data
}
@@ -140,32 +215,108 @@ export async function confirmHandoff(orderId: number, type: string, content: str
return data.data
}
export async function createCheckout(
orderId: number,
payload: {
consumable_amount: number
coin_consumed_m: number
other_amount: number
deposit_deduct_amount: number
content: string
evidence_urls: string[]
}
) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(`/orders/${orderId}/checkout`, payload)
export async function fetchHandoffRecords(id: string | number) {
const { data } = await apiClient.get<ApiResponse<HandoffRecord[]>>(`/orders/${id}/handoffs`)
return data.data
}
export async function acceptCheckout(orderId: number) {
const { data } = await apiClient.post<ApiResponse<{ accepted: boolean }>>(`/orders/${orderId}/checkout/accept`)
export async function confirmReceive(id: number) {
const { data } = await apiClient.post<ApiResponse<{ confirmed: boolean }>>(`/orders/${id}/receive`)
return data.data
}
export async function rejectCheckout(orderId: number) {
const { data } = await apiClient.post<ApiResponse<{ rejected: boolean }>>(`/orders/${orderId}/checkout/reject`)
export async function startOrderPayment(orderId: number, req: StartOrderPaymentRequest = {}) {
const { data } = await apiClient.post<ApiResponse<PaymentOrder>>(`/orders/${orderId}/pay`, {
pay_way: req.pay_way || 'wechat',
jspay_flag: req.jspay_flag || '',
})
return data.data
}
export async function counterCheckout(orderId: number, checkoutId: number) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(`/orders/${orderId}/checkout/${checkoutId}/counter`)
export function startPayment(orderId: number, payWay: string, jsPayFlag?: string) {
return startOrderPayment(orderId, { pay_way: payWay, jspay_flag: jsPayFlag || '' })
}
export async function queryOrderPayment(orderId: number) {
const { data } = await apiClient.post<ApiResponse<PaymentOrder>>(`/orders/${orderId}/pay/query`)
return data.data
}
export function queryPayment(orderId: number) {
return queryOrderPayment(orderId)
}
export async function submitCheckout(id: number, payload: SubmitCheckoutPayload) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(
`/orders/${id}/checkout`,
toCheckoutRequest(payload)
)
return data.data
}
export function createCheckout(id: number, payload: SubmitCheckoutPayload) {
return submitCheckout(id, payload)
}
export async function confirmCheckout(id: number) {
const { data } = await apiClient.post<ApiResponse<{ confirmed: boolean }>>(
`/orders/${id}/checkout/confirm`
)
return data.data
}
export async function acceptCheckout(id: number) {
const { data } = await apiClient.post<ApiResponse<{ accepted: boolean }>>(`/orders/${id}/checkout/accept`)
return data.data
}
export async function rejectCheckout(id: number) {
const { data } = await apiClient.post<ApiResponse<{ rejected: boolean }>>(`/orders/${id}/checkout/reject`)
return data.data
}
export async function counterCheckout(id: number, payload: SubmitCheckoutPayload) {
const { data } = await apiClient.post<ApiResponse<Checkout>>(
`/orders/${id}/checkout/counter`,
toCheckoutRequest(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 },
})
return data.data
}
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}/handoffs`)
return data.data
}
export async function adminCloseOrder(id: number, reason: string) {
const { data } = await apiClient.post<ApiResponse<Order>>(`/admin/orders/${id}/close`, { reason })
return data.data
}
export async function adminMarkOrderAbnormal(id: number, reason: string) {
const { data } = await apiClient.post<ApiResponse<Order>>(`/admin/orders/${id}/abnormal`, { reason })
return data.data
}
export async function adminRefundStatus(id: number) {
const { data } = await apiClient.get<ApiResponse<RefundStatus>>(`/admin/orders/${id}/refund-status`)
return data.data
}
export async function adminRefundOrder(id: number) {
const { data } = await apiClient.post<ApiResponse<RefundStatus>>(`/admin/orders/${id}/refund`)
return data.data
}
frontend/src/features/orders/views/MobileOrderDetailView.vue
+71 -20
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,
@@ -506,7 +506,9 @@ function checkoutContentWithSummary() {
}
if (Number(checkoutForm.value.coin_consumed_m || 0) > 0) {
lines.push(
`哈夫币消耗：${quantity(Number(checkoutForm.value.coin_consumed_m))}M，预计剩余${quantity(remainingHafCoinM.value)}M`
`哈夫币消耗：${quantity(Number(checkoutForm.value.coin_consumed_m))}M，预计剩余${quantity(
remainingHafCoinM.value
)}M`
)
}
if (lines.length === 0) {
@@ -553,17 +555,26 @@ function formatHandoffRecordType(type: string) {
return typeMap[type] || type
}
function amountYuan(cent: unknown, legacyYuan?: unknown) {
if (cent !== undefined && cent !== null) return centToYuan(readNumber(cent))
return readNumber(legacyYuan)
}
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 amountYuan(item.owner_rent_amount_cent, item.owner_rent_amount ?? item.display_amount)
if (item.renter_id === session.userId)
return amountYuan(item.rent_amount_cent, item.rent_amount ?? item.display_amount)
return amountYuan(item.display_amount_cent, item.display_amount)
}
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
if (typeof value === 'number') return centToYuan(value)
return typeof item.checkout?.owner_income_amount === 'number'
? item.checkout.owner_income_amount
: null
}
function quantity(value: unknown) {
@@ -583,10 +594,16 @@ function isRecord(value: unknown): value is Record<string, unknown> {
function hydrateCounterForm() {
if (!order.value?.checkout) return
const checkout = order.value.checkout
counterForm.value.consumable_amount = checkout.consumable_amount
counterForm.value.consumable_amount = amountYuan(
checkout.consumable_amount_cent,
checkout.consumable_amount
)
counterForm.value.coin_consumed_m = checkout.coin_consumed_m
counterForm.value.other_amount = checkout.other_amount
counterForm.value.deposit_deduct_amount = checkout.deposit_deduct_amount
counterForm.value.other_amount = amountYuan(checkout.other_amount_cent, checkout.other_amount)
counterForm.value.deposit_deduct_amount = amountYuan(
checkout.deposit_deduct_amount_cent,
checkout.deposit_deduct_amount
)
}
function linesToList(value: string) {
@@ -676,9 +693,15 @@ 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(amountYuan(order.deposit_amount_cent, order.deposit_amount)) }}</strong
>
<span
v-if="amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount) > 0"
class="meta-note"
>已免押 ¥{{
money(amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount))
}}</span
>
</div>
<div class="meta-item">
@@ -929,30 +952,58 @@ 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(
amountYuan(order.checkout.display_amount_cent, order.checkout.display_amount)
)}`"
/>
<van-cell
title="押金总额"
:label="
order.deposit_waived_amount > 0 ? `已免押 ¥${money(order.deposit_waived_amount)}` : ''
amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount) > 0
? `已免押 ¥${money(
amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount)
)}`
: ''
"
:value="`¥${money(order.checkout.deposit_amount)}`"
:value="`¥${money(
amountYuan(order.checkout.deposit_amount_cent, order.checkout.deposit_amount)
)}`"
/>
<van-cell
title="额外消耗品已用"
:value="`¥${money(
amountYuan(order.checkout.consumable_amount_cent, order.checkout.consumable_amount)
)}`"
/>
<van-cell title="额外消耗品已用" :value="`¥${money(order.checkout.consumable_amount)}`" />
<van-cell
title="押金赔付扣除"
:value="`¥${money(order.checkout.deposit_deduct_amount)}`"
:value="`¥${money(
amountYuan(order.checkout.deposit_deduct_amount_cent, order.checkout.deposit_deduct_amount)
)}`"
value-class="red-text"
/>
<van-cell
v-if="isRenter"
title="退还租客"
:value="`¥${money(order.checkout.renter_refund_amount)}`"
:value="`¥${money(
amountYuan(
order.checkout.renter_refund_amount_cent,
order.checkout.renter_refund_amount
)
)}`"
value-class="green-text"
/>
<van-cell
v-if="isOwner"
title="号主最终收入"
:value="`¥${money(order.checkout.owner_income_amount)}`"
:value="`¥${money(
amountYuan(
order.checkout.owner_income_amount_cent,
order.checkout.owner_income_amount
)
)}`"
value-class="green-text"
/>
<van-cell
frontend/src/features/orders/views/MobileOrdersView.vue
+14 -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'
@@ -131,15 +131,21 @@ function amountLabel(order: Order) {
return isOwner(order) ? '预计租金' : '支付租金'
}
function amountYuan(cent: unknown, legacyYuan?: unknown) {
if (cent !== undefined && cent !== null) return centToYuan(Number(cent || 0))
return Number(legacyYuan || 0)
}
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 amountYuan(order.owner_rent_amount_cent, order.owner_rent_amount ?? order.display_amount)
return amountYuan(order.rent_amount_cent, order.rent_amount ?? order.display_amount)
}
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
if (typeof value === 'number') return centToYuan(value)
return typeof order.checkout?.owner_income_amount === 'number' ? order.checkout.owner_income_amount : null
}
function formatListingCode(order: Order) {
@@ -232,9 +238,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(amountYuan(order.deposit_amount_cent, order.deposit_amount)) }}
<em v-if="amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount) > 0"
>免 ¥{{ money(amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount)) }}</em
>
</span>
</div>
frontend/src/features/orders/views/OrderDetailView.vue
+28 -21
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,
@@ -600,17 +600,24 @@ function money(value: unknown) {
return formatMoney(readNumber(value))
}
function amountYuan(cent: unknown, legacyYuan?: unknown) {
if (cent !== undefined && cent !== null) return centToYuan(readNumber(cent))
return readNumber(legacyYuan)
}
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 amountYuan(item.owner_rent_amount_cent, item.owner_rent_amount ?? item.display_amount)
if (item.renter_id === session.userId)
return amountYuan(item.rent_amount_cent, item.rent_amount ?? item.display_amount)
return amountYuan(item.display_amount_cent, item.display_amount)
}
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
if (typeof value === 'number') return centToYuan(value)
return typeof item.checkout?.owner_income_amount === 'number' ? item.checkout.owner_income_amount : null
}
function quantity(value: unknown) {
@@ -630,10 +637,10 @@ function isRecord(value: unknown): value is Record<string, unknown> {
function hydrateCounterForm() {
if (!order.value?.checkout) return
const checkout = order.value.checkout
counterForm.value.consumable_amount = checkout.consumable_amount
counterForm.value.consumable_amount = amountYuan(checkout.consumable_amount_cent, checkout.consumable_amount)
counterForm.value.coin_consumed_m = checkout.coin_consumed_m
counterForm.value.other_amount = checkout.other_amount
counterForm.value.deposit_deduct_amount = checkout.deposit_deduct_amount
counterForm.value.other_amount = amountYuan(checkout.other_amount_cent, checkout.other_amount)
counterForm.value.deposit_deduct_amount = amountYuan(checkout.deposit_deduct_amount_cent, checkout.deposit_deduct_amount)
}
function linesToList(value: string) {
@@ -767,9 +774,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(amountYuan(order.deposit_amount_cent, order.deposit_amount)) }}</strong>
<span v-if="amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount) > 0" class="metric-note"
>已免押 ¥{{ money(amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount)) }}</span
>
</div>
</div>
@@ -951,32 +958,32 @@ async function copyListingCode() {
<div class="checkout-summary-card">
<div class="summary-row">
<span>实际结算租金</span>
<strong>¥{{ money(order.checkout.display_amount) }}</strong>
<strong>¥{{ money(amountYuan(order.checkout.display_amount_cent, order.checkout.display_amount)) }}</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(amountYuan(order.checkout.deposit_amount_cent, order.checkout.deposit_amount)) }}
<em v-if="amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount) > 0"
>已免押 ¥{{ money(amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount)) }}</em
>
</strong>
</div>
<div class="summary-row">
<span>额外消耗品已用</span>
<strong class="warning">¥{{ money(order.checkout.consumable_amount) }}</strong>
<strong class="warning">¥{{ money(amountYuan(order.checkout.consumable_amount_cent, order.checkout.consumable_amount)) }}</strong>
</div>
<div class="summary-row">
<span>押金赔付扣除</span>
<strong class="warning">¥{{ money(order.checkout.deposit_deduct_amount) }}</strong>
<strong class="warning">¥{{ money(amountYuan(order.checkout.deposit_deduct_amount_cent, order.checkout.deposit_deduct_amount)) }}</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(amountYuan(order.checkout.renter_refund_amount_cent, order.checkout.renter_refund_amount)) }}</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(amountYuan(order.checkout.owner_income_amount_cent, order.checkout.owner_income_amount)) }}</strong>
</div>
<div v-if="order.checkout.content" class="summary-note">
<label>说明：</label>
@@ -1031,7 +1038,7 @@ async function copyListingCode() {
v-model="counterForm.deposit_deduct_amount"
class="full-control"
:min="0"
:max="order.deposit_amount"
:max="amountYuan(order.deposit_amount_cent, order.deposit_amount)"
:precision="0"
controls-position="right"
/>
frontend/src/features/orders/views/OrdersView.vue
+15 -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'
@@ -127,16 +127,22 @@ function amountLabel(order: Order) {
return isRenter(order) ? '支付租金' : '预计租金'
}
function amountYuan(cent: unknown, legacyYuan?: unknown) {
if (cent !== undefined && cent !== null) return centToYuan(Number(cent || 0))
return Number(legacyYuan || 0)
}
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 amountYuan(order.owner_rent_amount_cent, order.owner_rent_amount ?? order.display_amount)
if (isRenter(order)) return amountYuan(order.rent_amount_cent, order.rent_amount ?? order.display_amount)
return amountYuan(order.display_amount_cent, order.display_amount)
}
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
if (typeof value === 'number') return centToYuan(value)
return typeof order.checkout?.owner_income_amount === 'number' ? order.checkout.owner_income_amount : null
}
function money(value: unknown) {
@@ -351,9 +357,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(amountYuan(order.deposit_amount_cent, order.deposit_amount)) }}
<em v-if="amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount) > 0"
>免 ¥{{ money(amountYuan(order.deposit_waived_amount_cent, order.deposit_waived_amount)) }}</em
>
</span>
</div>