feat: security hardening, wechat pay v3 platform cert integration, companion certification revocation, and audit closed-loop

这个提交包含在:
xcbyy
2026-10-16 17:38:17 +08:00
父节点 3bf38db8b6
当前提交 78117bb4e1
共有 58 个文件被更改,包括 12971 次插入 和 952 次删除

查看文件

@@ -239,11 +239,14 @@
<script setup>
import { ref, computed, onMounted, onUnmounted } from 'vue';
import { onLoad, onShow } from '@dcloudio/uni-app';
import { createOrder, getCompanionDetail, getUserProfile, getMarketingCoupons } from '@/common/api.js';
import { createOrder, payOrder as payOrderApi, requestWechatPayment, getCompanionDetail, getUserProfile, getMarketingCoupons } from '@/common/api.js';
import { ICONS } from '@/common/icons.js';
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
import { ensureLoginOrRedirect } from '@/common/role.js';
const currentThemeKey = ref(getCurrentThemeKey());
const currentUserId = ref(Number(uni.getStorageSync('userId') || 1001));
const currentUserName = ref((uni.getStorageSync('userInfo') && uni.getStorageSync('userInfo').nickname) || '超能电竞玩家');
const userBalance = ref('0.00');
const payMethod = ref('WECHAT'); // 'WECHAT' | 'BALANCE'
@@ -260,6 +263,9 @@ onMounted(() => {
});
onShow(() => {
if (!ensureLoginOrRedirect('/pages/order/create')) {
return;
}
currentThemeKey.value = getCurrentThemeKey();
applyThemeToNativeUI(currentThemeKey.value);
loadUserWallet();
@@ -277,9 +283,20 @@ const stopPropagation = (e) => {
const loadUserWallet = async () => {
try {
const u = await getUserProfile(1001);
if (u && u.balance !== undefined) {
userBalance.value = String(u.balance);
const uid = Number(uni.getStorageSync('userId') || 1001);
currentUserId.value = uid;
const cachedInfo = uni.getStorageSync('userInfo');
if (cachedInfo && cachedInfo.nickname) {
currentUserName.value = cachedInfo.nickname;
}
const u = await getUserProfile(uid);
if (u) {
if (u.balance !== undefined) {
userBalance.value = String(u.balance);
}
if (u.nickname) {
currentUserName.value = u.nickname;
}
}
} catch (err) {
console.warn('[OrderCreate] 加载用户资产异常:', err);
@@ -443,53 +460,116 @@ const selectBalancePay = () => {
};
const handlePay = async () => {
if (!ensureLoginOrRedirect('/pages/order/create')) {
return;
}
if (payMethod.value === 'BALANCE' && Number(userBalance.value) < finalTotal.value) {
selectBalancePay();
return;
}
const payDesc = payMethod.value === 'BALANCE' ? '钱包余额支付' : '微信支付';
uni.showLoading({ title: `正在处理${payDesc}...` });
const uid = Number(uni.getStorageSync('userId') || currentUserId.value || 1001);
const serviceTitle = selectedService.value ? selectedService.value.title : `${expert.value.game}专属服务`;
const basePayload = {
buyerId: uid,
clientName: currentUserName.value || '超能电竞玩家',
expertId: expert.value.id,
companionName: expert.value.nickname,
expertAvatar: expert.value.avatar,
track: expert.value.game || (isOffline.value ? '同城生活' : '线上电竞'),
serviceTitle,
hourlyRate: selectedService.value ? selectedService.value.price : (expert.value.price || 35),
durationHours: hours.value,
amount: finalTotal.value,
couponDiscount: discount.value,
payType: payMethod.value,
location: isOffline.value ? meetVenue.value : (remark.value || '线上语音开黑'),
expenseBurden: expenseBurden.value === 'AA' ? 'AA制各自付' : (expenseBurden.value === 'CLIENT' ? '客户全包' : '大神自理'),
remark: remark.value
};
if (payMethod.value === 'BALANCE') {
uni.showLoading({ title: '正在扣减钱包余额...' });
try {
await createOrder({
...basePayload,
status: '履约中'
});
uni.hideLoading();
const nextBal = Math.max(0, Number(userBalance.value) - finalTotal.value).toFixed(2);
userBalance.value = nextBal;
uni.showToast({
title: '钱包余额支付成功',
icon: 'success',
duration: 1500
});
setTimeout(() => {
uni.switchTab({ url: '/pages/order/list' });
}, 1000);
} catch (err) {
uni.hideLoading();
uni.showToast({
title: err.message || '余额支付异常',
icon: 'none'
});
}
return;
}
// 微信支付标准两步式闭环:1. 创建待付款订单 -> 2. 调起收银台 -> 3. 支付成功流转履约中 / 取消则保留待付款
uni.showLoading({ title: '正在生成预付订单...' });
let createdOrder = null;
try {
const payload = {
buyerId: 1001,
clientName: '超能电竞玩家',
expertId: expert.value.id,
companionName: expert.value.nickname,
expertAvatar: expert.value.avatar,
track: expert.value.game || (isOffline.value ? '同城生活' : '线上电竞'),
serviceTitle: selectedService.value ? selectedService.value.title : `${expert.value.game}专属服务`,
hourlyRate: selectedService.value ? selectedService.value.price : (expert.value.price || 35),
durationHours: hours.value,
amount: finalTotal.value,
couponDiscount: discount.value,
payType: payMethod.value,
location: isOffline.value ? meetVenue.value : (remark.value || '线上语音开黑'),
expenseBurden: expenseBurden.value === 'AA' ? 'AA制各自付' : (expenseBurden.value === 'CLIENT' ? '客户全包' : '大神自理'),
remark: remark.value,
status: '履约中'
};
await createOrder(payload);
createdOrder = await createOrder({
...basePayload,
status: '待付款'
});
uni.hideLoading();
} catch (err) {
uni.hideLoading();
uni.showToast({
title: `${payDesc}成功!订单已写入系统`,
title: err.message || '创建订单失败',
icon: 'none'
});
return;
}
try {
await requestWechatPayment({
amount: finalTotal.value,
title: serviceTitle,
orderId: createdOrder && createdOrder.id ? createdOrder.id : '',
scene: 'ORDER',
userId: uid
});
uni.showLoading({ title: '正在确认支付结果...' });
if (createdOrder && createdOrder.id) {
await payOrderApi(createdOrder.id, {
targetStatus: '履约中',
payType: 'WECHAT',
buyerId: uid
});
}
uni.hideLoading();
uni.showToast({
title: '微信支付成功!订单已生效',
icon: 'success',
duration: 1500
});
setTimeout(() => {
uni.switchTab({
url: '/pages/order/list'
});
uni.switchTab({ url: '/pages/order/list' });
}, 1000);
} catch (err) {
} catch (payErr) {
uni.hideLoading();
uni.showToast({
title: err.message || '下单异常',
icon: 'none'
title: payErr.cancelled ? '已取消支付,可在订单中心继续付款' : (payErr.message || '支付未完成'),
icon: 'none',
duration: 1800
});
setTimeout(() => {
uni.switchTab({ url: '/pages/order/list' });
}, 1200);
}
};
</script>

查看文件

@@ -354,10 +354,12 @@ import {
refundOrder as refundOrderApi,
submitOrderReview as submitOrderReviewApi,
submitReport as submitReportApi,
requestWechatPayment,
uploadImage
} from '@/common/api.js';
import { ICONS } from '@/common/icons.js';
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
import { ensureLoginOrRedirect } from '@/common/role.js';
import { getNavBarInfo } from '@/common/nav.js';
const currentThemeKey = ref(getCurrentThemeKey());
@@ -426,6 +428,9 @@ onMounted(() => {
});
onShow(() => {
if (!ensureLoginOrRedirect('/pages/order/list')) {
return;
}
navInfo.value = getNavBarInfo();
currentThemeKey.value = getCurrentThemeKey();
applyThemeToNativeUI(currentThemeKey.value);
@@ -501,18 +506,38 @@ const cancelOrder = (id) => {
};
const payOrder = async (id) => {
const o = orders.value.find(item => item.id === id);
const amount = o ? Number(o.totalAmount || o.amount || 0) : 0;
const title = o ? (o.gameName || o.skillName || '陪玩订单支付') : '陪玩订单支付';
const uid = Number(uni.getStorageSync('userId') || 1001);
uni.showLoading({ title: '正在拉起微信支付...' });
try {
await payOrderApi(id);
await requestWechatPayment({
amount,
title,
orderId: id,
scene: 'ORDER',
userId: uid
});
await payOrderApi(id, {
targetStatus: '履约中',
payType: 'WECHAT',
buyerId: uid
});
uni.hideLoading();
const o = orders.value.find(item => item.id === id);
if (o) o.status = 'IN_SERVICE';
if (o) {
o.status = 'IN_SERVICE';
o.rawStatus = '履约中';
}
uni.showToast({ title: '支付成功,服务已开始', icon: 'success' });
} catch (err) {
uni.hideLoading();
const o = orders.value.find(item => item.id === id);
if (o) o.status = 'IN_SERVICE';
uni.showToast({ title: '拉起微信支付成功', icon: 'success' });
if (err && err.cancelled) {
uni.showToast({ title: '已取消支付', icon: 'none' });
} else {
uni.showToast({ title: (err && err.message) || '支付未完成,请重试', icon: 'none' });
}
}
};
@@ -839,7 +864,7 @@ const submitReview = async () => {
const expertId = order.expert ? order.expert.id : (order.expertId || 101);
await submitOrderReviewApi(order.id, {
expertId,
userId: 1001,
userId: Number(uni.getStorageSync('userId') || 1001),
userNickname: '电竞玩家 (我)',
rating: reviewForm.value.rating,
tags: reviewForm.value.selectedTags,