From b5e9bd4cac294d08cd27a1241559ab04734af439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 25 Mar 2025 10:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0=E5=8A=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/data-filter/index.vue   |  49 +++++++-
 src/components/model-coupon/index.vue         |  12 +-
 .../model-coupon/model-coupon-content.vue     | 108 ++++++------------
 src/views/layout/index.vue                    |  13 ++-
 4 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/src/components/common/data-filter/index.vue b/src/components/common/data-filter/index.vue
index f3dc2781..36af7e0d 100644
--- a/src/components/common/data-filter/index.vue
+++ b/src/components/common/data-filter/index.vue
@@ -191,6 +191,47 @@
                 <el-switch v-model="form.is_home" active-value="1" inactive-value="0" />
             </el-form-item>
         </template>
+        <template v-else-if="['coupon'].includes(type)">
+            <el-form-item label="类型">
+                <el-select v-model="form.type" multiple collapse-tags filterable placeholder="请选择优惠券类型">
+                    <el-option v-for="item in get_data_list(common_store.common.plugins, 'coupon.type_list')" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="到期类型">
+                <el-select v-model="form.expire_type_ids" multiple collapse-tags filterable placeholder="请选择到期类型">
+                    <el-option v-for="item in get_data_list(common_store.common.plugins, 'coupon.expire_type_list')" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="使用限制">
+                <el-select v-model="form.use_limit_type_ids" multiple collapse-tags filterable placeholder="请选择使用限制">
+                    <el-option v-for="item in get_data_list(common_store.common.plugins, 'coupon.use_limit_type_list')" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="显示数量">
+                <el-input-number v-model="form.number" :min="1" :max="50" type="number" placeholder="请输入显示数量" value-on-clear="min" class="w number-show" controls-position="right"></el-input-number>
+            </el-form-item>
+            <el-form-item label="排序类型">
+                <el-radio-group v-model="form.order_by_type">
+                    <el-radio v-for="item in get_data_list(common_store.common.plugins, 'coupon.order_by_type_list')" :key="item.index" :value="item.index">{{ item.name }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="排序规则">
+                <el-radio-group v-model="form.order_by_rule">
+                    <el-radio v-for="item in common_store.common.data_order_by_rule_list" :key="item.index" :value="item.index">{{ item.name }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="首页显示">
+                <el-switch v-model="form.is_repeat_receive" active-value="1" inactive-value="0" />
+            </el-form-item>
+            <template v-if="form.theme === '4'">
+                <el-form-item label="内容标题">
+                    <el-input v-model="form.title" placeholder="请输入内容" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="内容描述">
+                    <el-input v-model="form.desc" type="textarea" :rows="4" placeholder="请输入内容" clearable></el-input>
+                </el-form-item>
+            </template>
+        </template>
         <template v-else>
             <el-form-item label="品牌分类">
                 <el-select v-model="form.category_ids" multiple collapse-tags filterable placeholder="请选择品牌分类">
@@ -233,7 +274,7 @@
             default: () => {},
         },
         type: {
-            type: String as PropType<'goods' | 'blog' | 'article' | 'binding' | 'realstore' | 'merchant' | 'ask' | 'activity'>,
+            type: String as PropType<'goods' | 'blog' | 'article' | 'binding' | 'realstore' | 'merchant' | 'ask' | 'activity' | 'coupon'>,
             default: 'goods',
         }
     });
@@ -288,6 +329,12 @@
             imgParam: 'cover',
             titleParam: 'title',
         },
+        coupon: {
+            optionListKey: 'data_type_list',
+            imgParam: '',
+            titleParam: 'name',
+            typeParam: 'custom',
+        },
         default: {
             optionListKey: 'brand_data_type_list',
             imgParam: 'logo',
diff --git a/src/components/model-coupon/index.vue b/src/components/model-coupon/index.vue
index 1bf75392..489cb58f 100644
--- a/src/components/model-coupon/index.vue
+++ b/src/components/model-coupon/index.vue
@@ -195,7 +195,11 @@ const theme_bg_img = ref<themeBgImg>({
 // 初始化数据
 onMounted(() => {
     if (!isEmpty(form.value.data_list) && form.value.data_type == '0') {
-        data_list.value = form.value.data_list;
+        data_list.value = form.value.data_list.map((item: any) => ({
+            ...item.data,
+            name: !isEmpty(item.new_title) ? item.new_title : item.data.name,
+            new_cover: item.new_cover,
+        }));
     } else if (form.value.data_type == '1') {
         if (!isEmpty(form.value.data_auto_list)) {
             data_list.value = form.value.data_auto_list;
@@ -247,7 +251,11 @@ watch(
             get_coupon();
         } else {
             if (!isEmpty(form.value.data_list)) {
-                data_list.value = cloneDeep(form.value.data_list);
+                data_list.value = form.value.data_list.map((item: any) => ({
+                    ...item.data,
+                    name: !isEmpty(item.new_title) ? item.new_title : item.data.name,
+                    new_cover: item.new_cover,
+                }));
             } else {
                 data_list.value = Array(4).fill(default_list);
             }
diff --git a/src/components/model-coupon/model-coupon-content.vue b/src/components/model-coupon/model-coupon-content.vue
index 104a2f73..8b3c31d4 100644
--- a/src/components/model-coupon/model-coupon-content.vue
+++ b/src/components/model-coupon/model-coupon-content.vue
@@ -12,74 +12,15 @@
             <div class="divider-line"></div>
             <card-container class="content-height">
                 <div class="mb-12">优惠券数据</div>
-                <el-form-item label="数据来源">
-                    <el-radio-group v-model="form.data_type">
-                        <el-radio v-for="item in base_list.data_type_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <template v-if="form.data_type === '0'">
-                    <el-form-item label="手动选择">
-                        <div class="flex-col gap-20 w">
-                            <drag v-if="form.data_list.length > 0" :data="form.data_list" :space-col="20" @remove="remove" @on-sort="on_sort">
-                                <template #default="{ row }">
-                                    <div class="flex-1 cr-6 size-12">{{ row.name }}</div>
-                                </template>
-                            </drag>
-                            <el-button class="w" @click="add">+添加</el-button>
-                        </div>
-                    </el-form-item>
-                </template>
-                <template v-else>
-                    <el-form-item label="关键字">
-                        <el-input v-model="keywords" placeholder="请输入优惠劵关键字" clearable @blur="keyword_blur"></el-input>
-                    </el-form-item>
-                    <el-form-item label="类型">
-                        <el-select v-model="form.type" multiple collapse-tags filterable placeholder="请选择优惠券类型">
-                            <el-option v-for="item in base_list.type_list" :key="item.value" :label="item.name" :value="item.value" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="到期类型">
-                        <el-select v-model="form.expire_type_ids" multiple collapse-tags filterable placeholder="请选择到期类型">
-                            <el-option v-for="item in get_data_list(common_store.common.plugins, 'coupon.expire_type_list')" :key="item.value" :label="item.name" :value="item.value" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="使用限制">
-                        <el-select v-model="form.use_limit_type_ids" multiple collapse-tags filterable placeholder="请选择使用限制">
-                            <el-option v-for="item in get_data_list(common_store.common.plugins, 'coupon.use_limit_type_list')" :key="item.value" :label="item.name" :value="item.value" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="显示数量">
-                        <el-input-number v-model="form.number" :min="1" :max="50" type="number" placeholder="请输入显示数量" value-on-clear="min" class="w number-show" controls-position="right"></el-input-number>
-                    </el-form-item>
-                    <el-form-item label="排序类型">
-                        <el-radio-group v-model="form.order_by_type">
-                            <el-radio v-for="item in get_data_list(common_store.common.plugins, 'coupon.order_by_type_list')" :key="item.index" :value="item.index">{{ item.name }}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="排序规则">
-                        <el-radio-group v-model="form.order_by_rule">
-                            <el-radio v-for="item in common_store.common.data_order_by_rule_list" :key="item.index" :value="item.index">{{ item.name }}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="首页显示">
-                        <el-switch v-model="form.is_repeat_receive" active-value="1" inactive-value="0" />
-                    </el-form-item>
-                </template>
-                <template v-if="form.theme === '4'">
-                    <el-form-item label="内容标题">
-                        <el-input v-model="form.title" placeholder="请输入内容" clearable></el-input>
-                    </el-form-item>
-                    <el-form-item label="内容描述">
-                        <el-input v-model="form.desc" type="textarea" :rows="4" placeholder="请输入内容" clearable></el-input>
-                    </el-form-item>
-                </template>
+                <!-- 数据筛选组件, 根据数据源类型显示不同的筛选组件 -->
+                <data-filter type="coupon" :value="form" :list="form.data_list" :base-list="base_list" @add="add" @data_list_replace="data_list_replace" @data_list_remove="data_list_remove" @data_list_sort="data_list_sort"></data-filter>
             </card-container>
         </el-form>
     </div>
-    <url-value-dialog v-model:dialog-visible="url_value_dialog_visible" :type="['coupon']" multiple @update:model-value="url_value_dialog_call_back"></url-value-dialog>
+    <url-value-dialog v-model:dialog-visible="url_value_dialog_visible" :type="['coupon']" :multiple="url_value_multiple_bool" @update:model-value="url_value_dialog_call_back"></url-value-dialog>
 </template>
 <script setup lang="ts">
-import { online_url, is_obj_empty, get_data_list } from '@/utils';
+import { online_url, is_obj_empty, get_data_list, get_math } from '@/utils';
 import { commonStore } from '@/store';
 const common_store = commonStore();
 /**
@@ -136,27 +77,44 @@ const emit = defineEmits(['update:change-theme']);
 const themeChange = (val: string) => {
     emit('update:change-theme', val);
 };
-const keywords = ref(form.value.keywords);
-const keyword_blur = () => {
-    form.value.keywords = keywords.value;
-}
 // 移除
-const remove = (index: number) => {
+const data_list_remove = (index: number) => {
     form.value.data_list.splice(index, 1);
 };
 // 排序
-const on_sort = (item: any) => {
+const data_list_sort = (item: any) => {
     form.value.data_list = item;
 };
-// 新增
-const add = () => {
+const url_value_multiple_bool = ref(true);
+const data_list_replace_index = ref(0);
+const data_list_replace = (index: number) => {
+    data_list_replace_index.value = index;
+    url_value_multiple_bool.value = false;
     url_value_dialog_visible.value = true;
 };
-// 弹窗回调
+const add = () => {
+    url_value_multiple_bool.value = true;
+    url_value_dialog_visible.value = true;
+};
+// 弹出框选择的内容
 const url_value_dialog_call_back = (item: any[]) => {
-    item.forEach((child: any) => {
-        form.value.data_list.push(child);
-    });
+    if (url_value_multiple_bool.value) {
+        item.forEach((item: any) => {
+            form.value.data_list.push({
+                id: get_math(),
+                new_cover: [],
+                new_title: '',
+                data: item,
+            });
+        });
+    } else {
+        form.value.data_list[data_list_replace_index.value] = {
+            id: get_math(),
+            new_cover: form.value.data_list[data_list_replace_index.value]?.new_cover || [],
+            new_title: '',
+            data: item[0],
+        };
+    }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 2164a38d..edfa4298 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -273,8 +273,16 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_
                 goods_or_article_data_processing(item0, item.key == new_array_1[0], item.key);
             });
         } else if (new_array_3.includes(item.key)) {
-            item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.id).join(',') || '';
-            item.com_data.content.data_list = [];
+            // 提取数据ID列表，用于后续的数据查询或处理
+            item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || '';
+            // 重构数据列表，保留原始数据结构的同时，添加或修改必要的字段
+            item.com_data.content.data_list = item.com_data.content.data_list.map((item1: any) => {
+                return {
+                    ...item1,
+                    data: [],
+                    data_id: item1.data.id,
+                };
+            });
             item.com_data.content.data_auto_list = [];
             if (item.com_data.content.data_type == '0') {
                 item.com_data.content = {
@@ -442,7 +450,6 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_
                 data_id: item1.data.id,
             };
         });
-
         // 设置分类ID、数量、排序规则等默认值，确保数据的一致性和完整性
         new_com_data_content.keywords = '';
         new_com_data_content.category_ids = defaultConfigSetting.category_ids;