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

This commit is contained in:
luo
2026-07-30 16:05:48 +08:00
parent 93ed3fbd63
commit 055fed0cf1
8 changed files with 82 additions and 60 deletions

View File

@@ -324,21 +324,6 @@
</ElFormItem>
</ElCol>
</ElRow>
<ElRow :gutter="20">
<ElCol :span="24">
<ElFormItem label="套餐描述" prop="description">
<ElInput
v-model="form.description"
type="textarea"
:rows="3"
placeholder="请输入套餐描述(可选)"
maxlength="500"
show-word-limit
/>
</ElFormItem>
</ElCol>
</ElRow>
</ElForm>
<template #footer>
<div class="dialog-footer">
@@ -737,8 +722,7 @@
virtual_data_mb: 0,
cost_price: 0,
suggested_retail_price: undefined,
is_gift: false,
description: ''
is_gift: false
})
// GB 输入值(用于界面显示)
@@ -1369,7 +1353,6 @@
: undefined
originalSuggestedRetailPrice.value = data.suggested_retail_price ?? null
form.is_gift = data.is_gift || false
form.description = data.description || ''
// 数据填充完成后再显示对话框
dialogVisible.value = true
@@ -1397,7 +1380,6 @@
virtualRatioPercent.value = null
form.cost_price = 0
form.suggested_retail_price = undefined
form.description = ''
dialogVisible.value = true
}
@@ -1443,7 +1425,6 @@
form.suggested_retail_price = undefined
originalSuggestedRetailPrice.value = null
form.is_gift = false
form.description = ''
}
// 删除套餐

View File

@@ -1021,11 +1021,14 @@
// 添加强充配置:元 -> 分(仅累计充值时需要)
if (form.one_time_commission_config.trigger_type === 'accumulated_recharge') {
commissionConfig.enable_force_recharge = true
commissionConfig.force_amount =
form.one_time_commission_config.force_amount != null
const enableForceRecharge =
form.one_time_commission_config.enable_force_recharge === true
commissionConfig.enable_force_recharge = enableForceRecharge
commissionConfig.force_amount = enableForceRecharge
? form.one_time_commission_config.force_amount != null
? Math.round(form.one_time_commission_config.force_amount * 100)
: undefined
: 0
commissionConfig.force_calc_type = form.one_time_commission_config.force_calc_type
}

View File

@@ -484,14 +484,14 @@
<ElFormItem label="启用强制充值">
<ElSwitch
v-model="form.enable_force_recharge"
:disabled="form.force_recharge_locked && isAgentAccount"
:disabled="isForceRechargeLockedForAgent"
/>
<ElTag v-if="form.force_recharge_locked" type="danger" size="small">
平台已锁定
</ElTag>
</ElFormItem>
</ElCol>
<ElCol
:span="12"
v-if="form.enable_force_recharge && !(form.force_recharge_locked && isAgentAccount)"
>
<ElCol :span="12" v-if="form.enable_force_recharge">
<ElFormItem label="强充金额(元)" prop="force_recharge_amount">
<ElInputNumber
v-model="form.force_recharge_amount"
@@ -499,6 +499,7 @@
:precision="2"
:step="0.01"
:controls="false"
:disabled="isForceRechargeLockedForAgent"
style="width: 100%"
placeholder="请输入强制充值金额(元)"
/>
@@ -516,6 +517,9 @@
>¥{{ form.series_force_recharge_amount.toFixed(2) }}</span
>
</span>
<span v-if="isForceRechargeLockedForAgent" class="force-recharge-lock-hint">
<br />平台已锁定,代理不可修改强充配置
</span>
</div>
</ElFormItem>
</ElCol>
@@ -797,6 +801,10 @@
}> // 套餐配置
})
const isForceRechargeLockedForAgent = computed(
() => form.force_recharge_locked === true && isAgentAccount.value
)
// 动态验证规则
const rules = computed<FormRules>(() => {
const baseRules: FormRules = {
@@ -1574,11 +1582,10 @@
}
// 设置强制充值配置
form.enable_force_recharge = detail.force_recharge_enabled
form.force_recharge_amount = detail.force_recharge_amount
? detail.force_recharge_amount / 100
: undefined
form.force_recharge_locked = detail.force_recharge_locked || false
form.force_recharge_locked = detail.force_recharge_locked ?? false
form.enable_force_recharge = detail.force_recharge_enabled ?? false
form.force_recharge_amount =
detail.force_recharge_amount != null ? detail.force_recharge_amount / 100 : undefined
// 设置套餐数据
if (detail.packages && detail.packages.length > 0) {
@@ -1910,6 +1917,10 @@
color: var(--el-color-primary);
}
}
.force-recharge-lock-hint {
color: var(--el-color-danger);
}
}
.form-section-title {