refactor: 商品管理参数对齐与表单优化 - 移除冗余ProductList.vue - 表单新增table/soldOut/maxPerUser/sendNotice - 表单改Tab栏布局 - 修复attrs.phase改为range
Build and Deploy Vue3 / build (push) Successful in 1m35s
Build and Deploy Vue3 / deploy (push) Successful in 37s

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
shiran
2026-06-17 16:12:06 +08:00
parent 38c63cc451
commit 5e81d33285
3 changed files with 173 additions and 3072 deletions
+64 -15
View File
@@ -567,6 +567,9 @@
<el-icon class="group-picker-arrow"><ArrowRight /></el-icon> <el-icon class="group-picker-arrow"><ArrowRight /></el-icon>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="所属表" prop="table">
<el-input v-model="productForm.table" placeholder="请输入商品所属表(如 kvm_service" />
</el-form-item>
<el-form-item label="商品介绍" prop="content"> <el-form-item label="商品介绍" prop="content">
<el-input <el-input
v-model="productForm.content" v-model="productForm.content"
@@ -588,9 +591,9 @@
@confirm="handleProductCoverSelect" @confirm="handleProductCoverSelect"
/> />
<!-- 价格与销售 --> <!-- Tab 栏管理 -->
<div class="form-section"> <el-tabs v-model="productFormTab" class="product-form-tabs">
<div class="form-section-title">价格与销售</div> <el-tab-pane label="价格与销售" name="sales">
<div class="form-grid"> <div class="form-grid">
<el-form-item prop="price"> <el-form-item prop="price">
<template #label> <template #label>
@@ -654,11 +657,9 @@
<div style="font-size:12px;color:#909399;margin-top:4px">启用后用户购买/续费/升级此商品前须完成实名认证</div> <div style="font-size:12px;color:#909399;margin-top:4px">启用后用户购买/续费/升级此商品前须完成实名认证</div>
</el-form-item> </el-form-item>
</div> </div>
</div> </el-tab-pane>
<!-- 库存管理 --> <el-tab-pane label="库存管理" name="inventory">
<div class="form-section">
<div class="form-section-title">库存管理</div>
<div class="form-grid"> <div class="form-grid">
<el-form-item label="库存控制" prop="inventory_control"> <el-form-item label="库存控制" prop="inventory_control">
<el-switch <el-switch
@@ -677,12 +678,29 @@
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item label="售罄状态" prop="sold_out">
<el-switch
v-model="productForm.sold_out"
active-text="售罄"
inactive-text="正常"
active-color="#f56c6c"
/>
<div style="font-size:12px;color:#909399;margin-top:4px">开启后用户端将无法选购该商品</div>
</el-form-item>
<el-form-item label="购买限制" prop="max_per_user">
<el-input-number
v-model="productForm.max_per_user"
:min="0"
placeholder="0 表示不限"
controls-position="right"
style="width: 100%"
/>
<div style="font-size:12px;color:#909399;margin-top:4px">限制单用户最大购买数量0 表示不限制</div>
</el-form-item>
</div> </div>
</div> </el-tab-pane>
<!-- 推荐与参数 --> <el-tab-pane label="推荐与通知" name="promotion">
<div class="form-section">
<div class="form-section-title">推荐与参数</div>
<div class="form-grid"> <div class="form-grid">
<el-form-item label="推荐" prop="recommend"> <el-form-item label="推荐" prop="recommend">
<el-switch <el-switch
@@ -705,8 +723,17 @@
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item label="购买通知" prop="send_notice">
<el-switch
v-model="productForm.send_notice"
active-text="发送"
inactive-text="不发送"
/>
<div style="font-size:12px;color:#909399;margin:4px">用户购买后是否发送通知给管理员</div>
</el-form-item>
</div> </div>
</div> </el-tab-pane>
</el-tabs>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@@ -873,7 +900,10 @@ const productForm = reactive({
recommend_rebate: 0, recommend_rebate: 0,
arg_type: 'all', arg_type: 'all',
can_renew: true, can_renew: true,
require_real_name: false require_real_name: false,
sold_out: false,
max_per_user: 0,
send_notice: false
}) })
const productRules = { const productRules = {
@@ -895,6 +925,7 @@ const productRules = {
// 商品对话框状态 // 商品对话框状态
const productDialogVisible = ref(false) const productDialogVisible = ref(false)
const productDialogType = ref('add') const productDialogType = ref('add')
const productFormTab = ref('sales')
const productFormRef = ref(null) const productFormRef = ref(null)
const coverSelectorVisible = ref(false) const coverSelectorVisible = ref(false)
@@ -1557,7 +1588,10 @@ const handleEditProduct = (product, parentGroupId) => {
recommend_rebate: product.recommendRebate, recommend_rebate: product.recommendRebate,
arg_type: product.argType || 'all', arg_type: product.argType || 'all',
can_renew: product.canRenew !== undefined ? product.canRenew : (product.can_renew !== undefined ? product.can_renew : true), can_renew: product.canRenew !== undefined ? product.canRenew : (product.can_renew !== undefined ? product.can_renew : true),
require_real_name: product.requireRealName ?? product.require_real_name ?? false require_real_name: product.requireRealName ?? product.require_real_name ?? false,
sold_out: !!product.soldOut,
max_per_user: product.maxPerUser ?? product.max_per_user ?? 0,
send_notice: !!product.sendNotice
}) })
productDialogVisible.value = true productDialogVisible.value = true
@@ -1583,7 +1617,10 @@ const submitProductForm = () => {
recommend_rebate: Number(productForm.recommend_rebate) || 0, recommend_rebate: Number(productForm.recommend_rebate) || 0,
arg_type: productForm.arg_type, arg_type: productForm.arg_type,
can_renew: productForm.can_renew, can_renew: productForm.can_renew,
require_real_name: productForm.require_real_name require_real_name: productForm.require_real_name,
sold_out: productForm.sold_out === true,
max_per_user: Number(productForm.max_per_user) || 0,
send_notice: productForm.send_notice === true
} }
let res let res
@@ -2185,6 +2222,18 @@ onMounted(() => {
flex-shrink: 0; flex-shrink: 0;
} }
.product-form-tabs {
margin-top: 16px;
}
.product-form-tabs :deep(.el-tabs__header) {
margin-bottom: 16px;
}
.product-form-tabs :deep(.el-tab-pane) {
padding: 4px 0;
}
.form-section { .form-section {
margin-bottom: var(--section-gap); margin-bottom: var(--section-gap);
padding: 16px; padding: 16px;
File diff suppressed because it is too large Load Diff
@@ -554,11 +554,11 @@ const findMatchingNumberAttr = (spec, numValue) => {
if (!spec.attrs || spec.attrs.length === 0) return null if (!spec.attrs || spec.attrs.length === 0) return null
const sortedAttrs = [...spec.attrs].sort((a, b) => (a.index || 0) - (b.index || 0)) const sortedAttrs = [...spec.attrs].sort((a, b) => (a.index || 0) - (b.index || 0))
for (const attr of sortedAttrs) { for (const attr of sortedAttrs) {
const phase = attr.phase || 0 const rangeVal = attr.range ?? attr.phase ?? 0
const rangeType = attr.rangeType || 'before' const rangeType = attr.rangeType || 'before'
if (rangeType === 'before' && numValue <= phase) return attr if (rangeType === 'before' && numValue <= rangeVal) return attr
else if (rangeType === 'after' && numValue >= phase) return attr else if (rangeType === 'after' && numValue >= rangeVal) return attr
else if (rangeType === 'equal' && numValue === phase) return attr else if (rangeType === 'equal' && numValue === rangeVal) return attr
} }
return sortedAttrs[sortedAttrs.length - 1] return sortedAttrs[sortedAttrs.length - 1]
} }