fix: pay
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 56s

This commit is contained in:
luo
2026-07-03 09:07:28 +08:00
parent 6756ad5700
commit a9fbbea1e6
7 changed files with 144 additions and 35 deletions

View File

@@ -59,7 +59,7 @@
</view>
<view class="payment-methods">
<view class="method-item" :class="{ active: paymentMethod === 'wechat' }" @tap="selectPaymentMethod('wechat')">
<view v-if="isDeviceAsset" class="method-item" :class="{ active: paymentMethod === 'wechat' }" @tap="selectPaymentMethod('wechat')">
<view class="method-left">
<image class="method-icon" src="/static/wechat.png" mode="aspectFit"></image>
<text class="method-name">微信支付</text>
@@ -67,7 +67,7 @@
<view class="method-radio" :class="{ checked: paymentMethod === 'wechat' }"></view>
</view>
<view class="method-item" :class="{ active: paymentMethod === 'alipay' }" @tap="selectPaymentMethod('alipay')">
<view v-else class="method-item" :class="{ active: paymentMethod === 'alipay' }" @tap="selectPaymentMethod('alipay')">
<view class="method-left">
<view class="method-icon method-badge method-badge-alipay"></view>
<text class="method-name">支付宝支付</text>
@@ -120,6 +120,8 @@
const paymentMethod = ref('wechat');
const walletBalance = ref(0);
const paySubmitting = ref(false);
const isDeviceAsset = ref(true);
let assetTypePromise = null;
const formatMoney = (amount) => {
if (!amount && amount !== 0) return '0.00';
@@ -133,6 +135,40 @@
return `${allowance} ${unit}`;
};
const getDefaultPaymentMethod = () => isDeviceAsset.value ? 'wechat' : 'alipay';
const isPaymentMethodAvailable = (method) => {
if (method === 'wallet') return true;
if (method === 'wechat') return isDeviceAsset.value;
if (method === 'alipay') return !isDeviceAsset.value;
return false;
};
const normalizePaymentMethod = () => {
if (!isPaymentMethodAvailable(paymentMethod.value)) {
paymentMethod.value = getDefaultPaymentMethod();
}
};
const loadAssetType = async () => {
if (!userStore.state.identifier) return;
if (assetTypePromise) return assetTypePromise;
assetTypePromise = assetApi.getInfo(userStore.state.identifier)
.then((data) => {
isDeviceAsset.value = data.asset_type === 'device';
normalizePaymentMethod();
})
.catch((error) => {
console.error('加载资产类型失败', error);
})
.finally(() => {
assetTypePromise = null;
});
return assetTypePromise;
};
const loadPackages = async () => {
loading.value = true;
try {
@@ -154,17 +190,20 @@
};
const syncPackagePageState = () => {
loadAssetType();
loadPackages();
loadWalletBalance();
};
const buyPackage = (item) => {
const buyPackage = async (item) => {
await loadAssetType();
currentPackage.value = item;
paymentMethod.value = 'wechat';
paymentMethod.value = getDefaultPaymentMethod();
showModal.value = true;
};
const selectPaymentMethod = (method) => {
if (!isPaymentMethodAvailable(method)) return;
paymentMethod.value = method;
};
@@ -203,7 +242,9 @@
};
const getCreateOrderPaymentMethod = () => {
return paymentMethod.value === 'alipay' ? 'alipay' : undefined;
if (paymentMethod.value === 'alipay') return 'alipay';
if (paymentMethod.value === 'wallet' && !isDeviceAsset.value) return 'alipay';
return undefined;
};
const confirmPay = async () => {