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

@@ -178,6 +178,22 @@
}
},
{ label: '套餐默认生效条件', prop: 'default_expiry_base_name' },
{
label: '默认沉默期(天)',
formatter: (_: unknown, data: PackageResponse) =>
data.package_type === 'formal' ? String(data.silence_period_days ?? '未配置') : '不适用'
},
{
label: '支持付费延期',
formatter: (_: unknown, data: PackageResponse) =>
data.package_type !== 'formal'
? '不适用'
: data.silence_extension_enabled == null
? '-'
: data.silence_extension_enabled
? '是'
: '否'
},
{
label: '分配覆盖生效条件',
prop: 'expiry_base_override_name',

View File

@@ -60,11 +60,11 @@
<ElDialog
v-model="dialogVisible"
:title="dialogType === 'add' ? '新增套餐' : '编辑套餐'"
width="50%"
width="min(960px, 96vw)"
:close-on-click-modal="false"
@closed="handleDialogClosed"
>
<ElForm ref="formRef" :model="form" :rules="rules" label-width="120px">
<ElForm ref="formRef" :model="form" :rules="rules" label-width="150px">
<ElRow :gutter="20">
<ElCol :span="12">
<ElFormItem label="套餐编码" prop="package_code">
@@ -197,6 +197,13 @@
</ElCol>
</ElRow>
<PackageSilenceFields
:package-type="form.package_type"
:expiry-base="form.expiry_base"
:required="form.silence_config_required"
v-model:days="form.silence_period_days"
v-model:enabled="form.silence_extension_enabled"
/>
<!-- 真流量额度 -->
<ElRow :gutter="20">
<ElCol :span="12">
@@ -265,6 +272,7 @@
<ElFormItem label="到期计时基准" prop="expiry_base">
<ElSelect
v-model="form.expiry_base"
:disabled="originalExpiryBase === 'from_activation'"
placeholder="请选择到期计时基准"
style="width: 100%"
clearable
@@ -391,6 +399,8 @@
</template>
<script setup lang="ts">
import PackageSilenceFields from '@/components/business/package-silence/PackageSilenceFields.vue'
import { packageSilenceFields, assertSilenceResponse } from '@/utils/business/packageSilence'
import { h, watch } from 'vue'
import { useRouter } from 'vue-router'
import { PackageManageService, PackageSeriesService } from '@/api/modules'
@@ -485,6 +495,7 @@
// 搜索表单初始值
const initialSearchState = {
silence_unconfigured: undefined as boolean | undefined,
package_name: '',
series_id: undefined as number | undefined,
package_type: undefined as string | undefined,
@@ -497,6 +508,13 @@
// 搜索表单配置
const searchFormItems = computed<SearchFormItem[]>(() => [
{
label: '未配置沉默期',
prop: 'silence_unconfigured',
type: 'select',
options: [{ label: '仅未配置', value: true }],
config: { clearable: true }
},
{
label: '套餐名称',
prop: 'package_name',
@@ -706,7 +724,11 @@
})
// 表单数据
const originalExpiryBase = ref<string | null>(null)
const form = reactive<any>({
silence_period_days: 30,
silence_extension_enabled: true,
silence_config_required: false,
id: 0,
package_code: '',
package_name: '',
@@ -786,7 +808,7 @@
prop: 'package_name',
label: '套餐名称',
width: 200,
fixed:true,
fixed: true,
showOverflowTooltip: true,
formatter: (row: PackageResponse) => {
const hasPermission = hasAuth('package:detail')
@@ -1253,7 +1275,8 @@
series_id: searchForm.series_id || undefined,
package_type: searchForm.package_type || undefined,
shelf_status: searchForm.shelf_status || undefined,
status: searchForm.status ?? undefined
status: searchForm.status ?? undefined,
silence_unconfigured: searchForm.silence_unconfigured || undefined
}
const res = await PackageManageService.getPackages(params)
if (res.code === 0) {
@@ -1275,7 +1298,8 @@
series_id: searchForm.series_id ?? undefined,
package_type: searchForm.package_type || undefined,
shelf_status: searchForm.shelf_status ?? undefined,
status: searchForm.status ?? undefined
status: searchForm.status ?? undefined,
silence_unconfigured: searchForm.silence_unconfigured || undefined
}
Object.keys(query).forEach((key) => {
@@ -1318,6 +1342,10 @@
// 显示新增/编辑对话框
const showDialog = async (type: string, row?: PackageResponse) => {
originalExpiryBase.value = null
form.silence_period_days = 30
form.silence_extension_enabled = true
form.silence_config_required = false
dialogType.value = type
if (type === 'edit' && row) {
@@ -1325,6 +1353,10 @@
const res = await PackageManageService.getPackageDetail(row.id)
if (res.code === 0 && res.data) {
const data = res.data
originalExpiryBase.value = data.expiry_base ?? null
form.silence_period_days = data.silence_period_days ?? null
form.silence_extension_enabled = data.silence_extension_enabled ?? true
form.silence_config_required = data.silence_config_required ?? false
form.id = data.id
form.package_code = data.package_code
form.package_name = data.package_name
@@ -1461,6 +1493,7 @@
const costPriceInCents = Math.round(form.cost_price * 100)
const data: any = {
...packageSilenceFields(form, originalExpiryBase.value),
package_name: form.package_name,
package_type: form.package_type,
duration_months: form.duration_months,
@@ -1509,18 +1542,18 @@
}
if (dialogType.value === 'add') {
await PackageManageService.createPackage(data)
assertSilenceResponse(await PackageManageService.createPackage(data))
ElMessage.success('新增成功')
} else {
await PackageManageService.updatePackage(form.id, data)
assertSilenceResponse(await PackageManageService.updatePackage(form.id, data))
ElMessage.success('修改成功')
}
dialogVisible.value = false
formEl.resetFields()
await getTableData()
} catch (error) {
console.error(error)
} catch (error: any) {
ElMessage.error(error?.response?.data?.msg || error?.message || '套餐保存失败')
} finally {
submitLoading.value = false
}

View File

@@ -702,7 +702,8 @@
packageForm.value.expiry_base_override === 'default'
? null
: packageForm.value.expiry_base_override
}
},
packageForm.value.package_id
)
}
await ShopSeriesGrantService.manageGrantPackages(grantId, {
@@ -778,7 +779,8 @@
expiryForm.value.expiry_base_override === 'default'
? null
: expiryForm.value.expiry_base_override
}
},
expiryForm.value.package_id
)
if (response.code === 0) {
ElMessage.success('生效条件更新成功')

View File

@@ -480,7 +480,8 @@
packageForm.value.expiry_base_override === 'default'
? null
: packageForm.value.expiry_base_override
}
},
packageForm.value.package_id
)
}
await ShopSeriesGrantService.manageGrantPackages(grantId.value, {
@@ -514,7 +515,8 @@
expiryForm.value.expiry_base_override === 'default'
? null
: expiryForm.value.expiry_base_override
}
},
expiryForm.value.package_id
)
if (response.code === 0) {
ElMessage.success('生效条件更新成功')

View File

@@ -0,0 +1,5 @@
<template><SilenceDetail kind="batches" /></template>
<script setup lang="ts">
import SilenceDetail from '@/components/business/package-silence/SilenceDetail.vue'
defineOptions({ name: 'SilenceBatchesDetail' })
</script>

View File

@@ -0,0 +1,5 @@
<template><SilenceManagement kind="batches" /></template>
<script setup lang="ts">
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
defineOptions({ name: 'SilenceBatches' })
</script>

View File

@@ -0,0 +1,5 @@
<template><SilenceDetail kind="orders" /></template>
<script setup lang="ts">
import SilenceDetail from '@/components/business/package-silence/SilenceDetail.vue'
defineOptions({ name: 'SilenceOrdersDetail' })
</script>

View File

@@ -0,0 +1,5 @@
<template><SilenceManagement kind="orders" /></template>
<script setup lang="ts">
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
defineOptions({ name: 'SilenceOrders' })
</script>

View File

@@ -0,0 +1,5 @@
<template><SilenceManagement kind="policies" /></template>
<script setup lang="ts">
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
defineOptions({ name: 'SilencePolicies' })
</script>

View File

@@ -0,0 +1,5 @@
<template><SilenceManagement kind="usages" /></template>
<script setup lang="ts">
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
defineOptions({ name: 'SilenceUsages' })
</script>