From 4a0b32471ec563f7b4256c07a4e0d809441d4cf8 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Mon, 29 Dec 2025 17:18:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(promotion)-=E6=B7=BB=E5=8A=A0DIY?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=B1=BB=E5=9E=8B=E5=8A=9F=E8=83=BD=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在字典类型中新增 PROMOTION_DIY_TEMPLATE_TYPE 类型
- 为装修模板表单添加模板类型选择下拉框
- 在装修模板列表页面添加模板类型筛选条件
- 在装修模板列表中显示模板类型列
- 为模板类型字段添加必填验证规则
---
 src/utils/dict.ts                              |  1 +
 .../promotion/diy/template/DiyTemplateForm.vue | 18 ++++++++++++++++--
 .../mall/promotion/diy/template/index.vue      | 17 ++++++++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index b4f0c5870..4a71d9bfa 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -198,6 +198,7 @@ export enum DICT_TYPE {
   PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
   PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
   PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
+  PROMOTION_DIY_TEMPLATE_TYPE = 'promotion_diy_template_type', // 装修模板类型
 
   // ========== CRM - 客户管理模块 ==========
   CRM_AUDIT_STATUS = 'crm_audit_status', // CRM 审批状态
diff --git a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
index f430d3585..1f73764e5 100644
--- a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
+++ b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
@@ -10,6 +10,16 @@
       <el-form-item label="模板名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入模板名称" />
       </el-form-item>
+      <el-form-item label="模板类型" prop="type">
+        <el-select v-model="formData.type" clearable placeholder="请选择模板类型" class="w-46!">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
       </el-form-item>
@@ -25,6 +35,7 @@
 </template>
 <script lang="ts" setup>
 import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 /** 装修模板表单 */
 defineOptions({ name: 'DiyTemplateForm' })
@@ -39,11 +50,13 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   name: undefined,
+  type: undefined,
   remark: undefined,
   previewPicUrls: []
 })
 const formRules = reactive({
-  name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '模板类型不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -96,9 +109,10 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     name: undefined,
+    type: undefined,
     remark: undefined,
     previewPicUrls: []
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/mall/promotion/diy/template/index.vue b/src/views/mall/promotion/diy/template/index.vue
index 1eddddc70..246b53d1c 100644
--- a/src/views/mall/promotion/diy/template/index.vue
+++ b/src/views/mall/promotion/diy/template/index.vue
@@ -30,6 +30,16 @@
           class="!w-240px"
         />
       </el-form-item>
+      <el-form-item label="模板类型" prop="type">
+        <el-select v-model="queryParams.type" clearable placeholder="请选择模板类型" class="!w-240px">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -63,6 +73,11 @@
         </template>
       </el-table-column>
       <el-table-column label="模板名称" align="center" prop="name" min-width="180" />
+      <el-table-column label="模板类型" align="center" prop="type" min-width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PROMOTION_DIY_TEMPLATE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
       <el-table-column label="是否使用" align="center" prop="used">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.used" />
@@ -132,7 +147,7 @@
 import { dateFormatter } from '@/utils/formatTime'
 import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
 import DiyTemplateForm from './DiyTemplateForm.vue'
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 /** 装修模板 */
 defineOptions({ name: 'DiyTemplate' })

From 7d9cec5f4fd3c2234f3114dde9e60b422c3f3347 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Tue, 30 Dec 2025 11:09:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor(dict):=20=E5=B0=86=20PROMOTION=5FD?=
 =?UTF-8?q?IY=5FTEMPLATE=5FTYPE=20=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=20P?=
 =?UTF-8?q?ROMOTION=5FDIY=5FTEMPLATE=5FPLATFORM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 PROMOTION_DIY_TEMPLATE_TYPE 重命名为 PROMOTION_DIY_TEMPLATE_PLATFORM
- 更新 DiyTemplateForm.vue 中的字典类型引用
- 更新 index.vue 中的字典类型引用和表格显示
- 修改字典标签的类型绑定以匹配新命名
---
 src/utils/dict.ts                                         | 2 +-
 src/views/mall/promotion/diy/template/DiyTemplateForm.vue | 2 +-
 src/views/mall/promotion/diy/template/index.vue           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 4a71d9bfa..12f7a759d 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -198,7 +198,7 @@ export enum DICT_TYPE {
   PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
   PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
   PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
-  PROMOTION_DIY_TEMPLATE_TYPE = 'promotion_diy_template_type', // 装修模板类型
+  PROMOTION_DIY_TEMPLATE_PLATFORM = 'promotion_diy_template_platform', // 装修模板平台
 
   // ========== CRM - 客户管理模块 ==========
   CRM_AUDIT_STATUS = 'crm_audit_status', // CRM 审批状态
diff --git a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
index 1f73764e5..25c7db0c8 100644
--- a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
+++ b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
@@ -13,7 +13,7 @@
       <el-form-item label="模板类型" prop="type">
         <el-select v-model="formData.type" clearable placeholder="请选择模板类型" class="w-46!">
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_TYPE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
diff --git a/src/views/mall/promotion/diy/template/index.vue b/src/views/mall/promotion/diy/template/index.vue
index 246b53d1c..978181f5e 100644
--- a/src/views/mall/promotion/diy/template/index.vue
+++ b/src/views/mall/promotion/diy/template/index.vue
@@ -33,7 +33,7 @@
       <el-form-item label="模板类型" prop="type">
         <el-select v-model="queryParams.type" clearable placeholder="请选择模板类型" class="!w-240px">
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_TYPE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -75,7 +75,7 @@
       <el-table-column label="模板名称" align="center" prop="name" min-width="180" />
       <el-table-column label="模板类型" align="center" prop="type" min-width="100">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PROMOTION_DIY_TEMPLATE_TYPE" :value="scope.row.type" />
+          <dict-tag :type="DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM" :value="scope.row.type" />
         </template>
       </el-table-column>
       <el-table-column label="是否使用" align="center" prop="used">

From b31155753920777c2a1b8c8e46f72832c34e3b12 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Tue, 30 Dec 2025 11:34:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(diy-template):=20=E5=B0=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BA=E6=A8=A1=E6=9D=BF=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 DiyTemplateForm.vue 中的模板类型字段重命名为模板平台
- 将表单模型中的 type 字段更新为 platform 字段
- 更新表单验证规则中字段名称的对应关系
- 在查询参数中添加 platform 字段支持
- 更新表格列显示中字段引用的对应关系
---
 .../mall/promotion/diy/template/DiyTemplateForm.vue    | 10 +++++-----
 src/views/mall/promotion/diy/template/index.vue        |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
index 25c7db0c8..be35f260f 100644
--- a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
+++ b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
@@ -10,8 +10,8 @@
       <el-form-item label="模板名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入模板名称" />
       </el-form-item>
-      <el-form-item label="模板类型" prop="type">
-        <el-select v-model="formData.type" clearable placeholder="请选择模板类型" class="w-46!">
+      <el-form-item label="模板平台" prop="type">
+        <el-select v-model="formData.platform" clearable placeholder="请选择模板平台" class="w-46!">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM)"
             :key="dict.value"
@@ -50,13 +50,13 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   name: undefined,
-  type: undefined,
+  platform: undefined,
   remark: undefined,
   previewPicUrls: []
 })
 const formRules = reactive({
   name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
-  type: [{ required: true, message: '模板类型不能为空', trigger: 'blur' }]
+  platform: [{ required: true, message: '模板平台不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -109,7 +109,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     name: undefined,
-    type: undefined,
+    platform: undefined,
     remark: undefined,
     previewPicUrls: []
   }
diff --git a/src/views/mall/promotion/diy/template/index.vue b/src/views/mall/promotion/diy/template/index.vue
index 978181f5e..cf61a60b2 100644
--- a/src/views/mall/promotion/diy/template/index.vue
+++ b/src/views/mall/promotion/diy/template/index.vue
@@ -30,8 +30,8 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="模板类型" prop="type">
-        <el-select v-model="queryParams.type" clearable placeholder="请选择模板类型" class="!w-240px">
+      <el-form-item label="模板平台" prop="platform">
+        <el-select v-model="queryParams.platform" clearable placeholder="请选择模板平台" class="!w-240px">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM)"
             :key="dict.value"
@@ -73,9 +73,9 @@
         </template>
       </el-table-column>
       <el-table-column label="模板名称" align="center" prop="name" min-width="180" />
-      <el-table-column label="模板类型" align="center" prop="type" min-width="100">
+      <el-table-column label="模板平台" align="center" prop="platform" min-width="100">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM" :value="scope.row.type" />
+          <dict-tag :type="DICT_TYPE.PROMOTION_DIY_TEMPLATE_PLATFORM" :value="scope.row.platform" />
         </template>
       </el-table-column>
       <el-table-column label="是否使用" align="center" prop="used">
@@ -162,6 +162,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: null,
+  platform: null,
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单