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-06-09 20:59:50 +08:00
parent 60324765c5
commit 9cc959afc4
19 changed files with 103 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/features/auth/api/auth.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { apiClient } from '@/shared/api/client'
import type { ApiResponse } from '@/shared/types/types'
import type { RealnameStatusValue, RiskStatus, UserStatus } from '@/types/status'
import type { RealnameStatusValue, RiskStatus, UserStatus } from '@/shared/types/status'
export interface AuthUser {
id: number
frontend/src/features/auth/api/realname.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { apiClient } from '@/shared/api/client'
import type { ApiResponse } from '@/shared/types/types'
import type { RealnameStatusValue } from '@/types/status'
import type { RealnameStatusValue } from '@/shared/types/status'
export interface RealnameStatus {
status: RealnameStatusValue
frontend/src/features/disputes/api/disputes.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { apiClient } from '@/shared/api/client'
import type { ApiResponse, PaginatedResult } from '@/shared/types/types'
import type { DisputeStatus } from '@/types/status'
import type { DisputeStatus } from '@/shared/types/status'
export interface Dispute {
id: number
frontend/src/features/orders/api/orders.ts
+6 -6
View File
@@ -111,10 +111,10 @@ export interface PostRentalNotice {
export interface SubmitCheckoutPayload {
content: string
consumable_amount?: number
consumableAmountYuan?: number
coin_consumed_m: number
other_amount?: number
deposit_deduct_amount?: number
otherAmountYuan?: number
depositDeductAmountYuan?: number
evidence_urls: string[]
reason?: string
}
@@ -145,10 +145,10 @@ export interface RefundStatus {
function toCheckoutRequest(payload: SubmitCheckoutPayload): SubmitCheckoutRequest {
return {
content: payload.content,
consumable_amount_cent: yuanToCent(payload.consumable_amount),
consumable_amount_cent: yuanToCent(payload.consumableAmountYuan),
coin_consumed_m: payload.coin_consumed_m,
other_amount_cent: yuanToCent(payload.other_amount),
deposit_deduct_amount_cent: yuanToCent(payload.deposit_deduct_amount),
other_amount_cent: yuanToCent(payload.otherAmountYuan),
deposit_deduct_amount_cent: yuanToCent(payload.depositDeductAmountYuan),
evidence_urls: payload.evidence_urls,
reason: payload.reason,
}
frontend/src/features/orders/composables/useOrderSnapshot.ts
+9 -9
View File
@@ -78,16 +78,16 @@ export function calculateCheckoutTotal(
}
export function calculateCounterTotal(counterForm: {
consumable_amount: number
consumableAmountYuan: number
coin_consumed_m: number
other_amount: number
deposit_deduct_amount: number
otherAmountYuan: number
depositDeductAmountYuan: number
}): number {
return roundMoney(
counterForm.consumable_amount +
counterForm.consumableAmountYuan +
counterForm.coin_consumed_m +
counterForm.other_amount +
counterForm.deposit_deduct_amount
counterForm.otherAmountYuan +
counterForm.depositDeductAmountYuan
)
}
@@ -127,10 +127,10 @@ export function hydrateCounterFormFromOrder(order: Order | null) {
try {
const info = JSON.parse(order.counter_info) as Record<string, any>
return {
consumable_amount: readNumber(info.consumable_amount),
consumableAmountYuan: readNumber(info.consumableAmountYuan),
coin_consumed_m: readNumber(info.coin_consumed_m),
other_amount: readNumber(info.other_amount),
deposit_deduct_amount: readNumber(info.deposit_deduct_amount),
otherAmountYuan: readNumber(info.otherAmountYuan),
depositDeductAmountYuan: readNumber(info.depositDeductAmountYuan),
reason: String(info.reason || ''),
evidenceText: String(info.evidence || ''),
}
frontend/src/features/orders/composables/useSettlement.ts
+18 -18
View File
@@ -4,17 +4,17 @@ import type { Order } from '../api/orders'
export interface CheckoutForm {
content: string
consumable_amount: number
consumableAmountYuan: number
coin_consumed_m: number
other_amount: number
otherAmountYuan: number
evidenceText: string
}
export interface CounterForm {
consumable_amount: number
consumableAmountYuan: number
coin_consumed_m: number
other_amount: number
deposit_deduct_amount: number
otherAmountYuan: number
depositDeductAmountYuan: number
reason: string
evidenceText: string
}
@@ -32,17 +32,17 @@ export function useSettlement(order: Ref<Order | null>) {
const checkoutForm = ref<CheckoutForm>({
content: '',
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
otherAmountYuan: 0,
evidenceText: '',
})
const counterForm = ref<CounterForm>({
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
deposit_deduct_amount: 0,
otherAmountYuan: 0,
depositDeductAmountYuan: 0,
reason: '',
evidenceText: '',
})
@@ -58,9 +58,9 @@ export function useSettlement(order: Ref<Order | null>) {
try {
await submitCheckout(order.value.id, {
content: checkoutForm.value.content.trim(),
consumable_amount: checkoutForm.value.consumable_amount,
consumableAmountYuan: checkoutForm.value.consumableAmountYuan,
coin_consumed_m: checkoutForm.value.coin_consumed_m,
other_amount: checkoutForm.value.other_amount,
otherAmountYuan: checkoutForm.value.otherAmountYuan,
evidence_urls: linesToList(checkoutForm.value.evidenceText),
})
onSuccess?.()
@@ -95,10 +95,10 @@ export function useSettlement(order: Ref<Order | null>) {
const reasonText = counterForm.value.reason.trim()
await counterCheckout(order.value.id, {
content: reasonText,
consumable_amount: counterForm.value.consumable_amount,
consumableAmountYuan: counterForm.value.consumableAmountYuan,
coin_consumed_m: counterForm.value.coin_consumed_m,
other_amount: counterForm.value.other_amount,
deposit_deduct_amount: counterForm.value.deposit_deduct_amount,
otherAmountYuan: counterForm.value.otherAmountYuan,
depositDeductAmountYuan: counterForm.value.depositDeductAmountYuan,
reason: reasonText,
evidence_urls: linesToList(counterForm.value.evidenceText),
})
@@ -119,10 +119,10 @@ export function useSettlement(order: Ref<Order | null>) {
const reasonText = reason.trim()
await counterCheckout(order.value.id, {
content: reasonText,
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
deposit_deduct_amount: 0,
otherAmountYuan: 0,
depositDeductAmountYuan: 0,
reason: reasonText,
evidence_urls: [],
})
frontend/src/features/orders/views/MobileOrderDetailView.vue
+21 -21
View File
@@ -51,17 +51,17 @@ const listingCode = computed(() =>
const handoffContent = ref('')
const checkoutForm = ref({
content: '',
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
otherAmountYuan: 0,
evidenceText: '',
})
const resourceUsage = ref<Record<string, number>>({})
const counterForm = ref({
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
deposit_deduct_amount: 0,
otherAmountYuan: 0,
depositDeductAmountYuan: 0,
reason: '',
evidenceText: '',
})
@@ -231,19 +231,19 @@ async function handleSubmitCheckout() {
returning.value = true
try {
const consumableAmount = resourceChargeAmount.value
checkoutForm.value.consumable_amount = consumableAmount
checkoutForm.value.consumableAmountYuan = consumableAmount
await submitCheckout(order.value.id, {
content: checkoutContentWithSummary(),
consumable_amount: consumableAmount,
consumableAmountYuan: consumableAmount,
coin_consumed_m: checkoutForm.value.coin_consumed_m,
other_amount: checkoutForm.value.other_amount,
otherAmountYuan: checkoutForm.value.otherAmountYuan,
evidence_urls: linesToList(checkoutForm.value.evidenceText),
})
checkoutForm.value = {
content: '',
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
otherAmountYuan: 0,
evidenceText: '',
}
resourceUsage.value = {}
@@ -283,10 +283,10 @@ async function handleCounterCheckout() {
const reasonText = counterForm.value.reason.trim()
await counterCheckout(order.value.id, {
content: reasonText,
consumable_amount: counterForm.value.consumable_amount,
consumableAmountYuan: counterForm.value.consumableAmountYuan,
coin_consumed_m: counterForm.value.coin_consumed_m,
other_amount: counterForm.value.other_amount,
deposit_deduct_amount: counterForm.value.deposit_deduct_amount,
otherAmountYuan: counterForm.value.otherAmountYuan,
depositDeductAmountYuan: counterForm.value.depositDeductAmountYuan,
reason: reasonText,
evidence_urls: linesToList(counterForm.value.evidenceText),
})
@@ -592,10 +592,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 = amountYuan(checkout.consumable_amount_cent)
counterForm.value.consumableAmountYuan = amountYuan(checkout.consumable_amount_cent)
counterForm.value.coin_consumed_m = checkout.coin_consumed_m
counterForm.value.other_amount = amountYuan(checkout.other_amount_cent)
counterForm.value.deposit_deduct_amount = amountYuan(checkout.deposit_deduct_amount_cent)
counterForm.value.otherAmountYuan = amountYuan(checkout.other_amount_cent)
counterForm.value.depositDeductAmountYuan = amountYuan(checkout.deposit_deduct_amount_cent)
}
function linesToList(value: string) {
@@ -882,7 +882,7 @@ async function copyListingCode() {
<template #input>
<div class="coin-input-wrap">
<input
v-model.number="checkoutForm.other_amount"
v-model.number="checkoutForm.otherAmountYuan"
type="number"
placeholder="不含上方额外物资"
class="custom-inline-input"
@@ -901,7 +901,7 @@ async function copyListingCode() {
</div>
<div>
<span>其他押金赔付</span>
<strong>¥{{ money(checkoutForm.other_amount) }}</strong>
<strong>¥{{ money(checkoutForm.otherAmountYuan) }}</strong>
<em>从押金赔付扣除</em>
</div>
</div>
@@ -1090,7 +1090,7 @@ async function copyListingCode() {
<van-field label="额外消耗品已用">
<template #input>
<input
v-model.number="counterForm.consumable_amount"
v-model.number="counterForm.consumableAmountYuan"
type="number"
class="custom-inline-input"
/>
@@ -1108,7 +1108,7 @@ async function copyListingCode() {
<van-field label="其他押金扣款">
<template #input>
<input
v-model.number="counterForm.other_amount"
v-model.number="counterForm.otherAmountYuan"
type="number"
class="custom-inline-input"
/>
@@ -1117,7 +1117,7 @@ async function copyListingCode() {
<van-field label="押金赔付扣除" required>
<template #input>
<input
v-model.number="counterForm.deposit_deduct_amount"
v-model.number="counterForm.depositDeductAmountYuan"
type="number"
class="custom-inline-input"
/>
frontend/src/features/orders/views/OrderDetailView.vue
+21 -21
View File
@@ -60,17 +60,17 @@ const checkingPayment = ref(false)
let paymentPollingTimer: number | undefined
const checkoutForm = ref({
content: '',
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
otherAmountYuan: 0,
evidenceText: '',
})
const resourceUsage = ref<Record<string, number>>({})
const counterForm = ref({
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
deposit_deduct_amount: 0,
otherAmountYuan: 0,
depositDeductAmountYuan: 0,
reason: '',
evidenceText: '',
})
@@ -321,19 +321,19 @@ async function handleSubmitCheckout() {
returning.value = true
try {
const consumableAmount = resourceChargeAmount.value
checkoutForm.value.consumable_amount = consumableAmount
checkoutForm.value.consumableAmountYuan = consumableAmount
await submitCheckout(order.value.id, {
content: checkoutContentWithSummary(),
consumable_amount: consumableAmount,
consumableAmountYuan: consumableAmount,
coin_consumed_m: checkoutForm.value.coin_consumed_m,
other_amount: checkoutForm.value.other_amount,
otherAmountYuan: checkoutForm.value.otherAmountYuan,
evidence_urls: linesToList(checkoutForm.value.evidenceText),
})
checkoutForm.value = {
content: '',
consumable_amount: 0,
consumableAmountYuan: 0,
coin_consumed_m: 0,
other_amount: 0,
otherAmountYuan: 0,
evidenceText: '',
}
resourceUsage.value = {}
@@ -367,10 +367,10 @@ async function handleCounterCheckout() {
const reasonText = counterForm.value.reason.trim()
await counterCheckout(order.value.id, {
content: reasonText,
consumable_amount: counterForm.value.consumable_amount,
consumableAmountYuan: counterForm.value.consumableAmountYuan,
coin_consumed_m: counterForm.value.coin_consumed_m,
other_amount: counterForm.value.other_amount,
deposit_deduct_amount: counterForm.value.deposit_deduct_amount,
otherAmountYuan: counterForm.value.otherAmountYuan,
depositDeductAmountYuan: counterForm.value.depositDeductAmountYuan,
reason: reasonText,
evidence_urls: linesToList(counterForm.value.evidenceText),
})
@@ -641,10 +641,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 = amountYuan(checkout.consumable_amount_cent)
counterForm.value.consumableAmountYuan = amountYuan(checkout.consumable_amount_cent)
counterForm.value.coin_consumed_m = checkout.coin_consumed_m
counterForm.value.other_amount = amountYuan(checkout.other_amount_cent)
counterForm.value.deposit_deduct_amount = amountYuan(checkout.deposit_deduct_amount_cent)
counterForm.value.otherAmountYuan = amountYuan(checkout.other_amount_cent)
counterForm.value.depositDeductAmountYuan = amountYuan(checkout.deposit_deduct_amount_cent)
}
function linesToList(value: string) {
@@ -911,7 +911,7 @@ async function copyListingCode() {
</el-form-item>
<el-form-item label="其他押金赔付（元）">
<el-input-number
v-model="checkoutForm.other_amount"
v-model="checkoutForm.otherAmountYuan"
class="full-control"
:min="0"
:precision="0"
@@ -930,7 +930,7 @@ async function copyListingCode() {
</div>
<div>
<span>其他押金赔付</span>
<strong>¥{{ money(checkoutForm.other_amount) }}</strong>
<strong>¥{{ money(checkoutForm.otherAmountYuan) }}</strong>
<em>作为押金赔付扣除，和额外消耗品分开展示</em>
</div>
</div>
@@ -1022,7 +1022,7 @@ async function copyListingCode() {
<el-form class="form-grid" label-position="top">
<el-form-item label="额外消耗品已用金额">
<el-input-number
v-model="counterForm.consumable_amount"
v-model="counterForm.consumableAmountYuan"
class="full-control"
:min="0"
:precision="0"
@@ -1040,7 +1040,7 @@ async function copyListingCode() {
</el-form-item>
<el-form-item label="其他押金扣款（元）">
<el-input-number
v-model="counterForm.other_amount"
v-model="counterForm.otherAmountYuan"
class="full-control"
:min="0"
:precision="0"
@@ -1049,7 +1049,7 @@ async function copyListingCode() {
</el-form-item>
<el-form-item label="押金扣除（元）">
<el-input-number
v-model="counterForm.deposit_deduct_amount"
v-model="counterForm.depositDeductAmountYuan"
class="full-control"
:min="0"
:max="amountYuan(order.deposit_amount_cent)"
frontend/src/features/seller/composables/usePublishDraft.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import type { ChargeMode, QuantityKey, ScreenshotKey } from '@/features/listings/api/listingOptions'
import type { PublishDraft, PublishForm } from '@/types/publish'
import type { PublishDraft, PublishForm } from '@/shared/types/publish'
export function defaultPublishForm(): PublishForm {
return {
@@ -19,7 +19,7 @@ export function defaultPublishForm(): PublishForm {
online_end: '',
ban_record: '',
common_regions: [],
deposit_amount: '',
depositAmountYuan: '',
remark: '',
}
}
frontend/src/features/seller/composables/usePublishForm.ts
+10 -10
View File
@@ -25,7 +25,7 @@ import {
removePublishDraft,
writePublishDraft,
} from '@/features/seller/composables/usePublishDraft'
import type { PublishForm } from '@/types/publish'
import type { PublishForm } from '@/shared/types/publish'
import { yuanToCent } from '@/shared/utils/money'
import {
commonOnlineTimes,
@@ -505,15 +505,15 @@ export function usePublishForm(options: UsePublishFormOptions) {
function syncRecommendedDeposit() {
const recommended = pricing.recommendedDepositAmount.value
if (recommended <= 0) return
const current = Number(form.deposit_amount)
if (form.deposit_amount === '' || !Number.isFinite(current) || current < recommended) {
form.deposit_amount = recommended
const current = Number(form.depositAmountYuan)
if (form.depositAmountYuan === '' || !Number.isFinite(current) || current < recommended) {
form.depositAmountYuan = recommended
}
}
function useRecommendedDeposit() {
if (pricing.recommendedDepositAmount.value > 0) {
form.deposit_amount = pricing.recommendedDepositAmount.value
form.depositAmountYuan = pricing.recommendedDepositAmount.value
}
}
@@ -574,7 +574,7 @@ export function usePublishForm(options: UsePublishFormOptions) {
asset_summary: buildAssetSummary(),
screenshot_urls: pricing.screenshotUrls.value,
price_cent: yuanToCent(pricing.calculatedFinalPrice.value),
deposit_amount_cent: yuanToCent(Number(form.deposit_amount)),
deposit_amount_cent: yuanToCent(Number(form.depositAmountYuan)),
agreed_virtual_asset_sale: virtualAssetSaleAgreementChecked.value,
agreed_seller_agreement: sellerAgreementChecked.value,
})
@@ -624,17 +624,17 @@ export function usePublishForm(options: UsePublishFormOptions) {
}
}
if (pricing.banRecordOptions.value.length && !form.ban_record) return '请选择封禁记录'
if (form.deposit_amount === '' || Number(form.deposit_amount) < 0) return '请填写押金'
if (!Number.isFinite(Number(form.deposit_amount))) return '押金格式不正确'
if (form.depositAmountYuan === '' || Number(form.depositAmountYuan) < 0) return '请填写押金'
if (!Number.isFinite(Number(form.depositAmountYuan))) return '押金格式不正确'
if (
pricing.recommendedDepositAmount.value > 0 &&
Number(form.deposit_amount) < pricing.recommendedDepositAmount.value
Number(form.depositAmountYuan) < pricing.recommendedDepositAmount.value
) {
return `押金不能低于智能推荐 ¥${pricing.recommendedDepositAmount.value}`
}
if (
pricing.calculatedConsumablePrice.value > 0 &&
Number(form.deposit_amount) <= pricing.calculatedConsumablePrice.value
Number(form.depositAmountYuan) <= pricing.calculatedConsumablePrice.value
) {
return `押金必须大于额外消耗品总价值 ¥${pricing.calculatedConsumablePrice.value}`
}
frontend/src/features/seller/views/MobileSellerListingCreateView.vue
+1 -1
View File
@@ -531,7 +531,7 @@ function selectRadio<T extends string>(value: T, setter: (value: T) => void) {
<div class="form-section">
<h2 class="section-title">押金与价格</h2>
<van-field
v-model="form.deposit_amount"
v-model="form.depositAmountYuan"
label="押金"
type="number"
required
frontend/src/features/seller/views/SellerListingCreateView.vue
+4 -2
View File
@@ -484,7 +484,7 @@ function selectDailyLoss(value: string | number) {
>
<div class="deposit-control">
<el-input-number
v-model="form.deposit_amount"
v-model="form.depositAmountYuan"
:min="0"
:controls="false"
:placeholder="priceConfig.deposit_placeholder"
@@ -631,7 +631,9 @@ function selectDailyLoss(value: string | number) {
<div>
<span>押金价格</span>
<strong>{{
form.deposit_amount === '' ? '--' : `¥${formatMoney(Number(form.deposit_amount))}`
form.depositAmountYuan === ''
? '--'
: `¥${formatMoney(Number(form.depositAmountYuan))}`
}}</strong>
</div>
</div>