fix: some
All checks were successful
构建并部署前端到测试环境 / deploy (push) Successful in 54s

This commit is contained in:
luo
2026-10-28 15:18:44 +08:00
parent 06684e1fc0
commit f2614d8efb
99 changed files with 11511 additions and 132 deletions

View File

@@ -2,10 +2,16 @@
<ElDialog
v-model="visible"
title="套餐充值"
width="40%"
width="min(760px, 96vw)"
@closed="handleDialogClosed"
>
<ElForm ref="formRef" :model="form" :rules="rules" label-width="80px">
<SilencePurchaseFields
v-if="hasAuth(PACKAGE_SILENCE_PERMISSIONS.override)"
v-model:days="form.silence_period_days"
v-model:reason="form.silence_reason"
:disabled="loading"
/>
<ElFormItem label="资产信息">
<span style="font-weight: bold; color: #409eff">
{{ assetIdentifier }}
@@ -131,7 +137,16 @@
import { useUserStore } from '@/store/modules/user'
import VoucherUpload from '@/components/business/VoucherUpload.vue'
import { hasVoucherKeys, toVoucherKeyList } from '@/utils/business'
import { normalizeApiError } from '@/utils/business/apiError'
import { gatewayError } from '@/utils/business/gateway'
import { useAuth } from '@/composables/useAuth'
import {
canAccessOrderCategory,
silencePurchaseFields,
assertSilenceResponse
} from '@/utils/business/packageSilence'
import { PACKAGE_SILENCE_PERMISSIONS } from '@/config/constants/packageSilence'
import { pollingScope } from '@/utils/business/pollingScheduler'
import SilencePurchaseFields from '@/components/business/package-silence/SilencePurchaseFields.vue'
interface Props {
modelValue: boolean
@@ -150,6 +165,7 @@
const emit = defineEmits<Emits>()
const userStore = useUserStore()
const { hasAuth } = useAuth()
const formRef = ref<FormInstance>()
const uploadRef = ref<InstanceType<typeof VoucherUpload>>()
const loading = ref(false)
@@ -159,10 +175,19 @@
const packagesEmptyWithSeriesId = ref(false)
const form = reactive({
silence_period_days: null as number | null,
silence_reason: '',
package_id: undefined as number | undefined,
payment_method: 'wallet' as 'wallet' | 'offline',
payment_voucher_key: [] as string[]
})
watch(
() => [props.assetIdentifier, form.package_id],
() => {
form.silence_period_days = null
form.silence_reason = ''
}
)
const rules = computed<FormRules>(() => {
const baseRules: FormRules = {
@@ -313,6 +338,9 @@
}
const handleConfirm = async () => {
const origin = pollingScope(userStore),
identifier = props.assetIdentifier
if (!canAccessOrderCategory(userStore.info.user_type) || loading.value) return
if (!formRef.value) return
if (voucherUploading.value) {
ElMessage.warning('支付凭证上传中,请稍候')
@@ -320,7 +348,13 @@
}
const valid = await formRef.value.validate().catch(() => false)
if (!valid) return
if (
!valid ||
!canAccessOrderCategory(userStore.info.user_type) ||
origin !== pollingScope(userStore) ||
identifier !== props.assetIdentifier
)
return
if (!form.package_id) {
ElMessage.error('请选择套餐')
@@ -336,6 +370,11 @@
try {
const data: CreateOrderRequest = {
...silencePurchaseFields(
hasAuth(PACKAGE_SILENCE_PERMISSIONS.override),
form.silence_period_days,
form.silence_reason
),
identifier: props.assetIdentifier,
package_ids: [form.package_id],
payment_method: form.payment_method
@@ -345,7 +384,7 @@
data.payment_voucher_key = toVoucherKeyList(form.payment_voucher_key)
}
const response = await OrderService.createOrder(data)
const response = assertSilenceResponse(await OrderService.createOrder(data))
if (response.code !== 0) {
ElMessage.error(response.msg || '订单创建失败')
return
@@ -364,13 +403,15 @@
if (error === 'cancel') {
return
}
console.error('创建订单失败:', error)
ElMessage.error(gatewayError(error))
} finally {
loading.value = false
}
}
const handleDialogClosed = () => {
form.silence_period_days = null
form.silence_reason = ''
formRef.value?.resetFields()
form.package_id = undefined
form.payment_method = 'wallet'