luo/device-voice-h5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 7月迭代
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m11s
Details

Browse Source
This commit is contained in:
luo
2026-07-27 18:13:19 +08:00
parent 6a794d88af
commit 4f281da778
27 changed files with 1176 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
pages/order-list/order-list.vue
View File

@@ -21,7 +21,7 @@
</view>
<view v-else class="order-list">
<view class="order-card" v-for="item in orderList" :key="item.order_id">
<view class="order-card" v-for="item in orderList" :key="item.order_id" @tap="openOrderDetail(item)">
<view class="card-header">
<view class="header-left">
<view class="header-row">
@@ -44,6 +44,14 @@
</view>
</view>
</view>
<view class="info-item">
<view class="info-label">购买角色</view>
<view class="info-value">{{ item.purchase_role || '-' }}</view>
</view>
<view class="info-item">
<view class="info-label">资产标识</view>
<view class="info-value">{{ item.asset_identifier || '-' }}</view>
</view>
<view class="info-item">
<view class="info-label">订单金额</view>
<view class="info-value amount">¥{{ formatMoney(item.total_amount) }}</view>
@@ -55,10 +63,13 @@
</view>
<view v-if="item.payment_status === 1" class="card-footer">
<button class="btn-pay" :disabled="orderPayingId !== null" @tap="showOrderPaymentMethods(item)">
<button class="btn-pay" :disabled="orderPayingId !== null" @tap.stop="showOrderPaymentMethods(item)">
{{ isOrderPaying(item) ? '处理中...' : '立即支付' }}
</button>
</view>
<view v-else-if="item.payment_status === 2 && item.package_ids?.length" class="card-footer">
<button class="btn-pay btn-renew" @tap.stop="startHistoricalRenewal(item)">继续续费</button>
</view>
</view>
</view>
@@ -87,6 +98,8 @@
showPaymentToast,
wechatH5Pay
} from '@/utils/payment.js';
import { formatMoney } from '@/utils/display.js';
import { getPaymentMethodOptions, normalizePaymentMethods } from '@/utils/payment-methods.js';
const userStore = useUserStore();
@@ -97,12 +110,9 @@
const orderPayingId = ref(null);
const pageSize = 10;
const filterIndex = ref(0);
const isDeviceAsset = ref(true);
const allowedPaymentMethods = ref([]);
let assetTypePromise = null;
const paymentMethodOptions = computed(() => [
{ label: '支付宝支付', value: 'alipay' },
{ label: '钱包支付', value: 'wallet' }
]);
const paymentMethodOptions = computed(() => getPaymentMethodOptions(allowedPaymentMethods.value));
const filterOptions = [
{ label: '全部', value: null },
{ label: '待支付', value: 1 },
@@ -111,11 +121,6 @@
{ label: '已退款', value: 4 }
];
const formatMoney = (amount) => {
if (!amount && amount !== 0) return '0.00';
return (amount / 100).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
const getStatusClass = (status) => {
const classMap = {
1: 'tag-warning',
@@ -132,7 +137,7 @@
assetTypePromise = assetApi.getInfo(userStore.state.identifier)
.then((data) => {
isDeviceAsset.value = data.asset_type === 'device';
allowedPaymentMethods.value = normalizePaymentMethods(data.allowed_payment_methods);
})
.catch((error) => {
console.error('加载资产类型失败', error);
@@ -185,6 +190,7 @@
const newData = (data.items || []).map((item) => ({
...item,
asset_identifier: item.asset_identifier || item.virtual_no || item.VirtualNo || item.imei || '',
payment_status_name: item.payment_status === 1
? '待支付'
: item.payment_status === 2
@@ -223,10 +229,27 @@
const isOrderPaying = (order) => orderPayingId.value === order.order_id;
const openOrderDetail = (order) => {
if (!order?.order_id || orderPayingId.value !== null) return;
uni.navigateTo({ url: `/pages/order-detail/order-detail?id=${order.order_id}` });
};
const startHistoricalRenewal = (order) => {
const packageIds = Array.isArray(order?.package_ids) ? order.package_ids.filter(Boolean) : [];
if (!packageIds.length) return;
const packageNames = Array.isArray(order.package_names) ? order.package_names : [];
const query = `renewal_package_ids=${encodeURIComponent(packageIds.join(','))}&renewal_package_names=${encodeURIComponent(packageNames.join('|'))}`;
uni.navigateTo({ url: `/pages/package-order/package-order?${query}` });
};
const showOrderPaymentMethods = async (order) => {
if (orderPayingId.value !== null || !order?.order_id) return;
await loadAssetType();
const options = paymentMethodOptions.value;
if (!options.length) {
uni.showToast({ title: '暂无可用支付方式', icon: 'none' });
return;
}
uni.showActionSheet({
itemList: options.map((item) => item.label),
@@ -253,7 +276,7 @@
uni.hideLoading();
if (paymentMethod === 'wallet') {
showPaymentToast(true, '支付成功');
await confirmOrderStatus(order);
setTimeout(() => {
resetOrderListAndLoad();
}, 1500);
@@ -271,7 +294,7 @@
try {
await wechatH5Pay(payData.pay_config);
showPaymentToast(true, '支付成功');
await confirmOrderStatus(order);
setTimeout(() => {
resetOrderListAndLoad();
}, 1500);
@@ -302,6 +325,17 @@
}
};
const confirmOrderStatus = async (order) => {
try {
const detail = await orderApi.getDetail(order.order_id);
const status = detail?.payment_status ?? detail?.order?.payment_status;
showPaymentToast(status === 2, status === 2 ? '支付成功' : '支付结果确认中');
} catch (error) {
console.error('确认订单支付状态失败', error);
showPaymentToast(false, '支付结果确认失败，请稍后查看订单');
}
};
onShow(() => {
if (!consumePendingPaymentRefresh(PAYMENT_REFRESH_TARGETS.ORDER_LIST)) {
return;
@@ -491,7 +525,7 @@
display: flex;
justify-content: flex-end;
.btn-pay {
.btn-pay {
background: #1890ff;
color: #fff;
border: none;
@@ -508,6 +542,8 @@
&::after {
border: none;
}
&.btn-renew { background: #52c41a; }
}
}
}