统一订单列表混排租赁与撞车,后台撞车订单展示真实手机号

PC/移动端「我的订单」并行拉取两类订单并按时间混排展示;后台撞车订单买家手机号不再脱敏,便于履约联系。
This commit is contained in:
yml2213
2026-07-19 16:01:45 +08:00
parent ed4d3f011c
commit d93795a4b4
10 changed files with 749 additions and 228 deletions
+416 -108
View File
@@ -6,33 +6,93 @@ import { useRoute, useRouter } from 'vue-router'
import { CopyDocument, Search } from '@element-plus/icons-vue'
import { fetchOrders, type Order } from '@/features/orders'
import { centToYuan, formatMoney } from '@/shared/utils/money'
import {
fetchMyMohongOrders,
mohongOrderStatusLabel,
type MohongOrder,
} from '@/features/mohong/api/mohong'
import { centToYuan, formatCent, formatMoney } from '@/shared/utils/money'
import { useSessionStore } from '@/stores/session'
import { orderStatusLabel } from '@/shared/utils/statusLabels'
import { formatDateTime } from '@/shared/utils/time'
import { formatListingNo } from '@/shared/utils/listingDisplay'
type BizType = 'rental' | 'crash'
interface UnifiedOrderItem {
key: string
bizType: BizType
id: number
orderNo: string
title: string
status: string
createdAt: string
amountText: string
coverUrl?: string
quantity?: number
unit?: string
rental?: Order
crash?: MohongOrder
}
const loading = ref(false)
const orders = ref<Order[]>([])
const rentalOrders = ref<Order[]>([])
const crashOrders = ref<MohongOrder[]>([])
const payingOrderId = ref<number | null>(null)
const session = useSessionStore()
const route = useRoute()
const router = useRouter()
const searchKeyword = ref('')
const fallbackPendingPaymentMinutes = 15
const statusTabs = [
{ key: 'all', label: '全部' },
{ key: 'pending_payment', label: '待支付' },
{ key: 'pending_handoff', label: '待交接' },
{ key: 'renting', label: '使用中' },
{ key: 'paid', label: '已支付' },
{ key: 'pending_checkout_confirm', label: '待结账' },
{ key: 'completed', label: '已完成' },
{ key: 'cancelled', label: '已取消' },
]
const tabKeys = new Set(statusTabs.map(item => item.key))
const activeTab = ref(readTab(route.query.tab))
const fallbackPendingPaymentMinutes = 15
const unifiedOrders = computed<UnifiedOrderItem[]>(() => {
const rentalItems: UnifiedOrderItem[] = rentalOrders.value.map(order => ({
key: `rental-${order.id}`,
bizType: 'rental',
id: order.id,
orderNo: order.order_no,
title: order.title,
status: order.status,
createdAt: order.created_at,
amountText: money(orderRentAmount(order)),
rental: order,
}))
const crashItems: UnifiedOrderItem[] = crashOrders.value.map(order => ({
key: `crash-${order.id}`,
bizType: 'crash',
id: order.id,
orderNo: order.order_no,
title: order.product_title,
status: order.status,
createdAt: order.created_at,
amountText: order.amount || formatCent(order.amount_cent),
coverUrl: order.product_cover_url,
quantity: order.quantity,
unit: order.product_unit,
crash: order,
}))
return [...rentalItems, ...crashItems].sort(
(a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
)
})
const displayOrders = computed(() => {
let filtered = orders.value
let filtered = unifiedOrders.value
if (activeTab.value !== 'all') {
filtered = filtered.filter(order => order.status === activeTab.value)
@@ -40,24 +100,28 @@ const displayOrders = computed(() => {
if (searchKeyword.value.trim()) {
const keyword = searchKeyword.value.trim().toLowerCase()
filtered = filtered.filter(
order =>
textValue(order.order_no).toLowerCase().includes(keyword) ||
formatListingCode(order).toLowerCase().includes(keyword) ||
String(order.listing_id).includes(keyword) ||
String(order.account_id).includes(keyword) ||
textValue(order.title).toLowerCase().includes(keyword)
)
filtered = filtered.filter(order => {
if (textValue(order.orderNo).toLowerCase().includes(keyword)) return true
if (textValue(order.title).toLowerCase().includes(keyword)) return true
if (order.bizType === 'rental' && order.rental) {
return (
formatListingCode(order.rental).toLowerCase().includes(keyword) ||
String(order.rental.listing_id).includes(keyword) ||
String(order.rental.account_id).includes(keyword)
)
}
return false
})
}
return filtered
})
const tabCounts = computed(() => {
const counts: Record<string, number> = { all: orders.value.length }
const counts: Record<string, number> = { all: unifiedOrders.value.length }
statusTabs.forEach(tab => {
if (tab.key !== 'all') {
counts[tab.key] = orders.value.filter(order => order.status === tab.key).length
counts[tab.key] = unifiedOrders.value.filter(order => order.status === tab.key).length
}
})
return counts
@@ -79,19 +143,44 @@ function readTab(tab: unknown) {
function handleTabChange(tab: string | number) {
const nextTab = readTab(String(tab))
activeTab.value = nextTab
router.replace({ path: '/orders', query: nextTab === 'all' ? {} : { tab: nextTab } })
}
async function loadOrders() {
loading.value = true
try {
const items = await fetchOrders()
orders.value = Array.isArray(items) ? items : []
const [rentalResult, crashResult] = await Promise.allSettled([
fetchOrders(),
fetchMyMohongOrders({ page: 1, page_size: 50 }),
])
if (rentalResult.status === 'fulfilled') {
rentalOrders.value = Array.isArray(rentalResult.value) ? rentalResult.value : []
} else {
rentalOrders.value = []
ElMessage.error('租赁订单加载失败')
}
if (crashResult.status === 'fulfilled') {
crashOrders.value = crashResult.value?.items || []
} else {
crashOrders.value = []
ElMessage.error(readError(crashResult.reason, '撞车订单加载失败'))
}
} finally {
loading.value = false
}
}
function goDetail(item: UnifiedOrderItem) {
if (item.bizType === 'crash') {
router.push(`/crash/orders/${item.id}`)
return
}
router.push(`/orders/${item.id}`)
}
async function handlePay(order: Order) {
payingOrderId.value = order.id
try {
@@ -202,6 +291,15 @@ function getCountdownMinutes(order: Order) {
const diff = deadline.getTime() - now.getTime()
return Math.max(0, Math.ceil(diff / 60000))
}
function statusText(item: UnifiedOrderItem) {
if (item.bizType === 'crash') return mohongOrderStatusLabel(item.status)
return orderStatusLabel(item.status)
}
function bizTypeLabel(bizType: BizType) {
return bizType === 'crash' ? '撞车' : '租赁'
}
</script>
<template>
@@ -209,13 +307,13 @@ function getCountdownMinutes(order: Order) {
<div class="page-header">
<p class="eyebrow">ORDERS</p>
<h1>我的订单</h1>
<p>跟踪待支付、待交接、使用中、待归还、申诉中和已完成订单。</p>
<p>租赁与撞车订单统一展示,按创建时间倒序排列。</p>
</div>
<div class="orders-toolbar">
<el-input
v-model="searchKeyword"
placeholder="搜索订单号 / 商品编号 / 账号"
placeholder="搜索订单号 / 商品 / 账号"
:prefix-icon="Search"
clearable
class="search-input"
@@ -241,89 +339,130 @@ function getCountdownMinutes(order: Order) {
<div v-else class="orders-container">
<el-table v-loading="loading" class="table-panel orders-table" :data="displayOrders">
<el-table-column label="类型" width="80" align="center">
<template #default="{ row }">
<span class="biz-tag" :class="row.bizType">{{ bizTypeLabel(row.bizType) }}</span>
</template>
</el-table-column>
<el-table-column label="订单号" min-width="180">
<template #default="{ row }">
<div class="order-no-cell">
<span class="order-no-text" :title="row.order_no">{{
shortenOrderNo(row.order_no)
<span class="order-no-text" :title="row.orderNo">{{
shortenOrderNo(row.orderNo)
}}</span>
<el-icon class="copy-icon" @click="copyOrderNo(row.order_no)">
<el-icon class="copy-icon" @click="copyOrderNo(row.orderNo)">
<CopyDocument />
</el-icon>
</div>
</template>
</el-table-column>
<el-table-column label="商品编号" width="150">
<el-table-column label="商品 / 账号" min-width="220">
<template #default="{ row }">
<div class="order-no-cell">
<span class="order-no-text">{{ formatListingCode(row) }}</span>
<el-icon class="copy-icon" @click="copyListingCode(row)">
<CopyDocument />
</el-icon>
<div v-if="row.bizType === 'crash'" class="crash-product-cell">
<div class="crash-cover">
<img v-if="row.coverUrl" :src="row.coverUrl" alt="" />
<span v-else>图</span>
</div>
<div class="crash-product-info">
<strong>{{ row.title }}</strong>
<span
>x{{ row.quantity || 1 }}{{ row.unit ? ` · ${row.unit}` : '' }}</span
>
</div>
</div>
<div v-else class="rental-product-cell">
<button
v-if="row.rental"
class="listing-code-line compact"
type="button"
@click="copyListingCode(row.rental)"
>
{{ formatListingCode(row.rental) }}
<el-icon><CopyDocument /></el-icon>
</button>
<span class="rental-title">{{ row.title }}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="title" label="账号" min-width="180" />
<el-table-column label="金额" width="132">
<el-table-column label="金额" width="140">
<template #default="{ row }">
<div class="amount-cell">
<span class="amount-value">¥{{ money(orderRentAmount(row)) }}</span>
<span class="amount-label">{{ amountLabel(row) }}</span>
<span v-if="ownerActualIncome(row) !== null" class="amount-sub"
>实际到手 ¥{{ money(ownerActualIncome(row)) }}</span
<div v-if="row.bizType === 'rental' && row.rental" class="amount-cell">
<span class="amount-value">¥{{ money(orderRentAmount(row.rental)) }}</span>
<span class="amount-label">{{ amountLabel(row.rental) }}</span>
<span v-if="ownerActualIncome(row.rental) !== null" class="amount-sub"
>实际到手 ¥{{ money(ownerActualIncome(row.rental)) }}</span
>
</div>
<div v-else class="amount-cell">
<span class="amount-value">¥{{ row.amountText }}</span>
<span class="amount-label">订单金额</span>
</div>
</template>
</el-table-column>
<el-table-column label="押金" width="100">
<el-table-column label="押金 / 数量" width="110">
<template #default="{ row }">
<div class="amount-cell">
<span class="amount-value">¥{{ money(amountYuan(row.deposit_amount_cent)) }}</span>
<span v-if="amountYuan(row.deposit_waived_amount_cent) > 0" class="amount-label"
>免 ¥{{ money(amountYuan(row.deposit_waived_amount_cent)) }}</span
<div v-if="row.bizType === 'rental' && row.rental" class="amount-cell">
<span class="amount-value">¥{{ money(amountYuan(row.rental.deposit_amount_cent)) }}</span>
<span v-if="amountYuan(row.rental.deposit_waived_amount_cent) > 0" class="amount-label"
>免 ¥{{ money(amountYuan(row.rental.deposit_waived_amount_cent)) }}</span
>
</div>
<span v-else class="amount-value"
>x{{ row.quantity || 1 }}{{ row.unit ? row.unit : '' }}</span
>
</template>
</el-table-column>
<el-table-column label="身份" width="80">
<template #default="{ row }">
<el-tag :type="isRenter(row) ? 'primary' : 'success'" size="small">
{{ orderRole(row) }}
<el-tag
v-if="row.bizType === 'rental' && row.rental"
:type="isRenter(row.rental) ? 'primary' : 'success'"
size="small"
>
{{ orderRole(row.rental) }}
</el-tag>
<span v-else class="muted">买家</span>
</template>
</el-table-column>
<el-table-column label="状态" width="140">
<template #default="{ row }">
<div class="status-cell">
<span>{{ orderStatusLabel(row.status) }}</span>
<span>{{ statusText(row) }}</span>
<span
v-if="row.status === 'pending_payment' && getCountdownMinutes(row) > 0"
v-if="
row.bizType === 'rental' &&
row.rental &&
row.rental.status === 'pending_payment' &&
getCountdownMinutes(row.rental) > 0
"
class="countdown-badge"
>
{{ getCountdownMinutes(row) }}分钟后超时
{{ getCountdownMinutes(row.rental) }}分钟后超时
</span>
</div>
</template>
</el-table-column>
<el-table-column label="创建时间" width="160">
<template #default="{ row }">{{ formatDateTime(row.created_at) }}</template>
<template #default="{ row }">{{ formatDateTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<div class="action-buttons">
<el-button
v-if="row.status === 'pending_payment'"
v-if="
row.bizType === 'rental' &&
row.rental &&
row.rental.status === 'pending_payment'
"
size="small"
type="primary"
:disabled="row.renter_id !== session.userId"
:loading="payingOrderId === row.id"
@click="handlePay(row)"
:disabled="row.rental.renter_id !== session.userId"
:loading="payingOrderId === row.rental.id"
@click="handlePay(row.rental)"
>
使用中
去支付
</el-button>
<RouterLink :to="`/orders/${row.id}`">
<el-button size="small">详情</el-button>
</RouterLink>
<el-button size="small" @click="goDetail(row)">详情</el-button>
</div>
</template>
</el-table-column>
@@ -331,72 +470,115 @@ function getCountdownMinutes(order: Order) {
<div class="mobile-cards">
<div
v-for="order in displayOrders"
:key="order.id"
v-for="item in displayOrders"
:key="item.key"
class="order-card"
@click="router.push(`/orders/${order.id}`)"
@click="goDetail(item)"
>
<div class="card-header">
<div class="order-no-row">
<span class="order-no-text" :title="order.order_no">{{
shortenOrderNo(order.order_no)
<span class="biz-tag" :class="item.bizType">{{ bizTypeLabel(item.bizType) }}</span>
<span class="order-no-text" :title="item.orderNo">{{
shortenOrderNo(item.orderNo)
}}</span>
<el-icon class="copy-icon" @click.stop="copyOrderNo(order.order_no)">
<el-icon class="copy-icon" @click.stop="copyOrderNo(item.orderNo)">
<CopyDocument />
</el-icon>
</div>
<el-tag :type="isRenter(order) ? 'primary' : 'success'" size="small">
{{ orderRole(order) }}
</el-tag>
</div>
<button class="listing-code-line" type="button" @click.stop="copyListingCode(order)">
商品编号 {{ formatListingCode(order) }}
<el-icon><CopyDocument /></el-icon>
</button>
<div class="card-title">{{ order.title }}</div>
<div class="card-meta">
<div class="meta-row">
<span class="meta-label">{{ amountLabel(order) }}</span>
<span class="meta-value amount">¥{{ money(orderRentAmount(order)) }}</span>
</div>
<div v-if="ownerActualIncome(order) !== null" class="meta-row">
<span class="meta-label">实际到手</span>
<span class="meta-value amount">¥{{ money(ownerActualIncome(order)) }}</span>
</div>
<div class="meta-row">
<span class="meta-label">押金</span>
<span class="meta-value">
¥{{ money(amountYuan(order.deposit_amount_cent)) }}
<em v-if="amountYuan(order.deposit_waived_amount_cent) > 0"
>免 ¥{{ money(amountYuan(order.deposit_waived_amount_cent)) }}</em
>
</span>
</div>
<div class="meta-row">
<span class="meta-label">创建时间</span>
<span class="meta-value">{{ formatDateTime(order.created_at) }}</span>
</div>
</div>
<div class="card-footer">
<div class="status-info">
<span class="status-label">{{ orderStatusLabel(order.status) }}</span>
<span
v-if="order.status === 'pending_payment' && getCountdownMinutes(order) > 0"
class="countdown-badge"
>
{{ getCountdownMinutes(order) }}分钟后超时
</span>
</div>
<el-button
v-if="order.status === 'pending_payment' && isRenter(order)"
<el-tag
v-if="item.bizType === 'rental' && item.rental"
:type="isRenter(item.rental) ? 'primary' : 'success'"
size="small"
type="primary"
:loading="payingOrderId === order.id"
@click.stop="handlePay(order)"
>
立即支付
</el-button>
{{ orderRole(item.rental) }}
</el-tag>
<span v-else class="crash-status" :class="item.status">{{ statusText(item) }}</span>
</div>
<template v-if="item.bizType === 'rental' && item.rental">
<button
class="listing-code-line"
type="button"
@click.stop="copyListingCode(item.rental)"
>
商品编号 {{ formatListingCode(item.rental) }}
<el-icon><CopyDocument /></el-icon>
</button>
<div class="card-title">{{ item.title }}</div>
<div class="card-meta">
<div class="meta-row">
<span class="meta-label">{{ amountLabel(item.rental) }}</span>
<span class="meta-value amount">¥{{ money(orderRentAmount(item.rental)) }}</span>
</div>
<div v-if="ownerActualIncome(item.rental) !== null" class="meta-row">
<span class="meta-label">实际到手</span>
<span class="meta-value amount">¥{{ money(ownerActualIncome(item.rental)) }}</span>
</div>
<div class="meta-row">
<span class="meta-label">押金</span>
<span class="meta-value">
¥{{ money(amountYuan(item.rental.deposit_amount_cent)) }}
<em v-if="amountYuan(item.rental.deposit_waived_amount_cent) > 0"
>免 ¥{{ money(amountYuan(item.rental.deposit_waived_amount_cent)) }}</em
>
</span>
</div>
<div class="meta-row">
<span class="meta-label">创建时间</span>
<span class="meta-value">{{ formatDateTime(item.createdAt) }}</span>
</div>
</div>
<div class="card-footer">
<div class="status-info">
<span class="status-label">{{ statusText(item) }}</span>
<span
v-if="
item.rental.status === 'pending_payment' && getCountdownMinutes(item.rental) > 0
"
class="countdown-badge"
>
{{ getCountdownMinutes(item.rental) }}分钟后超时
</span>
</div>
<el-button
v-if="item.rental.status === 'pending_payment' && isRenter(item.rental)"
size="small"
type="primary"
:loading="payingOrderId === item.rental.id"
@click.stop="handlePay(item.rental)"
>
立即支付
</el-button>
</div>
</template>
<template v-else>
<div class="crash-card-body">
<div class="crash-cover lg">
<img v-if="item.coverUrl" :src="item.coverUrl" alt="" />
<span v-else>图</span>
</div>
<div>
<div class="card-title">{{ item.title }}</div>
<div class="card-meta">
<div class="meta-row">
<span class="meta-label">数量</span>
<span class="meta-value"
>x{{ item.quantity || 1 }}{{ item.unit ? ` · ${item.unit}` : '' }}</span
>
</div>
<div class="meta-row">
<span class="meta-label">金额</span>
<span class="meta-value amount">¥{{ item.amountText }}</span>
</div>
<div class="meta-row">
<span class="meta-label">创建时间</span>
<span class="meta-value">{{ formatDateTime(item.createdAt) }}</span>
</div>
</div>
</div>
</div>
</template>
</div>
</div>
</div>
@@ -472,6 +654,27 @@ function getCountdownMinutes(order: Order) {
display: none;
}
.biz-tag {
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 40px;
padding: 2px 8px;
border-radius: 999px;
font-size: 12px;
font-weight: 700;
}
.biz-tag.rental {
color: #1477ff;
background: rgba(20, 119, 255, 0.1);
}
.biz-tag.crash {
color: #ff6a00;
background: rgba(255, 106, 0, 0.1);
}
.order-no-cell {
display: flex;
align-items: center;
@@ -500,6 +703,11 @@ function getCountdownMinutes(order: Order) {
cursor: pointer;
}
.listing-code-line.compact {
margin-top: 0;
margin-bottom: 4px;
}
.copy-icon {
cursor: pointer;
color: #9ca3af;
@@ -554,6 +762,105 @@ function getCountdownMinutes(order: Order) {
gap: 8px;
}
.muted {
color: #9ca3af;
font-size: 13px;
}
.crash-product-cell,
.rental-product-cell {
display: flex;
flex-direction: column;
gap: 4px;
min-width: 0;
}
.crash-product-cell {
flex-direction: row;
align-items: center;
gap: 12px;
}
.crash-cover {
width: 48px;
height: 48px;
border-radius: 10px;
overflow: hidden;
background: #f0f3f8;
display: flex;
align-items: center;
justify-content: center;
color: #a0aec0;
font-size: 12px;
flex-shrink: 0;
}
.crash-cover.lg {
width: 64px;
height: 64px;
}
.crash-cover img {
width: 100%;
height: 100%;
object-fit: cover;
}
.crash-product-info {
display: flex;
flex-direction: column;
gap: 4px;
min-width: 0;
}
.crash-product-info strong,
.rental-title {
font-size: 14px;
color: #1f2937;
}
.crash-product-info span {
font-size: 12px;
color: #8a94a6;
}
.crash-status {
display: inline-flex;
padding: 2px 8px;
border-radius: 999px;
font-size: 12px;
font-weight: 700;
background: #f1f5f9;
color: #64748b;
}
.crash-status.pending_payment {
background: #fff7ed;
color: #ff6a00;
}
.crash-status.paid {
background: #ecfdf5;
color: #059669;
}
.crash-status.completed {
background: #eff6ff;
color: #2563eb;
}
.crash-status.cancelled,
.crash-status.refunded {
background: #f8fafc;
color: #94a3b8;
}
.crash-card-body {
display: grid;
grid-template-columns: 64px 1fr;
gap: 12px;
}
.order-card {
border: 1px solid #e5e7eb;
border-radius: 12px;
@@ -580,6 +887,7 @@ function getCountdownMinutes(order: Order) {
display: flex;
align-items: center;
gap: 8px;
min-width: 0;
}
.card-title {