From fdc9db9a9c0eac86f2b9c310e20afbd8a550170c Mon Sep 17 00:00:00 2001
From: 2256907009 <2256907009@qq.com>
Date: Thu, 5 Feb 2026 15:15:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=95=86=E5=93=81=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BA=E5=AE=9A=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/product.js          |   18 +
 src/views/product/ProductList.vue |  156 +++-
 问题.MD                           | 1252 ++---------------------------
 3 files changed, 206 insertions(+), 1220 deletions(-)

diff --git a/src/api/admin/product.js b/src/api/admin/product.js
index 6f3c9df..7e41745 100644
--- a/src/api/admin/product.js
+++ b/src/api/admin/product.js
@@ -195,6 +195,24 @@ export const enableProductPlan = (data) => {
   })
 }
 
+/**禁用套餐固定价格 */
+export const disablePlanFixedPrice = (data) => {
+  return http2.post('/api/v1/admin/good/plan/disable_fixed_price', data,{
+    headers:{
+      'Content-Type':'multipart/form-data'
+    }
+  })
+}
+
+/**启用套餐固定价格 */
+export const enablePlanFixedPrice = (data) => {
+  return http2.post('/api/v1/admin/good/plan/enable_fixed_price', data,{
+    headers:{
+      'Content-Type':'multipart/form-data'
+    }
+  })
+}
+
 
 /**---------------------------------- */
 /**商品分组标签管理 */
diff --git a/src/views/product/ProductList.vue b/src/views/product/ProductList.vue
index 99c1786..a93b271 100644
--- a/src/views/product/ProductList.vue
+++ b/src/views/product/ProductList.vue
@@ -520,13 +520,15 @@
       :title="planFormType === 'add' ? '新增套餐' : '编辑套餐'"
       width="700px"
       append-to-body
+      class="plan-form-dialog"
     >
-      <el-form
-        ref="planFormRef"
-        :model="planForm"
-        :rules="planFormRules"
-        label-width="100px"
-      >
+      <div class="plan-form-content">
+        <el-form
+          ref="planFormRef"
+          :model="planForm"
+          :rules="planFormRules"
+          label-width="100px"
+        >
         <el-form-item label="套餐名称" prop="name">
           <el-input v-model="planForm.name" placeholder="请输入套餐名称" />
         </el-form-item>
@@ -665,6 +667,22 @@
         </el-form-item>
         <el-form-item label="库存数量" prop="inventory">
           <el-input-number v-model="planForm.inventory" :min="0" style="width: 100%" placeholder="库存数量" />
+          <div class="form-tip">0 表示没有库存</div>
+        </el-form-item>
+        <el-form-item label="启用固定价格" prop="enable_fixed_price">
+          <el-switch 
+            v-model="planForm.enable_fixed_price" 
+            :active-value="true" 
+            :inactive-value="false"
+            active-text="启用" 
+            inactive-text="禁用"
+            :loading="fixedPriceLoading"
+            @change="handleFixedPriceChange"
+          />
+          <div class="form-tip">启用后套餐价格将使用固定价格，不再根据参数计算</div>
+        </el-form-item>
+        <el-form-item label="固定价格(元)" prop="fixed_price" v-if="planForm.enable_fixed_price === true">
+          <el-input-number v-model="planForm.fixed_price" :min="0" :precision="2" :step="0.01" style="width: 100%" placeholder="请输入固定价格(元)" />
         </el-form-item>
         <el-form-item label="排序索引" prop="index">
           <el-input-number v-model="planForm.index" :min="0" style="width: 100%" />
@@ -675,7 +693,8 @@
             <el-radio :value="true">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
-      </el-form>
+        </el-form>
+      </div>
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="planFormDialogVisible = false">取消</el-button>
@@ -793,7 +812,9 @@ import { getProductList, createProduct, updateProduct, deleteProduct, getProduct
   updateProductPlan,
   deleteProductPlan,
   disableProductPlan,
-  enableProductPlan
+  enableProductPlan,
+  disablePlanFixedPrice,
+  enablePlanFixedPrice
 } from '@/api/admin/product'
 
 // 查询参数
@@ -1603,6 +1624,7 @@ const currentPlanProductName = ref('')
 const planFormDialogVisible = ref(false)
 const planFormType = ref('add')
 const planFormRef = ref(null)
+const fixedPriceLoading = ref(false) // 固定价格开关加载状态
 const planForm = reactive({
   plan_id: undefined,
   name: '',
@@ -1611,6 +1633,8 @@ const planForm = reactive({
   extra_arg_ids: '',
   extra_arg_ids_array: [],
   inventory: 0,
+  fixed_price: 0,
+  enable_fixed_price: false,
   index: 0,
   disable: false
 })
@@ -1876,10 +1900,15 @@ const initSelectedArgsFromJson = (argsJson, extraArgIds = []) => {
   // 处理额外参数（排除已在args中的参数）
   if (extraArgIds && extraArgIds.length > 0) {
     selectedExtraArgIds.value = extraArgIds.filter(id => !argsParamIds.includes(id))
+    console.log('initSelectedArgsFromJson - 额外参数已设置:', selectedExtraArgIds.value)
+  } else {
+    console.log('initSelectedArgsFromJson - 无额外参数或为空, extraArgIds:', extraArgIds)
   }
   
   // 根据选择状态重新生成 JSON（确保初始状态就有 JSON 展示）
   updateArgsJson()
+  // 同步更新 planForm.extra_arg_ids
+  updateExtraArgIds()
 }
 
 // 打开套餐管理
@@ -1967,6 +1996,8 @@ const handleAddPlan = async () => {
     extra_arg_ids: '',
     extra_arg_ids_array: [],
     inventory: 0,
+    fixed_price: 0,
+    enable_fixed_price: false,
     index: 0,
     disable: false
   })
@@ -1990,16 +2021,28 @@ const handleEditPlan = async (row) => {
     if (res.data.code === 200) {
       const data = res.data.data
       
-      // 处理 extra_arg_ids
+      // 处理 extra_arg_ids（兼容驼峰和下划线命名，以及 extraArgs 对象数组）
       let extraArgIdsArray = []
-      if (data.extraArgIds) {
-        if (Array.isArray(data.extraArgIds)) {
-          extraArgIdsArray = data.extraArgIds
-        } else if (typeof data.extraArgIds === 'string') {
-          extraArgIdsArray = data.extraArgIds.split(',').filter(Boolean).map(Number)
+      const extraArgIdsRaw = data.extraArgIds || data.extra_arg_ids
+      const extraArgsRaw = data.extraArgs || data.extra_args
+      
+      if (extraArgIdsRaw) {
+        // 优先使用 extra_arg_ids 字段
+        if (Array.isArray(extraArgIdsRaw)) {
+          extraArgIdsArray = extraArgIdsRaw.map(Number)
+        } else if (typeof extraArgIdsRaw === 'string' && extraArgIdsRaw.trim()) {
+          extraArgIdsArray = extraArgIdsRaw.split(',').filter(Boolean).map(Number)
         }
+      } else if (extraArgsRaw && Array.isArray(extraArgsRaw)) {
+        // 如果有 extraArgs 对象数组，从中提取参数ID
+        extraArgIdsArray = extraArgsRaw.map(arg => arg.id || arg.arg_id || arg.argId).filter(Boolean).map(Number)
       }
       
+      console.log('编辑套餐 - 原始数据:', data)
+      console.log('编辑套餐 - extraArgIdsRaw:', extraArgIdsRaw)
+      console.log('编辑套餐 - extraArgsRaw:', extraArgsRaw)
+      console.log('编辑套餐 - extraArgIdsArray:', extraArgIdsArray)
+      
       Object.assign(planForm, {
         plan_id: data.id,
         name: data.name || '',
@@ -2008,6 +2051,8 @@ const handleEditPlan = async (row) => {
         extra_arg_ids: extraArgIdsArray.join(','),
         extra_arg_ids_array: extraArgIdsArray,
         inventory: data.inventory || 0,
+        fixed_price: ((data.fixedPrice || data.fixed_price || 0) / 100).toFixed(2) * 1, // 分转元
+        enable_fixed_price: !!(data.enableFixedPrice || data.enable_fixed_price), // 转为布尔值
         index: data.index || 0,
         disable: data.disable || false
       })
@@ -2054,21 +2099,71 @@ const handleTogglePlanStatus = async (row) => {
   }
 }
 
+// 处理固定价格开关变化（编辑模式下调用API）
+const handleFixedPriceChange = async (value) => {
+  // 只有编辑模式下才调用API
+  if (planFormType.value !== 'edit' || !planForm.plan_id) {
+    return
+  }
+  
+  fixedPriceLoading.value = true
+  try {
+    const data = {
+      good_id: String(currentPlanProductId.value),
+      plan_id: String(planForm.plan_id)
+    }
+    
+    let res
+    if (value === true) {
+      res = await enablePlanFixedPrice(data)
+    } else {
+      res = await disablePlanFixedPrice(data)
+    }
+    
+    if (res.data.code === 200) {
+      ElMessage.success(value ? '已启用固定价格' : '已禁用固定价格')
+    } else {
+      // 恢复原值
+      planForm.enable_fixed_price = !value
+      ElMessage.error(res.data.message || '操作失败')
+    }
+  } catch (error) {
+    // 恢复原值
+    planForm.enable_fixed_price = !value
+    console.error('切换固定价格状态失败:', error)
+    ElMessage.error('操作失败')
+  } finally {
+    fixedPriceLoading.value = false
+  }
+}
+
 // 提交套餐表单
 const submitPlanForm = () => {
   planFormRef.value?.validate(async (valid) => {
     if (valid) {
       try {
+        // 确保 extra_arg_ids 是最新的
+        const extraArgIdsStr = selectedExtraArgIds.value.join(',')
+        
         const submitData = {
           good_id: String(currentPlanProductId.value),
           name: planForm.name,
           note: planForm.note || '',
           args: planForm.args || '',
-          extra_arg_ids: planForm.extra_arg_ids || '',
+          extra_arg_ids: extraArgIdsStr || planForm.extra_arg_ids || '',
           inventory: Number(planForm.inventory) || 0,
+          fixed_price: Math.round(Number(planForm.fixed_price) * 100) || 0, // 元转分
           index: Number(planForm.index) || 0
         }
         
+        // 只有创建时才传递 enable_fixed_price
+        if (planFormType.value === 'add') {
+          submitData.enable_fixed_price = planForm.enable_fixed_price === true
+        }
+        
+        console.log('提交套餐数据:', submitData)
+        console.log('selectedExtraArgIds:', selectedExtraArgIds.value)
+        
         let res
         if (planFormType.value === 'add') {
           res = await createProductPlan(submitData)
@@ -2356,6 +2451,37 @@ const submitPlanForm = () => {
   overflow: hidden;
 }
 
+/* 套餐表单弹窗样式 */
+.plan-form-content {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding-right: 8px;
+  margin-right: -8px;
+}
+
+/* 隐形滚动条样式 */
+.plan-form-content::-webkit-scrollbar {
+  width: 6px;
+}
+
+.plan-form-content::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.plan-form-content::-webkit-scrollbar-thumb {
+  background-color: transparent;
+  border-radius: 3px;
+  transition: background-color 0.3s;
+}
+
+.plan-form-content:hover::-webkit-scrollbar-thumb {
+  background-color: rgba(144, 147, 153, 0.3);
+}
+
+.plan-form-content::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(144, 147, 153, 0.5);
+}
+
 /* 参数配置选择器样式 */
 .args-config-container {
   width: 100%;
diff --git a/问题.MD b/问题.MD
index 3a2743f..d62df79 100644
--- a/问题.MD
+++ b/问题.MD
@@ -1,413 +1,7 @@
 ✅已完成、⚠️部分完成、❌未完成这样显示
 -----------------------------------------------------------------------------------------------需要解决
 
-
-{
-  "openapi": "3.0.1",
-  "info": {
-    "title": "默认模块",
-    "description": "",
-    "version": "1.0.0"
-  },
-  "tags": [],
-  "paths": {
-    "/api/v1/admin/good/goods/list": {
-      "get": {
-        "summary": "获取商品列表",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "count",
-            "in": "query",
-            "description": "获取条数 默认 10",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "page",
-            "in": "query",
-            "description": "获取页码 默认 1",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "good_group_id",
-            "in": "query",
-            "description": "筛选商品组id",
-            "required": false,
-            "schema": {
-              "type": "integer"
-            }
-          },
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/goods/tag_list": {
-      "get": {
-        "summary": "获取商品标签列表",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/goods/create": {
-      "post": {
-        "summary": "创建商品",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "description": "名称",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "table": {
-                    "description": "商品所属表",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "tag": {
-                    "description": "商品标签，从 tag_list 接口中获取",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "content": {
-                    "description": "内容",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "cover_id": {
-                    "description": "封面id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "inventory_control": {
-                    "description": "是否开启商品库存",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "inventory": {
-                    "description": "商品库存",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "price": {
-                    "description": "商品价格",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "pay_num": {
-                    "description": "单个商品数量",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "expire_time": {
-                    "description": "商品购买有效期 /天",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "recommend": {
-                    "description": "是否开启推介",
-                    "example": "",
-                    "type": "boolean"
-                  },
-                  "recommend_rebate": {
-                    "description": "商品推介返还 /100%",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "good_group_id": {
-                    "description": "商品组id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "arg_type": {
-                    "description": "商品参数类型 all 所有 / plan 套餐 / customize 自定义",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              },
-              "examples": {}
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/goods/update": {
-      "post": {
-        "summary": "更新商品",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "ID 编号",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "name": {
-                    "description": "名称",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "table": {
-                    "description": "商品所属表",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "tag": {
-                    "description": "商品标签，从 tag_list 接口中获取",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "content": {
-                    "description": "内容",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "cover_id": {
-                    "description": "封面id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "inventory_control": {
-                    "description": "是否开启商品库存",
-                    "example": "",
-                    "type": "boolean"
-                  },
-                  "inventory": {
-                    "description": "商品库存",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "price": {
-                    "description": "商品价格",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "pay_num": {
-                    "description": "单个商品数量",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "expire_time": {
-                    "description": "商品购买有效期 /天",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "recommend": {
-                    "description": "是否开启推介",
-                    "example": "",
-                    "type": "boolean"
-                  },
-                  "recommend_rebate": {
-                    "description": "商品推介返还 /100%",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "good_group_id": {
-                    "description": "商品组id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "arg_type": {
-                    "description": "商品参数类型 all 所有 / plan 套餐 / customize 自定义",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              },
-              "examples": {}
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/goods/delete": {
-      "delete": {
-        "summary": "删除商品",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "ID 编号",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    }
-  },
-  "components": {
-    "schemas": {},
-    "responses": {},
-    "securitySchemes": {}
-  },
-  "servers": [],
-  "security": []
-}
-
+1.商品套餐添加了些参数和接口，需要调整对接，新增禁用套餐固定价格和启用套餐固定价格，在更新商品套餐和创建商品套餐新增参数fixed_price和enable_fixed_price，两个接口都需要这两个参数
 {
   "openapi": "3.0.1",
   "info": {
@@ -514,6 +108,21 @@
                     "type": "integer",
                     "description": "套餐排序索引",
                     "example": 0
+                  },
+                  "inventory": {
+                    "type": "integer",
+                    "description": "库存数量",
+                    "example": 0
+                  },
+                  "fixed_price": {
+                    "type": "integer",
+                    "description": "套餐固定价格",
+                    "example": 0
+                  },
+                  "enable_fixed_price": {
+                    "type": "integer",
+                    "description": "是否启用套餐固定价格",
+                    "example": 0
                   }
                 }
               },
@@ -655,6 +264,16 @@
                     "type": "boolean",
                     "description": "是否禁用",
                     "example": ""
+                  },
+                  "inventory": {
+                    "type": "integer",
+                    "description": "库存数量",
+                    "example": 0
+                  },
+                  "fixed_price": {
+                    "type": "integer",
+                    "description": "套餐固定价格",
+                    "example": 0
                   }
                 }
               },
@@ -848,127 +467,10 @@
         },
         "security": []
       }
-    }
-  },
-  "components": {
-    "schemas": {},
-    "responses": {},
-    "securitySchemes": {}
-  },
-  "servers": [],
-  "security": []
-}
-
-{
-  "openapi": "3.0.1",
-  "info": {
-    "title": "默认模块",
-    "description": "",
-    "version": "1.0.0"
-  },
-  "tags": [],
-  "paths": {
-    "/api/v1/admin/good/group/list": {
-      "get": {
-        "summary": "获取商品分组列表",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "count",
-            "in": "query",
-            "description": "获取条数 默认 10",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "page",
-            "in": "query",
-            "description": "获取页码 默认 1",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "in": "query",
-            "description": "关键词筛选",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "disable",
-            "in": "query",
-            "description": "筛选 隐藏/显示 的分组",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "name": "level",
-            "in": "query",
-            "description": "筛选分组层级",
-            "required": false,
-            "schema": {
-              "type": "integer"
-            }
-          },
-          {
-            "name": "parent_id",
-            "in": "query",
-            "description": "筛选父级分组id",
-            "required": false,
-            "schema": {
-              "type": "integer"
-            }
-          },
-          {
-            "name": "tag",
-            "in": "query",
-            "description": "筛选分组标签",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
     },
-    "/api/v1/admin/good/group/create": {
+    "/api/v1/admin/good/plan/disable_fixed_price": {
       "post": {
-        "summary": "创建商品分组",
+        "summary": "禁用套餐固定价格",
         "deprecated": false,
         "description": "",
         "tags": [],
@@ -990,45 +492,22 @@
               "schema": {
                 "type": "object",
                 "properties": {
-                  "name": {
-                    "description": "名称",
+                  "good_id": {
+                    "description": "商品id",
                     "example": "",
                     "type": "string"
                   },
-                  "note": {
-                    "description": "备注",
+                  "plan_id": {
+                    "description": "套餐id",
                     "example": "",
                     "type": "string"
-                  },
-                  "disable": {
-                    "description": "是否隐藏",
-                    "example": "",
-                    "type": "boolean"
-                  },
-                  "level": {
-                    "description": "分组层级",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "parent_id": {
-                    "description": "父级分组id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "cover_id": {
-                    "description": "分组封面id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "tag_id": {
-                    "description": "分组标签id",
-                    "example": 0,
-                    "type": "integer"
                   }
                 }
-              }
+              },
+              "examples": {}
             }
-          }
+          },
+          "required": true
         },
         "responses": {
           "200": {
@@ -1040,16 +519,15 @@
                   "properties": {}
                 }
               }
-            },
-            "headers": {}
+            }
           }
         },
         "security": []
       }
     },
-    "/api/v1/admin/good/group/update": {
+    "/api/v1/admin/good/plan/enable_fixed_price": {
       "post": {
-        "summary": "更新商品分组",
+        "summary": "启用套餐固定价格",
         "deprecated": false,
         "description": "",
         "tags": [],
@@ -1071,202 +549,22 @@
               "schema": {
                 "type": "object",
                 "properties": {
-                  "id": {
-                    "description": "ID 编号",
+                  "good_id": {
+                    "description": "商品id",
                     "example": "",
                     "type": "string"
                   },
-                  "name": {
-                    "description": "名称",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "note": {
-                    "description": "备注",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "disable": {
-                    "description": "是否隐藏",
-                    "example": "",
-                    "type": "boolean"
-                  },
-                  "level": {
-                    "description": "分组层级",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "parent_id": {
-                    "description": "父级分组id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "cover_id": {
-                    "description": "分组封面id",
-                    "example": 0,
-                    "type": "integer"
-                  },
-                  "tag_id": {
-                    "description": "分组标签id",
-                    "example": 0,
-                    "type": "integer"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group/disable": {
-      "post": {
-        "summary": "隐藏商品组",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
+                  "plan_id": {
+                    "description": "套餐id",
                     "example": "",
                     "type": "string"
                   }
                 }
-              }
+              },
+              "examples": {}
             }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group/enable": {
-      "post": {
-        "summary": "启用商品组",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "ID 编号",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group/delete": {
-      "delete": {
-        "summary": "删除商品分组",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "ID 编号",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
+          },
+          "required": true
         },
         "responses": {
           "200": {
@@ -1299,462 +597,6 @@
 
 
 
-1.http://localhost:5173/product/group分组页的table是需要分页的
-2.点击商品分组页面的添加子级分组点击分组封面并没有弹出
-3.添加顶级分组和添加子级分组失败，
-curl ^"https://apiservertest.s1f.ren/api/v1/admin/good/group/create^" ^
-  -H ^"Accept: application/json, text/plain, */*^" ^
-  -H ^"Accept-Language: zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6^" ^
-  -H ^"Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NzAwNTk3MzYsImlzX2FkbWluIjp0cnVlLCJrZXkiOiJSUkR2MFJmT2RZRXpXaXpPIiwidXNlcl9ncm91cCI6MTEsInVzZXJfaWQiOjQsInVzZXJfbmFtZSI6InNoaXJhbiJ9.R5aT8pnXiHb31raNWyOCd39sPz3voov-OtENWvWCjR0^" ^
-  -H ^"Connection: keep-alive^" ^
-  -H ^"Content-Type: multipart/form-data; boundary=----WebKitFormBoundaryswFqovBifaqLkuBL^" ^
-  -H ^"Origin: http://localhost:5173^" ^
-  -H ^"Referer: http://localhost:5173/^" ^
-  -H ^"Sec-Fetch-Dest: empty^" ^
-  -H ^"Sec-Fetch-Mode: cors^" ^
-  -H ^"Sec-Fetch-Site: cross-site^" ^
-  -H ^"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0^" ^
-  -H ^"sec-ch-ua: ^\^"Not(A:Brand^\^";v=^\^"8^\^", ^\^"Chromium^\^";v=^\^"144^\^", ^\^"Microsoft Edge^\^";v=^\^"144^\^"^" ^
-  -H ^"sec-ch-ua-mobile: ?0^" ^
-  -H ^"sec-ch-ua-platform: ^\^"Windows^\^"^" ^
-  --data-raw ^"------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"name^\^"^
-
-^
-
-^ ^ ^ ^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"note^\^"^
-
-^
-
-^ ^ ^ ^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"disable^\^"^
-
-^
-
-false^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"level^\^"^
-
-^
-
-1^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"parent_id^\^"^
-
-^
-
-0^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"cover_id^\^"^
-
-^
-
-0^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL^
-
-Content-Disposition: form-data; name=^\^"tag_id^\^"^
-
-^
-
-0^
-
-------WebKitFormBoundaryswFqovBifaqLkuBL--^
-
-^"
-4.获取套餐列表失败
-curl ^"https://apiservertest.s1f.ren/api/v1/admin/good/plan/list?good_id=29^" ^
-  -H ^"Accept: application/json, text/plain, */*^" ^
-  -H ^"Accept-Language: zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6^" ^
-  -H ^"Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NzAwNTk3MzYsImlzX2FkbWluIjp0cnVlLCJrZXkiOiJSUkR2MFJmT2RZRXpXaXpPIiwidXNlcl9ncm91cCI6MTEsInVzZXJfaWQiOjQsInVzZXJfbmFtZSI6InNoaXJhbiJ9.R5aT8pnXiHb31raNWyOCd39sPz3voov-OtENWvWCjR0^" ^
-  -H ^"Connection: keep-alive^" ^
-  -H ^"Origin: http://localhost:5173^" ^
-  -H ^"Referer: http://localhost:5173/^" ^
-  -H ^"Sec-Fetch-Dest: empty^" ^
-  -H ^"Sec-Fetch-Mode: cors^" ^
-  -H ^"Sec-Fetch-Site: cross-site^" ^
-  -H ^"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0^" ^
-  -H ^"sec-ch-ua: ^\^"Not(A:Brand^\^";v=^\^"8^\^", ^\^"Chromium^\^";v=^\^"144^\^", ^\^"Microsoft Edge^\^";v=^\^"144^\^"^" ^
-  -H ^"sec-ch-ua-mobile: ?0^" ^
-  -H ^"sec-ch-ua-platform: ^\^"Windows^\^"^"
-
-  5.创建新套餐失败，为什么会发出两个请求一个是options一个是post
-  curl ^"https://apiservertest.s1f.ren/api/v1/admin/good/plan/create^" ^
-  -H ^"Accept: application/json, text/plain, */*^" ^
-  -H ^"Accept-Language: zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6^" ^
-  -H ^"Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NzAwNTk3MzYsImlzX2FkbWluIjp0cnVlLCJrZXkiOiJSUkR2MFJmT2RZRXpXaXpPIiwidXNlcl9ncm91cCI6MTEsInVzZXJfaWQiOjQsInVzZXJfbmFtZSI6InNoaXJhbiJ9.R5aT8pnXiHb31raNWyOCd39sPz3voov-OtENWvWCjR0^" ^
-  -H ^"Connection: keep-alive^" ^
-  -H ^"Content-Type: multipart/form-data; boundary=----WebKitFormBoundaryKCGyplVDbP3o88BN^" ^
-  -H ^"Origin: http://localhost:5173^" ^
-  -H ^"Referer: http://localhost:5173/^" ^
-  -H ^"Sec-Fetch-Dest: empty^" ^
-  -H ^"Sec-Fetch-Mode: cors^" ^
-  -H ^"Sec-Fetch-Site: cross-site^" ^
-  -H ^"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0^" ^
-  -H ^"sec-ch-ua: ^\^"Not(A:Brand^\^";v=^\^"8^\^", ^\^"Chromium^\^";v=^\^"144^\^", ^\^"Microsoft Edge^\^";v=^\^"144^\^"^" ^
-  -H ^"sec-ch-ua-mobile: ?0^" ^
-  -H ^"sec-ch-ua-platform: ^\^"Windows^\^"^" ^
-  --data-raw ^"------WebKitFormBoundaryKCGyplVDbP3o88BN^
-
-Content-Disposition: form-data; name=^\^"good_id^\^"^
-
-^
-
-29^
-
-------WebKitFormBoundaryKCGyplVDbP3o88BN^
-
-Content-Disposition: form-data; name=^\^"name^\^"^
-
-^
-
-adasd^
-
-------WebKitFormBoundaryKCGyplVDbP3o88BN^
-
-Content-Disposition: form-data; name=^\^"note^\^"^
-
-^
-
-adasd^
-
-------WebKitFormBoundaryKCGyplVDbP3o88BN^
-
-Content-Disposition: form-data; name=^\^"args^\^"^
-
-^
-
-^[^{^\^"arg_id^\^":1,^\^"name^\^":^\^"cpu^\^",^\^"attr_id^\^":1,^\^"value^\^":^\^"50BG^\^"^}^]^
-
-------WebKitFormBoundaryKCGyplVDbP3o88BN^
-
-Content-Disposition: form-data; name=^\^"extra_arg_ids^\^"^
-
-^
-
-1^
-
-------WebKitFormBoundaryKCGyplVDbP3o88BN^
-
-Content-Disposition: form-data; name=^\^"index^\^"^
-
-^
-
-1^
-
-------WebKitFormBoundaryKCGyplVDbP3o88BN--^
-
-^"
-
-
-
-6.在商品列表的编辑商品的弹窗中的封面id的点击按钮需要切换为符合整体的样式参照其他选择id，封面的样式，这个使用AvatarSelector组件
-
-
-
-7.创建新产品需要添加一个商品参数类型的选择，修改也是arg_type：商品参数类型 all 所有 / plan 套餐 / customize 自定义
-
-
-
-
-8.新增商品分组标签管理，查看添加到什么位置比较合适
-
-{
-  "openapi": "3.0.1",
-  "info": {
-    "title": "默认模块",
-    "description": "",
-    "version": "1.0.0"
-  },
-  "tags": [],
-  "paths": {
-    "/api/v1/admin/good/group_tag/list": {
-      "get": {
-        "summary": "获取商品分组标签列表",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "page",
-            "in": "query",
-            "description": "获取页码 默认 1",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "count",
-            "in": "query",
-            "description": "获取条数 默认 10",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "in": "query",
-            "description": "关键词筛选",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group_tag/detail": {
-      "get": {
-        "summary": "获取商品分组标签详情",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "id",
-            "in": "query",
-            "description": "",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group_tag/create": {
-      "post": {
-        "summary": "创建商品分组标签",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "description": "名称",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group_tag/update": {
-      "post": {
-        "summary": "更新商品分组标签",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "ID 编号",
-                    "example": "",
-                    "type": "string"
-                  },
-                  "name": {
-                    "description": "名称",
-                    "example": "",
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    },
-    "/api/v1/admin/good/group_tag/delete": {
-      "delete": {
-        "summary": "删除商品分组标签",
-        "deprecated": false,
-        "description": "",
-        "tags": [],
-        "parameters": [
-          {
-            "name": "id",
-            "in": "query",
-            "description": "ID 编号",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "Authorization",
-            "in": "header",
-            "description": "",
-            "example": "Bearer {{token}}",
-            "schema": {
-              "type": "string",
-              "default": "Bearer {{token}}"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {}
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": []
-      }
-    }
-  },
-  "components": {
-    "schemas": {},
-    "responses": {},
-    "securitySchemes": {}
-  },
-  "servers": [],
-  "security": []
-}
-
-
-
-
-
-
-
 
 -----------------------------------------------------------------------------------------------需要解决