fix: bug
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 2m9s

This commit is contained in:
sexygoat
2026-04-23 14:59:05 +08:00
parent a9467e8a0c
commit a5e76313cb
28 changed files with 1284 additions and 702 deletions

View File

@@ -459,10 +459,16 @@
<ElRow :gutter="20">
<ElCol :span="12">
<ElFormItem label="启用强制充值">
<ElSwitch v-model="form.enable_force_recharge" />
<ElSwitch
v-model="form.enable_force_recharge"
:disabled="form.force_recharge_locked && isAgentAccount"
/>
</ElFormItem>
</ElCol>
<ElCol :span="12" v-if="form.enable_force_recharge">
<ElCol
:span="12"
v-if="form.enable_force_recharge && !(form.force_recharge_locked && isAgentAccount)"
>
<ElFormItem label="强充金额(元)" prop="force_recharge_amount">
<ElInputNumber
v-model="form.force_recharge_amount"
@@ -625,10 +631,13 @@
<ElRow :gutter="20">
<ElCol :span="12">
<ElFormItem label="启用强制充值">
<ElSwitch v-model="form.enable_force_recharge" />
<ElSwitch
v-model="form.enable_force_recharge"
:disabled="form.force_recharge_locked && isAgentAccount"
/>
</ElFormItem>
</ElCol>
<ElCol :span="12" v-if="form.enable_force_recharge">
<ElCol :span="12" v-if="form.enable_force_recharge && !(form.force_recharge_locked && isAgentAccount)">
<ElFormItem label="强充金额(元)" prop="force_recharge_amount">
<ElInputNumber
v-model="form.force_recharge_amount"
@@ -783,6 +792,8 @@
import type { SearchFormItem } from '@/types'
import { useCheckedColumns } from '@/composables/useCheckedColumns'
import { useAuth } from '@/composables/useAuth'
import { useUserStore } from '@/store/modules/user'
import { storeToRefs } from 'pinia'
import { formatDateTime } from '@/utils/business/format'
import {
CommonStatus,
@@ -797,6 +808,9 @@
const { hasAuth } = useAuth()
const router = useRouter()
const userStore = useUserStore()
const { info: userInfo } = storeToRefs(userStore)
const isAgentAccount = computed(() => userInfo.value.user_type === 3)
const dialogVisible = ref(false)
const loading = ref(false)
@@ -1036,6 +1050,7 @@
}>, // 梯度配置(包含完整字段,从系列继承)
enable_force_recharge: false,
force_recharge_amount: undefined,
force_recharge_locked: false, // 强充是否被套餐系列锁定
series_force_recharge_amount: 0, // 系列强充金额(元)
packages: [] as Array<{ package_id: number; cost_price: number }> // 套餐配置
})
@@ -1207,6 +1222,27 @@
)
}
},
{
prop: 'force_recharge_locked',
label: '强充锁定',
width: 100,
formatter: (row: ShopSeriesGrantResponse) => {
return h(
ElTag,
{ type: row.force_recharge_locked ? 'danger' : 'success', size: 'small' },
() => (row.force_recharge_locked ? '是' : '否')
)
}
},
{
prop: 'force_recharge_amount',
label: '强充金额',
width: 100,
formatter: (row: ShopSeriesGrantResponse) => {
if (!row.force_recharge_enabled) return '-'
return `¥${((row.force_recharge_amount || 0) / 100).toFixed(2)}`
}
},
{
prop: 'package_count',
label: '套餐数量',
@@ -1794,6 +1830,7 @@
form.force_recharge_amount = detail.force_recharge_amount
? detail.force_recharge_amount / 100
: undefined
form.force_recharge_locked = detail.force_recharge_locked || false
// 设置套餐数据
if (detail.packages && detail.packages.length > 0) {
@@ -1842,6 +1879,7 @@
form.commission_tiers = []
form.enable_force_recharge = false
form.force_recharge_amount = undefined
form.force_recharge_locked = false
form.packages = []
selectedPackageIds.value = []
packageOptions.value = [] // 清空套餐选项
@@ -1874,6 +1912,7 @@
form.commission_tiers = []
form.enable_force_recharge = false
form.force_recharge_amount = undefined
form.force_recharge_locked = false
form.packages = []
selectedPackageIds.value = []
}