修改bug
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 4m6s

This commit is contained in:
sexygoat
2026-04-09 16:56:30 +08:00
parent 6a46aeea15
commit 472099bf96
9 changed files with 432 additions and 170 deletions

View File

@@ -120,11 +120,10 @@
</ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem :label="'套餐'" prop="package_ids">
<ElFormItem :label="'套餐'" prop="package_id">
<ElSelect
v-model="createForm.package_ids"
v-model="createForm.package_id"
:placeholder="'请选择套餐'"
multiple
filterable
remote
reserve-keyword
@@ -300,8 +299,7 @@
OrderCommissionStatus,
StandaloneIotCard,
Device,
PackageResponse,
PurchaseCheckRequest
PackageResponse
} from '@/types/api'
import type { SearchFormItem } from '@/types'
import { useCheckedColumns } from '@/composables/useCheckedColumns'
@@ -531,7 +529,7 @@
const createForm = reactive<CreateOrderRequest>({
order_type: 'single_card',
package_ids: [],
package_id: 0,
iot_card_id: null,
device_id: null,
payment_method: 'wallet', // 默认使用钱包支付
@@ -977,7 +975,7 @@
// 重置表单数据到初始值
createForm.order_type = 'single_card'
createForm.package_ids = []
createForm.package_id = 0
createForm.iot_card_id = null
createForm.device_id = null
createForm.payment_method = 'wallet'
@@ -1030,38 +1028,10 @@
identifier = selectedDevice.virtual_no
}
// 调用套餐购买预检接口
const checkData: PurchaseCheckRequest = {
order_type: createForm.order_type!,
resource_id:
createForm.order_type === 'single_card'
? createForm.iot_card_id!
: createForm.device_id!,
package_ids: createForm.package_ids
}
const checkResponse = await OrderService.purchaseCheck(checkData)
// 检查预检结果
if (checkResponse.code === 0 && checkResponse.data) {
const checkResult = checkResponse.data
// 如果需要强充,显示确认对话框
if (checkResult.need_force_recharge) {
const confirmMessage = `${checkResult.message || '钱包余额不足'}\n\n套餐总价: ¥${(checkResult.total_package_amount! / 100).toFixed(2)}\n需要强充: ¥${(checkResult.force_recharge_amount! / 100).toFixed(2)}\n钱包到账: ¥${(checkResult.wallet_credit! / 100).toFixed(2)}\n实际支付: ¥${(checkResult.actual_payment! / 100).toFixed(2)}\n\n是否继续创建订单?`
await ElMessageBox.confirm(confirmMessage, '购买预检提示', {
confirmButtonText: '继续创建',
cancelButtonText: '取消',
type: 'warning'
})
}
}
// 预检通过或用户确认后,创建订单
// 创建订单
const data: CreateOrderRequest = {
identifier,
package_ids: createForm.package_ids,
package_id: createForm.package_id,
payment_method: createForm.payment_method
}