From e24160753566e1b2f60490e15fb79abcd8b6ed1e Mon Sep 17 00:00:00 2001 From: yml2213 Date: Thu, 16 Jul 2026 20:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=B7=E4=B8=BB=E4=B8=8E?= =?UTF-8?q?=E7=A7=9F=E5=AE=A2=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E5=B8=83/=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增卖家商品详情页；订单详情底部增加可折叠账号快照，已完成订单展示结账明细。 --- backend/internal/modules/order/presenter.go | 41 +- .../components/OrderAccountSnapshot.vue | 503 +++++++++++++ frontend/src/features/orders/index.ts | 1 + .../orders/views/MobileOrderDetailView.vue | 55 +- .../features/orders/views/OrderDetailView.vue | 11 +- .../views/MobileSellerListingDetailView.vue | 661 ++++++++++++++++++ .../seller/views/MobileSellerListingsView.vue | 84 ++- .../seller/views/SellerListingDetailView.vue | 515 ++++++++++++++ .../seller/views/SellerListingsView.vue | 78 ++- frontend/src/router/mobileHost.ts | 4 + frontend/src/router/mobileRoutes.ts | 6 + frontend/src/router/sellerRoutes.ts | 6 + 12 files changed, 1870 insertions(+), 95 deletions(-) create mode 100644 frontend/src/features/orders/components/OrderAccountSnapshot.vue create mode 100644 frontend/src/features/seller/views/MobileSellerListingDetailView.vue create mode 100644 frontend/src/features/seller/views/SellerListingDetailView.vue diff --git a/backend/internal/modules/order/presenter.go b/backend/internal/modules/order/presenter.go index 21eab22..1f34bf7 100644 --- a/backend/internal/modules/order/presenter.go +++ b/backend/internal/modules/order/presenter.go @@ -231,10 +231,43 @@ func sanitizeOrderSnapshot(snapshot *datatypes.JSON, role string) { return } } - breakdown, _ := summary["price_breakdown"].(map[string]any) - if role == "owner" && breakdown != nil { - if sellerRatio := readJSONNumber(breakdown["seller_ratio"]); sellerRatio > 0 { - summary["publish_ratio"] = sellerRatio + // price_breakdown 含双方比例与加价明细，仅把当前角色可见的价格字段摊平到 summary，再删除原对象。 + if breakdown, ok := summary["price_breakdown"].(map[string]any); ok && breakdown != nil { + switch role { + case "owner": + if v := readJSONNumber(breakdown["seller_ratio"]); v > 0 { + summary["publish_ratio"] = v + summary["display_ratio"] = v + } + if v := readJSONNumber(breakdown["seller_reference_ratio"]); v > 0 { + summary["reference_ratio"] = v + } + if v := readJSONNumber(breakdown["seller_total_price"]); v > 0 { + summary["display_total_price"] = v + } + if v := readJSONNumber(breakdown["seller_coin_base_price"]); v > 0 { + summary["display_coin_base_price"] = v + } + if v := readJSONNumber(breakdown["accelerated_sale_ratio"]); v > 0 { + summary["accelerated_sale_ratio"] = v + } + case "renter": + if v := readJSONNumber(breakdown["buyer_ratio"]); v > 0 { + summary["publish_ratio"] = v + summary["display_ratio"] = v + } + if v := readJSONNumber(breakdown["buyer_total_price"]); v > 0 { + summary["display_total_price"] = v + } + if v := readJSONNumber(breakdown["buyer_coin_base_price"]); v > 0 { + summary["display_coin_base_price"] = v + } + } + if v := readJSONNumber(breakdown["consumable_price"]); v > 0 { + summary["consumable_price"] = v + } + if v := readJSONNumber(breakdown["daily_loss_ratio_adjustment"]); v != 0 { + summary["daily_loss_ratio_adjustment"] = v } } delete(summary, "price_breakdown") diff --git a/frontend/src/features/orders/components/OrderAccountSnapshot.vue b/frontend/src/features/orders/components/OrderAccountSnapshot.vue new file mode 100644 index 0000000..05518c1 --- /dev/null +++ b/frontend/src/features/orders/components/OrderAccountSnapshot.vue @@ -0,0 +1,503 @@ + + + + + diff --git a/frontend/src/features/orders/index.ts b/frontend/src/features/orders/index.ts index 6e8d803..225c944 100644 --- a/frontend/src/features/orders/index.ts +++ b/frontend/src/features/orders/index.ts @@ -1,6 +1,7 @@ // Orders 模块统一导出 export * from './api/orders' export * from './composables/useOrderSnapshot' +export { default as OrderAccountSnapshot } from './components/OrderAccountSnapshot.vue' export { default as OrderCheckoutSummary } from './components/OrderCheckoutSummary.vue' export { default as OrderHandoffTimeline } from './components/OrderHandoffTimeline.vue' export { default as OrderResourceUsageEditor } from './components/OrderResourceUsageEditor.vue' diff --git a/frontend/src/features/orders/views/MobileOrderDetailView.vue b/frontend/src/features/orders/views/MobileOrderDetailView.vue index 9a8cfc7..4707fc1 100644 --- a/frontend/src/features/orders/views/MobileOrderDetailView.vue +++ b/frontend/src/features/orders/views/MobileOrderDetailView.vue @@ -8,13 +8,9 @@ import MobilePayWaySelectPopup from '@/features/orders/components/MobilePayWaySe import { useOrderActions, CONFIRMABLE_ACTIONS } from '@/features/orders/composables/useOrderActions' import { useMobilePaymentCashier } from '@/features/orders/composables/useMobilePaymentCashier' import { useMobilePayWaySelect } from '@/features/orders/composables/useMobilePayWaySelect' +import { amountYuan, money } from '@/features/orders/composables/useOrderSnapshot' import { - amountYuan, - money, - readAssetSummary as readOrderAssetSummary, - readSnapshot as readOrderSnapshot, -} from '@/features/orders/composables/useOrderSnapshot' -import { + OrderAccountSnapshot, OrderCheckoutSummary, OrderHandoffTimeline, OrderResourceUsageEditor, @@ -116,20 +112,11 @@ const { onCreateDisputeSuccess: () => (showDisputePopup.value = false), }) -// Mobile 独有 UI 状态：折叠面板、各类 popup 显隐。 -const activeNames = ref([]) +// Mobile 独有 UI 状态：各类 popup 显隐。 const showDisputePopup = ref(false) const showCounterPopup = ref(false) const showRejectPopup = ref(false) -// 账号快照展示（PC 不用，保留在本视图）。 -function readSnapshot() { - return readOrderSnapshot(order.value) as Record | null -} -function readAssetSummary() { - return readOrderAssetSummary(order.value) as Record | null -} - // 状态颜色映射（vant 标签主题）。 function getStatusTagType(status: string) { if (['completed', 'received'].includes(status)) return 'success' @@ -336,11 +323,16 @@ async function copyListingCode() { @submit="handleSubmitCheckout" /> - + - -
- - - - - - -
+
diff --git a/frontend/src/features/orders/views/OrderDetailView.vue b/frontend/src/features/orders/views/OrderDetailView.vue index 2fa103f..b1844b9 100644 --- a/frontend/src/features/orders/views/OrderDetailView.vue +++ b/frontend/src/features/orders/views/OrderDetailView.vue @@ -7,6 +7,7 @@ import { ChatDotRound, CopyDocument, Loading, Service } from '@element-plus/icon import { amountYuan, money, + OrderAccountSnapshot, OrderCheckoutSummary, OrderHandoffTimeline, OrderResourceUsageEditor, @@ -467,7 +468,12 @@ watch([() => route.query.focus, order, loading], () => { v-if=" order && order.checkout && - ['pending_checkout_confirm', 'pending_checkout_accept'].includes(order.status) + [ + 'pending_checkout_confirm', + 'pending_checkout_accept', + 'checkout_disputing', + 'completed', + ].includes(order.status) " :order="order" :is-owner="isOwner" @@ -569,6 +575,9 @@ watch([() => route.query.focus, order, loading], () => { >
+ + + diff --git a/frontend/src/features/seller/views/MobileSellerListingDetailView.vue b/frontend/src/features/seller/views/MobileSellerListingDetailView.vue new file mode 100644 index 0000000..cf7d547 --- /dev/null +++ b/frontend/src/features/seller/views/MobileSellerListingDetailView.vue @@ -0,0 +1,661 @@ + + + + + diff --git a/frontend/src/features/seller/views/MobileSellerListingsView.vue b/frontend/src/features/seller/views/MobileSellerListingsView.vue index e5e7c54..0bacf9d 100644 --- a/frontend/src/features/seller/views/MobileSellerListingsView.vue +++ b/frontend/src/features/seller/views/MobileSellerListingsView.vue @@ -142,6 +142,10 @@ function goEdit(row: Listing) { router.push(`/m/seller/listings/${row.id}/edit`) } +function goDetail(row: Listing) { + router.push(`/m/seller/listings/${row.id}`) +} + function canSubmit(row: Listing) { return !isTerminalListing(row) && !isPendingReview(row) && row.status !== 'published' } @@ -244,7 +248,7 @@ function isPendingReview(row: Listing) {
- @@ -262,35 +266,47 @@ function isPendingReview(row: Listing) {
- -

{{ item.title }}

+ +
+ + 详情 + +import { computed, onMounted, ref } from 'vue' +import { useRoute, useRouter } from 'vue-router' +import { ElMessage, ElMessageBox } from 'element-plus' +import { ArrowLeft, CopyDocument, Edit } from '@element-plus/icons-vue' + +import { + fetchSellerListing, + offlineListing, + submitListingReview, + type Listing, +} from '@/features/listings' +import AuthImage from '@/shared/components/business/AuthImage.vue' +import { formatCent, formatMoney, formatMoneyWithSymbol } from '@/shared/utils/money' +import { listingReviewStatusLabel, listingStatusLabel } from '@/shared/utils/statusLabels' +import { + assetRegions, + formatAssetNumber, + formatEstimatedRentalDuration, + formatHafCoinM, + formatListingCode, + formatRatio, + getCoinWan, + getDailyLoss, + getListingChips, + getListingResources, + getListingSellerPrice, + getListingSubtitle, + getListingTitle, + getLoginMethod, + getOnlineTimeText, + getServerRegion, + readAssetNumber, + readAssetString, +} from '@/shared/utils/listingDisplay' +import { readError } from '@/shared/utils/error' +import { formatDateTime } from '@/shared/utils/time' + +const route = useRoute() +const router = useRouter() +const loading = ref(false) +const acting = ref(false) +const listing = ref(null) + +onMounted(load) + +async function load() { + loading.value = true + try { + listing.value = await fetchSellerListing(String(route.params.id)) + } catch (error) { + ElMessage.error(readError(error, '加载失败，仅能查看自己的商品')) + listing.value = null + } finally { + loading.value = false + } +} + +const sellerPrice = computed(() => + listing.value ? formatMoneyWithSymbol(getListingSellerPrice(listing.value)) : '—' +) + +const detailScreenshots = computed(() => { + if (!listing.value) return [] + const groups = listing.value.asset_summary?.screenshot_groups + if (typeof groups === 'object' && groups !== null) { + const slots = [ + { key: 'coin', label: '纯币截图' }, + { key: 'gameId', label: '游戏ID截图' }, + { key: 'totalAsset', label: '总资产截图' }, + { key: 'tencentSecurity', label: '腾讯安全中心截图' }, + { key: 'skin', label: '皮肤截图' }, + ] + return slots.flatMap(slot => { + const urls = (groups as Record)[slot.key] + if (!Array.isArray(urls)) return [] + const valid = urls.filter((u): u is string => typeof u === 'string' && Boolean(u)) + return valid.map((url, i) => ({ + label: valid.length > 1 ? `${slot.label}${i + 1}` : slot.label, + url, + })) + }) + } + const labels = ['纯币截图', '游戏ID截图', '总资产截图', '腾讯安全中心截图', '皮肤截图'] + return (listing.value.screenshot_urls || []).map((url, index) => ({ + label: labels[index] || `账号截图${index + 1}`, + url, + })) +}) +const detailScreenshotUrls = computed(() => detailScreenshots.value.map(s => s.url)) + +const detailSkinGroups = computed(() => { + if (!listing.value) return [] + const groups = listing.value.asset_summary?.skin_groups + if (typeof groups !== 'object' || groups === null) return [] + const titles: Record = { + melee: '近战皮肤', + operator: '干员皮肤', + operatorGold: '干员金皮', + operatorRed: '干员红皮', + weapon: '武器皮肤', + } + return Object.entries(groups as Record) + .map(([key, value]) => ({ + key, + title: titles[key] || key, + options: Array.isArray(value) + ? value.filter((skin): skin is string => typeof skin === 'string') + : [], + })) + .filter(g => g.options.length) +}) + +const accountRows = computed(() => { + if (!listing.value) return [] + const regions = assetRegions(listing.value) + const secretKD = readAssetNumber(listing.value, 'secret_kd') + const fireLevel = readAssetNumber(listing.value, 'fire_level') + return [ + { label: '所属区服', value: getServerRegion(listing.value) || '--' }, + { label: '上号方式', value: getLoginMethod(listing.value) || '--' }, + { label: '游戏段位', value: listing.value.rank_level || '--' }, + { label: '烽火等级', value: fireLevel > 0 ? `${fireLevel}级` : '--' }, + { label: '体力等级', value: readAssetString(listing.value, 'stamina_level') || '--' }, + { label: '负重等级', value: readAssetString(listing.value, 'load_level') || '--' }, + { label: '绝密KD', value: secretKD > 0 ? formatAssetNumber(secretKD) : '--' }, + { label: '纯币', value: formatHafCoinM(getCoinWan(listing.value)) }, + { label: '日损耗', value: getDailyLoss(listing.value) ? `${getDailyLoss(listing.value)}/天` : '--' }, + { label: 'M单价', value: formatRatio(listing.value) }, + { label: '方便上号', value: getOnlineTimeText(listing.value) || '--' }, + { label: '预计可租', value: formatEstimatedRentalDuration(listing.value) }, + { label: '常用登录地', value: regions.length ? regions.join('、') : '--' }, + { label: '封禁记录', value: readAssetString(listing.value, 'ban_record') || '无' }, + { label: '卖家到手价', value: sellerPrice.value }, + { label: '押金', value: `¥${formatCent(listing.value.deposit_amount_cent)}` }, + ] +}) + +function isTerminal(row: Listing) { + return row.status === 'rented' || row.status === 'completed' +} +function isPendingReview(row: Listing) { + return !isTerminal(row) && row.status !== 'offline' && row.review_status === 'pending' +} +function canEdit(row: Listing) { + return !isTerminal(row) && !isPendingReview(row) && row.status !== 'published' +} +function canSubmit(row: Listing) { + return !isTerminal(row) && !isPendingReview(row) && row.status !== 'published' +} +function canOffline(row: Listing) { + return !isTerminal(row) && row.status !== 'offline' +} + +async function copyCode() { + if (!listing.value) return + try { + await navigator.clipboard.writeText(formatListingCode(listing.value)) + ElMessage.success('商品编号已复制') + } catch { + ElMessage.error('复制失败') + } +} + +async function handleSubmit() { + if (!listing.value) return + acting.value = true + try { + listing.value = await submitListingReview(listing.value.id) + ElMessage.success( + listing.value.status === 'published' && listing.value.review_status === 'approved' + ? '已上架' + : '已提交审核' + ) + } catch (error) { + ElMessage.error(readError(error, '提审失败')) + } finally { + acting.value = false + } +} + +async function handleOffline() { + if (!listing.value) return + try { + await ElMessageBox.confirm(`确认下架「${listing.value.title}」吗？`, '下架确认', { + type: 'warning', + confirmButtonText: '确认下架', + }) + } catch { + return + } + acting.value = true + try { + listing.value = await offlineListing(listing.value.id) + ElMessage.success('已下架') + } catch (error) { + ElMessage.error(readError(error, '下架失败')) + } finally { + acting.value = false + } +} + + + + + diff --git a/frontend/src/features/seller/views/SellerListingsView.vue b/frontend/src/features/seller/views/SellerListingsView.vue index 783be88..5419137 100644 --- a/frontend/src/features/seller/views/SellerListingsView.vue +++ b/frontend/src/features/seller/views/SellerListingsView.vue @@ -1,8 +1,8 @@