fix: 核销验券功能修复与首页公告栏改版

- 首页:金刚区「抖音核销」改名「核销验券」;公告栏移至金刚区下方并支持两条同时展示,修复行距与上下间距过近
- 核销页:「抖音」文案统一改为「第三方」;券号区新增第三方平台图标行;修复 `await uni.request` 返回任务句柄(非响应体)导致的「获取凭证失败」,改回调式 rawRequest 封装;无凭证时也弹温馨提示
- 购买页:删除支付取消/失败分支引用 try 作用域外变量 outTradeNo 的失效跳转
- 类型:VoucherItem 补 product_id 可选字段,消除存量类型报错
- 导航栏标题同步改为「第三方核销」

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
jacobxu666
2026-09-17 13:49:11 +08:00
co-authored by Claude Fable 5
parent 32f3db7e85
commit e86ce2c1eb
5 changed files with 92 additions and 65 deletions
+2
View File
@@ -25,6 +25,8 @@ export interface VoucherItem {
status: number
mobile: string
product_name: string
// xuchao: 小泥人真实响应带此字段(前端按 product_id 过滤本渠道券码),mock 数据可不填,故设为可选
product_id?: string
merchant_name: string
voucherRealnameInfo?: VoucherRealnameInfo[]
}
+1 -3
View File
@@ -211,10 +211,8 @@ async function confirmBuy() {
uni.redirectTo({ url: `/packages/user/pages/order/detail?orderId=${outTradeNo}` })
}, 1500)
} catch (err: any) {
// xuchao: 取消/失败后仅提示,停留在购买页(原"跳订单列表"引用了 try 作用域外的 outTradeNo,实为失效死代码,已删)
uni.showToast({ title: err?.errMsg?.includes('cancel') ? '已取消支付' : '支付失败,请重试', icon: 'none' })
setTimeout(() => {
uni.redirectTo({ url: `/packages/user/pages/order/list?outTradeNo=${outTradeNo}` })
}, 1500)
} finally {
paying.value = false
}
+54 -12
View File
@@ -4,16 +4,23 @@
<image class="hero-bg" src="https://aliyunoss.hn12301.net/pxmall/px_douyin.png" mode="widthFix" />
<scroll-view scroll-y class="body">
<!-- 第 1 步:确认抖音下单信息 -->
<!-- 第 1 步:确认第三方下单信息 -->
<view class="section">
<view class="step-head">
<text class="step-no">第 1 步:</text>
<text class="step-title">确认抖音下单信息</text>
<text class="step-title">确认第三方下单信息</text>
</view>
<text class="step-desc">
请确认在抖音平台认证的号码与微信手机号一致,如号码不一致请在抖音订单详情页面复制券号,并粘贴在券号输入框
请确认在第三方平台认证的号码与微信手机号一致,如号码不一致请在第三方订单详情页面复制券号,并粘贴在券号输入框
</text>
<!-- xuchao: 支持的第三方出票平台图标(设计稿 50x50、间隔 12px,rpx 按 2 倍换算) -->
<view class="platform-logos">
<image class="platform-logo" src="https://aliyunoss.hn12301.net/pxmall/px_logo_dy.png" mode="aspectFit" />
<image class="platform-logo" src="https://aliyunoss.hn12301.net/pxmall/px_logo_dz.png" mode="aspectFit" />
<image class="platform-logo" src="https://aliyunoss.hn12301.net/pxmall/px_logo_mt.png" mode="aspectFit" />
</view>
<view class="field">
<text class="field-label">当前微信手机号:</text>
<view class="field-box">
@@ -22,7 +29,7 @@
</view>
<view class="field">
<text class="field-label">抖音的订单券号:</text>
<text class="field-label">第三方的订单券号:</text>
<!-- 有券号:按 code 分组单选列表 -->
<template v-if="hasVoucher">
@@ -34,7 +41,7 @@
@tap="selectVoucher(group)"
>
<text class="code-text">
抖音订单号{{ index + 1 }}:{{ group.code }}(可激活次数{{ group.count }}次)
第三方订单号{{ index + 1 }}:{{ group.code }}(可激活次数{{ group.count }}次)
</text>
<view class="radio" :class="{ 'radio--on': selectedCode === group.code }">
<view v-if="selectedCode === group.code" class="radio-dot" />
@@ -176,11 +183,11 @@
</view>
<view class="no-voucher-reason">
<text class="no-voucher-num">1.</text>
<text>抖音购卡的手机号和当前登录手机号码不一致</text>
<text>第三方购卡的手机号和当前登录手机号码不一致</text>
</view>
<view class="no-voucher-reason">
<text class="no-voucher-num">2.</text>
<text>抖音购卡的订单已经核销完成了</text>
<text>第三方购卡的订单已经核销完成了</text>
</view>
<view class="no-voucher-reason">
<text class="no-voucher-num">3.</text>
@@ -248,6 +255,27 @@ import type { BannerItem } from '../../../api/types'
const userStore = useUserStore()
// xuchao: 回调式 uni.request Promise 包装。当前 uni-app alpha 运行时下 `await uni.request()`
// 返回的是 RequestTask(仅含 uniqueId 字段)而非 HTTP 响应,res.data 恒为 undefined,
// 导致「获取凭证失败」;本页所有第三方直连请求统一改走此封装(对齐 api/request.ts 模式)。
function rawRequest(options: {
url: string
method?: 'GET' | 'POST'
data?: object
header?: Record<string, string>
}): Promise<UniApp.RequestSuccessCallbackResult> {
return new Promise((resolve, reject) => {
uni.request({
url: options.url,
method: options.method || 'GET',
data: options.data as AnyObject,
header: options.header,
success: (res: UniApp.RequestSuccessCallbackResult) => resolve(res),
fail: (err: UniApp.GeneralCallbackResult) => reject(new Error(err.errMsg || 'request:fail')),
})
})
}
const phone = ref((uni.getStorageSync('phone') as string) || '')
const maskedPhone = computed(() =>
phone.value ? phone.value.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') : '-'
@@ -364,7 +392,7 @@ onShow(async () => {
async function fetchOAuthToken() {
try {
console.log('[douyin] fetching OAuth token...')
const res = await uni.request({
const res = await rawRequest({
url: 'https://www.xiaoniren.cn/openapi/oauth2-token/authorize?client_id=uwfdRQD0CjHrz0oY&client_key=186c07637ed40ef9ef0a2289b188ac',
method: 'GET',
})
@@ -389,10 +417,12 @@ async function fetchVouchers() {
if (!phone.value || !accessToken.value) {
vouchers.value = []
vouchersLoaded.value = true
// xuchao: 凭证获取失败时无券可展示,同样弹温馨提示引导手动输入券码(此前静默无提示)
showNoVoucher.value = true
return
}
try {
const res = await uni.request({
const res = await rawRequest({
url: `https://www.xiaoniren.cn/openapi/ticket/voucher-list?status=1&mobile=${phone.value}&product_id=59221&page=1&per-page=100`,
method: 'GET',
header: {
@@ -425,7 +455,7 @@ async function verifyInputCode() {
}
uni.showLoading({ title: '验证中...', mask: true })
try {
const res = await uni.request({
const res = await rawRequest({
url: `https://www.xiaoniren.cn/openapi/ticket/voucher-list?status=1&code=${encodeURIComponent(code)}&product_id=59221&page=1&per-page=100`,
method: 'GET',
header: {
@@ -496,7 +526,7 @@ async function doActivate() {
uni.showLoading({ title: '核销中...', mask: true })
try {
// 第一步:调后端发卡绑定
const sendRes = await uni.request({
const sendRes = await rawRequest({
url: `${BASE_URL}/open-api/card/sendAndBind`,
method: 'POST',
data: {
@@ -521,7 +551,7 @@ async function doActivate() {
}
// 第二步:验证券码
const validateRes = await uni.request({
const validateRes = await rawRequest({
url: 'https://www.xiaoniren.cn/openapi/ticket/validate',
method: 'POST',
header: {
@@ -720,6 +750,18 @@ function closeNoVoucher() {
color: #ff383c;
line-height: 48rpx;
}
/* xuchao: 券号下方第三方平台图标行(20x20、间隔 12px 的 2 倍 rpx) */
.platform-logos {
display: flex;
flex-direction: row;
align-items: center;
gap: 24rpx;
margin-top: 24rpx;
}
.platform-logo {
width: 100rpx;
height: 100rpx;
}
.field-box {
display: flex;
align-items: center;