feat: 产品迭代7月份
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 5m51s

This commit is contained in:
luo
2026-07-27 16:30:29 +08:00
parent cc6fc9243e
commit f0a2b84e53
75 changed files with 2926 additions and 534 deletions

View File

@@ -594,12 +594,16 @@
getStatusText,
frontendStatusToApi,
apiStatusToFrontend,
STATUS_SELECT_OPTIONS,
getEnableStatusText
} from '@/config/constants'
defineOptions({ name: 'SeriesGrants' })
const SERIES_GRANT_STATUS_SELECT_OPTIONS = [
{ label: '启用', value: 1 },
{ label: '禁用', value: 2 }
]
const { hasAuth } = useAuth()
const canUpdateSeriesGrantStatus = hasAuth('series_grants:update_status')
const router = useRouter()
@@ -736,7 +740,7 @@
clearable: true,
placeholder: '请选择状态'
},
options: STATUS_SELECT_OPTIONS
options: SERIES_GRANT_STATUS_SELECT_OPTIONS
}
])
@@ -1074,25 +1078,26 @@
const loadPackageOptions = async (packageName?: string) => {
packageLoading.value = true
try {
const params: any = {
page: 1,
page_size: 20
}
const pageSize = 100
const allPackages: PackageResponse[] = []
let page = 1
let total = 0
// 如果已选择套餐系列则根据系列ID过滤套餐
if (form.series_id) {
params.series_id = form.series_id
}
do {
const params: any = { page, page_size: pageSize }
if (form.series_id) params.series_id = form.series_id
if (packageName) params.package_name = packageName
if (packageName) {
params.package_name = packageName
}
const res = await PackageManageService.getPackages(params)
if (res.code !== 0) break
const res = await PackageManageService.getPackages(params)
if (res.code === 0) {
// 过滤掉赠送套餐
packageOptions.value = res.data.items.filter((pkg) => !pkg.is_gift)
}
allPackages.push(...(res.data.items || []))
total = res.data.total || allPackages.length
page += 1
} while (allPackages.length < total)
// 过滤掉赠送套餐
packageOptions.value = allPackages.filter((pkg) => !pkg.is_gift)
} catch (error) {
console.error('加载套餐选项失败:', error)
} finally {
@@ -1125,7 +1130,7 @@
// 获取套餐名称
const getPackageName = (packageId: number) => {
const pkg = packageOptions.value.find((p) => p.id === packageId)
return pkg ? pkg.package_name : `套餐ID: ${packageId}`
return pkg ? pkg.package_name : '套餐名称不可用'
}
const getPackageCostPriceMax = (pkg?: {
@@ -1452,7 +1457,7 @@
series_id: searchForm.series_id || undefined,
allocator_shop_id:
searchForm.allocator_shop_id !== undefined ? searchForm.allocator_shop_id : undefined,
status: searchForm.status || undefined
status: searchForm.status ?? undefined
}
const res = await ShopSeriesGrantService.getShopSeriesGrants(params)
if (res.code === 0) {