Merge branch 'main' into feature/distribution-system
同步结账损耗全额归号主与后台时间线 AuthImage 修复。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -5,6 +5,8 @@ import { showDialog, showToast } from 'vant'
|
||||
|
||||
import MobilePaymentCashierPopup from '@/features/orders/components/MobilePaymentCashierPopup.vue'
|
||||
import MobilePayWaySelectPopup from '@/features/orders/components/MobilePayWaySelectPopup.vue'
|
||||
import CheckoutTrialPreview from '@/features/orders/components/CheckoutTrialPreview.vue'
|
||||
import { useCheckoutSimulator } from '@/features/orders/composables/useCheckoutSimulator'
|
||||
import { useOrderActions, CONFIRMABLE_ACTIONS } from '@/features/orders/composables/useOrderActions'
|
||||
import { useMobilePaymentCashier } from '@/features/orders/composables/useMobilePaymentCashier'
|
||||
import { useMobilePayWaySelect } from '@/features/orders/composables/useMobilePayWaySelect'
|
||||
@@ -139,6 +141,13 @@ const showCheckoutCounterAction = computed(
|
||||
(isRenter.value && order.value.status === 'pending_checkout_accept'))
|
||||
)
|
||||
|
||||
const checkoutSimulation = useCheckoutSimulator({
|
||||
order,
|
||||
isOwner,
|
||||
isRenter,
|
||||
form: counterForm,
|
||||
})
|
||||
|
||||
// 状态颜色映射(vant 标签主题)。
|
||||
function getStatusTagType(status: string) {
|
||||
if (['completed', 'received'].includes(status)) return 'success'
|
||||
@@ -529,7 +538,7 @@ async function copyListingCode() {
|
||||
}}。可填实际哈夫币消耗(允许超过发布量),打超按比例从押金扣。提案将交给对方确认。
|
||||
</p>
|
||||
<van-cell-group :border="false">
|
||||
<van-field label="额外消耗品已用">
|
||||
<van-field label="物资/损耗金额">
|
||||
<template #input>
|
||||
<input
|
||||
v-model.number="counterForm.consumableAmountYuan"
|
||||
@@ -557,6 +566,9 @@ async function copyListingCode() {
|
||||
</template>
|
||||
</van-field>
|
||||
</van-cell-group>
|
||||
|
||||
<!-- 实时结算试算预览(仅展示当前角色自身收支,完全屏蔽平台服务费) -->
|
||||
<CheckoutTrialPreview :simulation="checkoutSimulation" variant="mobile" />
|
||||
<van-field
|
||||
v-model="counterForm.reason"
|
||||
rows="2"
|
||||
|
||||
Reference in New Issue
Block a user