From cff877f15f2db81da65a9699aa354dcd2bd473df Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 21 Aug 2024 10:03:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E6=96=87=E7=AB=A0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83=20sws=202024-08-21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/article.ts                            | 35 +++++++++++++++++++
 src/components/common/hot/index.vue           |  2 +-
 .../common/url-value/link-goods-search.vue    |  4 +--
 .../model-article-tabs-content.vue            |  2 ++
 .../model-shop-list-content.vue               |  4 +--
 .../model-shop-tabs-content.vue               |  4 +--
 src/store/article.ts                          | 29 +++++++++++++++
 src/store/modules/shop.ts                     |  2 +-
 src/store/modules/url-value.ts                | 24 -------------
 src/types/global.d.ts                         | 29 ++++++++++-----
 10 files changed, 94 insertions(+), 41 deletions(-)
 create mode 100644 src/api/article.ts
 create mode 100644 src/store/article.ts

diff --git a/src/api/article.ts b/src/api/article.ts
new file mode 100644
index 00000000..fb96d459
--- /dev/null
+++ b/src/api/article.ts
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+
+class ArticleAPI {
+    /**  链接初始化接口 */
+    static getInit() {
+        return request({
+            url: `diyapi/linkinit`,
+            method: 'post',
+        });
+    }
+    /** 文章指定数据 */
+    static getAppointList(data: any) {
+        return request({
+            url: `diyapi/articleappointdata`,
+            method: 'post',
+            data,
+        });
+    }
+    /** 文章自动数据 */
+    static getAutoList(data: any) {
+        return request({
+            url: `diyapi/articleautodata`,
+            method: 'post',
+            data,
+        });
+    }
+}
+
+export default ArticleAPI;
+
+// 分类树结构
+export interface Tree {
+    /** 主键 */
+    id: string;
+}
diff --git a/src/components/common/hot/index.vue b/src/components/common/hot/index.vue
index 2f92c089..8de413a3 100644
--- a/src/components/common/hot/index.vue
+++ b/src/components/common/hot/index.vue
@@ -357,7 +357,7 @@ const add_event = () => {
 //#region 设置热区弹窗-----------------------------------------------start
 const hot_dialog_visible = ref(false);
 interface formData {
-    link: linkData;
+    link: pageLinkList;
     name: string;
 }
 const form = ref<formData>({
diff --git a/src/components/common/url-value/link-goods-search.vue b/src/components/common/url-value/link-goods-search.vue
index a7866d62..9fb9f865 100644
--- a/src/components/common/url-value/link-goods-search.vue
+++ b/src/components/common/url-value/link-goods-search.vue
@@ -62,7 +62,7 @@
 </template>
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus';
-import { urlValueStore, urlValue, pageLinkList } from '@/store';
+import { urlValueStore } from '@/store';
 const url_value_store = urlValueStore();
 const props = defineProps({
     status: {
@@ -188,7 +188,7 @@ const on_submit = () => {
     if (!ruleFormRef.value) return;
     ruleFormRef.value.validate((valid: boolean) => {
         if (valid) {
-            let new_value: linkData = {
+            let new_value: pageLinkList = {
                 name: form.key,
                 link: form.key,
             };
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index f6f8ac62..51a62b34 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -97,6 +97,8 @@
 </template>
 <script setup lang="ts">
 import { get_math } from '@/utils';
+import ArticleAPI from '@/api/article';
+import { articleStore } from '@/store/article';
 const props = defineProps({
     value: {
         type: Object,
diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 4d92a51b..8fe1e8ca 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -72,8 +72,8 @@
 <script setup lang="ts">
 import { get_math } from '@/utils';
 import ShopAPI from '@/api/shop';
-import { ShopStore } from '@/store';
-const shop_store = ShopStore();
+import { shopStore } from '@/store';
+const shop_store = shopStore();
 interface shop_list {
     id: number;
     name: string;
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-shop-tabs/model-shop-tabs-content.vue
index 7b7de7c7..41dd562b 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -96,8 +96,8 @@
 <script setup lang="ts">
 import { get_math } from '@/utils';
 import ShopAPI from '@/api/shop';
-import { ShopStore } from '@/store';
-const shop_store = ShopStore();
+import { shopStore } from '@/store';
+const shop_store = shopStore();
 interface shop_list {
     id: number;
     name: string;
diff --git a/src/store/article.ts b/src/store/article.ts
new file mode 100644
index 00000000..2850796d
--- /dev/null
+++ b/src/store/article.ts
@@ -0,0 +1,29 @@
+import { ref, computed } from 'vue';
+import { defineStore } from 'pinia';
+export const articleStore = defineStore('article', () => {
+    // 链接是否需要调接口判断
+    const is_article_api = ref(false);
+    // 链接数据
+    const article = ref<article_list[]>([]);
+    // 存储链接数据
+    const set_article = (data: article_list[]) => {
+        article.value = data;
+        is_article_api.value = true;
+    };
+    // 如果为false 则转为true
+    const set_is_article_api = (bool: boolean) => {
+        is_article_api.value = bool;
+    };
+
+    return {
+        article,
+        is_article_api,
+        set_article,
+        set_is_article_api,
+    };
+});
+interface article_list {
+    id: number;
+    name: string;
+    url?: string;
+}
diff --git a/src/store/modules/shop.ts b/src/store/modules/shop.ts
index 0b59b433..7c4d4ee4 100644
--- a/src/store/modules/shop.ts
+++ b/src/store/modules/shop.ts
@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 
-export const ShopStore = defineStore('shop', () => {
+export const shopStore = defineStore('shop', () => {
     interface product_list {
         id: number;
         name: string;
diff --git a/src/store/modules/url-value.ts b/src/store/modules/url-value.ts
index 365c2f95..51305c97 100644
--- a/src/store/modules/url-value.ts
+++ b/src/store/modules/url-value.ts
@@ -28,27 +28,3 @@ export const urlValueStore = defineStore('urlValue', () => {
         set_is_url_value_api,
     };
 });
-
-export interface pageLinkList {
-    id?: string;
-    name: string;
-    type?: string;
-    page?: string;
-    data?: pageLinkList[];
-    items?: pageLinkList[];
-    icon?: string;
-    link?: string;
-    lng?: number;
-    lat?: number;
-    hasChildren?: boolean;
-    children?: pageLinkList[];
-}
-
-// 分类树结构
-export interface urlValue {
-    goods_category: any[];
-    brand_list: any[];
-    brand_category: any[];
-    article_category_list: any[];
-    page_link_list: pageLinkList[];
-}
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 294d38e1..d90f7f60 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -53,7 +53,7 @@ declare global {
         box_shadow_spread: number;
     };
     // 图片/视频/文件的数据类型
-    export interface uploadList {
+    type uploadList = {
         id?: number;
         url: string;
         original?: string;
@@ -62,7 +62,7 @@ declare global {
         size?: number;
         type?: string;
         error?: boolean;
-    }
+    };
     /**
      * 背景图
      */
@@ -100,20 +100,31 @@ declare global {
         box_shadow_spread: number;
         background_img_url: uploadList[];
     };
-
     /**
      * 链接参数
      */
-    type linkData = {
-        id?: number;
+    type pageLinkList = {
+        id?: string;
         name?: string;
-        link?: String;
-        data?: Data[];
+        type?: string;
+        page?: string;
+        data?: pageLinkList[];
+        items?: pageLinkList[];
         icon?: string;
+        link?: string;
         lng?: number;
         lat?: number;
         hasChildren?: boolean;
-        children?: linkData[];
+        children?: pageLinkList[];
+    };
+
+    // 分类树结构
+    type urlValue = {
+        goods_category: any[];
+        brand_list: any[];
+        brand_category: any[];
+        article_category_list: any[];
+        page_link_list: pageLinkList[];
     };
 
     /**
@@ -135,7 +146,7 @@ declare global {
         drag_start: rectCoords;
         drag_end: rectCoords;
         name: string;
-        link: linkData;
+        link: pageLinkList;
     };
 }
 export {};

From 7c009a421b580393b1156daf95c2883b16d95e4b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 21 Aug 2024 10:40:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E6=96=87=E7=AB=A0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83=20sws=202024-08-21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-article-list-content.vue            | 55 ++++++++++++++-----
 .../model-article-tabs-content.vue            | 46 +++++++++++-----
 .../model-shop-list-content.vue               | 41 +++++++-------
 .../model-shop-tabs-content.vue               | 32 +++++------
 .../components/main/default/article-list.ts   |  4 +-
 .../components/main/default/article-tabs.ts   | 14 ++---
 src/store/article.ts                          | 15 ++---
 src/store/modules/shop.ts                     | 10 +---
 src/types/global.d.ts                         |  4 ++
 9 files changed, 131 insertions(+), 90 deletions(-)

diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue
index 052f8ef6..f8b52065 100644
--- a/src/components/model-article-list/model-article-list-content.vue
+++ b/src/components/model-article-list/model-article-list-content.vue
@@ -14,7 +14,7 @@
                     <div class="mb-12">文章设置</div>
                     <el-form-item label="读取方式">
                         <el-radio-group v-model="form.article_check">
-                            <el-radio v-for="item in base_list.article_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                            <el-radio v-for="item in base_list.get_data_method_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                         </el-radio-group>
                     </el-form-item>
                     <template v-if="form.article_check === '0'">
@@ -39,8 +39,8 @@
                     </template>
                     <template v-else>
                         <el-form-item label="文章分类">
-                            <el-select v-model="form.article_type" multiple collapse-tags placeholder="请选择文章分类">
-                                <el-option v-for="item in base_list.article_type_list" :key="item.value" :label="item.name" :value="item.value" />
+                            <el-select v-model="form.article_category" multiple collapse-tags placeholder="请选择文章分类">
+                                <el-option v-for="item in base_list.article_category_list" :key="item.id" :label="item.name" :value="item.id" />
                             </el-select>
                         </el-form-item>
                         <el-form-item label="显示数量">
@@ -71,10 +71,14 @@
                 </card-container>
             </div>
         </el-form>
+        <url-value-dialog v-model:dialog-visible="url_value_dialog_visible" :type="['article']" multiple @update:model-value="url_value_dialog_call_back"></url-value-dialog>
     </div>
 </template>
 <script setup lang="ts">
 import { get_math } from '@/utils';
+import ArticleAPI from '@/api/article';
+import { articleStore } from '@/store/article';
+const article_store = articleStore();
 const props = defineProps({
     value: {
         type: Object,
@@ -89,15 +93,11 @@ const base_list = reactive({
         { name: '大图展示', value: '2' },
         { name: '左右滑动展示', value: '3' },
     ],
-    article_list: [
+    get_data_method_list: [
         { name: '选择文章', value: '0' },
         { name: '筛选文章', value: '1' },
     ],
-    article_type_list: [
-        { name: '样式一', value: '0' },
-        { name: '样式二', value: '1' },
-        { name: '样式三', value: '2' },
-    ],
+    article_category_list: [] as select_1[],
     sort_list: [
         { name: '综合', value: '0' },
         { name: '时间', value: '1' },
@@ -112,6 +112,26 @@ const base_list = reactive({
         { name: '浏览量', value: '1' },
     ],
 });
+onMounted(() => {
+    init();
+});
+const init = () => {
+    // 判断是否有历史数据
+    if (!article_store.is_article_api) {
+        article_store.set_is_article_api(true);
+        ArticleAPI.getInit()
+            .then((res) => {
+                const { article_category_list } = res.data;
+                base_list.article_category_list = article_category_list;
+                article_store.set_article(article_category_list);
+            })
+            .catch((err) => {
+                article_store.set_is_article_api(false);
+            });
+    } else {
+        base_list.article_category_list = article_store.article;
+    }
+};
 
 const article_list_remove = (index: number) => {
     form.article_list.splice(index, 1);
@@ -120,11 +140,18 @@ const article_list_sort = (item: any) => {
     form.article_list = item;
 };
 const add = () => {
-    form.article_list.push({
-        id: get_math(),
-        src: '',
-        new_url: [],
-        href: {},
+    url_value_dialog_visible.value = true;
+};
+// 开启关闭链接
+const url_value_dialog_visible = ref(false);
+const url_value_dialog_call_back = (item: any[]) => {
+    item.forEach((child: any) => {
+        form.article_list.push({
+            id: get_math(),
+            src: '',
+            new_url: [],
+            link: child,
+        });
     });
 };
 </script>
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 51a62b34..a97b61b5 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -32,7 +32,7 @@
                                     </el-form-item>
                                     <el-form-item label="读取方式">
                                         <el-radio-group v-model="row.article_check">
-                                            <el-radio v-for="item in base_list.article_list" :key="item.value + get_math()" :value="item.value">{{ item.name }}</el-radio>
+                                            <el-radio v-for="item in base_list.get_data_method_list" :key="item.value + get_math()" :value="item.value">{{ item.name }}</el-radio>
                                         </el-radio-group>
                                     </el-form-item>
                                     <template v-if="row.article_check === '0'">
@@ -55,8 +55,8 @@
                                     </template>
                                     <template v-else>
                                         <el-form-item label="文章分类">
-                                            <el-select v-model="row.article_type" multiple collapse-tags placeholder="请选择文章分类">
-                                                <el-option v-for="item in base_list.article_type_list" :key="item.value" :label="item.name" :value="item.value" />
+                                            <el-select v-model="row.article_category" multiple collapse-tags placeholder="请选择文章分类">
+                                                <el-option v-for="item in base_list.article_category_list" :key="item.id" :label="item.name" :value="item.id" />
                                             </el-select>
                                         </el-form-item>
                                         <el-form-item label="显示数量">
@@ -92,13 +92,14 @@
                 </el-form-item>
             </card-container>
         </el-form>
-        <url-value-dialog v-model:dialog-visible="urlValueDialogVisible" :type="['article']" multiple @update:model-value="url_value_dialog_call_back"></url-value-dialog>
+        <url-value-dialog v-model:dialog-visible="url_value_dialog_visible" :type="['article']" multiple @update:model-value="url_value_dialog_call_back"></url-value-dialog>
     </div>
 </template>
 <script setup lang="ts">
 import { get_math } from '@/utils';
 import ArticleAPI from '@/api/article';
 import { articleStore } from '@/store/article';
+const article_store = articleStore();
 const props = defineProps({
     value: {
         type: Object,
@@ -119,15 +120,11 @@ const base_list = reactive({
         { name: '大图展示', value: '2' },
         { name: '左右滑动展示', value: '3' },
     ],
-    article_list: [
+    get_data_method_list: [
         { name: '选择文章', value: '0' },
         { name: '筛选文章', value: '1' },
     ],
-    article_type_list: [
-        { name: '样式一', value: '0' },
-        { name: '样式二', value: '1' },
-        { name: '样式三', value: '2' },
-    ],
+    article_category_list: [] as select_1[],
     sort_list: [
         { name: '综合', value: '0' },
         { name: '时间', value: '1' },
@@ -142,8 +139,29 @@ const base_list = reactive({
         { name: '浏览量', value: '1' },
     ],
 });
+onMounted(() => {
+    init();
+});
+const init = () => {
+    // 判断是否有历史数据
+    if (!article_store.is_article_api) {
+        article_store.set_is_article_api(true);
+        ArticleAPI.getInit()
+            .then((res) => {
+                const { article_category_list } = res.data;
+                base_list.article_category_list = article_category_list;
+                article_store.set_article(article_category_list);
+            })
+            .catch((err) => {
+                article_store.set_is_article_api(false);
+            });
+    } else {
+        base_list.article_category_list = article_store.article;
+    }
+};
+
 // 开启关闭链接
-const urlValueDialogVisible = ref(false);
+const url_value_dialog_visible = ref(false);
 const active_index = ref(0);
 const tabs_list_click = (item: any, index: number) => {
     active_index.value = index;
@@ -154,7 +172,7 @@ const tabs_list_remove = (index: number) => {
 };
 const tabs_list_sort = (item: any) => {
     // 拖拽完成后更新数组
-    form.tabs_list = item.value;
+    form.tabs_list = item;
 };
 const tabs_add = () => {
     form.tabs_list.push({
@@ -177,12 +195,12 @@ const article_list_remove = (index: number) => {
     form.tabs_list[active_index.value].article_list.splice(index, 1);
 };
 const article_list_sort = (item: any) => {
-    // emit('update:value', item);
+    form.tabs_list[active_index.value].article_list = item;
 };
 
 const article_index = ref(0);
 const article_add = (index: number) => {
-    urlValueDialogVisible.value = true;
+    url_value_dialog_visible.value = true;
     article_index.value = index;
 };
 const url_value_dialog_call_back = (item: any[]) => {
diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 8fe1e8ca..55cb7553 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -74,10 +74,6 @@ import { get_math } from '@/utils';
 import ShopAPI from '@/api/shop';
 import { shopStore } from '@/store';
 const shop_store = shopStore();
-interface shop_list {
-    id: number;
-    name: string;
-};
 
 const props = defineProps({
     value: {
@@ -104,8 +100,8 @@ const base_list = reactive({
         { name: '指定商品', value: '0' },
         { name: '筛选商品', value: '1' },
     ],
-    product_category_list: [] as shop_list[],
-    product_brand_list: [] as shop_list[],
+    product_category_list: [] as select_1[],
+    product_brand_list: [] as select_1[],
     sort_list: [
         { name: '综合', value: '0' },
         { name: '销量', value: '1' },
@@ -116,26 +112,30 @@ const base_list = reactive({
     sort_rules_list: [
         { name: '降序(desc)', value: '0' },
         { name: '升序(asc)', value: '1' },
-    ]
+    ],
 });
 
 const init = () => {
-    ShopAPI.getShop().then((res) => {
-        const { goods_category, brand_list } = res.data;
-        base_list.product_category_list = goods_category;
-        base_list.product_brand_list = brand_list;
-        shop_store.set_category_brand(goods_category, brand_list);
-    });
-};
-
-onBeforeMount(() => {
     if (!shop_store.is_shop_api) {
         shop_store.set_is_shop_api(true);
-        init();
+        ShopAPI.getShop()
+            .then((res) => {
+                const { goods_category, brand_list } = res.data;
+                base_list.product_category_list = goods_category;
+                base_list.product_brand_list = brand_list;
+                shop_store.set_category_brand(goods_category, brand_list);
+            })
+            .catch((err) => {
+                shop_store.set_is_shop_api(false);
+            });
     } else {
         base_list.product_category_list = shop_store.category_list;
         base_list.product_brand_list = shop_store.brand_list;
     }
+};
+
+onBeforeMount(() => {
+    init();
 });
 
 const product_list_remove = (index: number) => {
@@ -152,8 +152,8 @@ const add = () => {
 // 拖拽更新之后，更新数据
 const product_list_sort = (new_list: any) => {
     form.value.product_list = new_list;
-}
-const change_style = (val: any):void => {
+};
+const change_style = (val: any): void => {
     form.value.product_style = val;
     if (['3', '4', '5'].includes(val) && ['0', '1'].includes(form.value.shop_type)) {
         form.value.shop_type = '2';
@@ -170,7 +170,8 @@ const change_style = (val: any):void => {
         }
     }
 }
-.card, .card.mb-8 {
+.card,
+.card.mb-8 {
     .el-form-item:last-child {
         margin-bottom: 0;
     }
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-shop-tabs/model-shop-tabs-content.vue
index 41dd562b..947ab6f6 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -98,10 +98,6 @@ import { get_math } from '@/utils';
 import ShopAPI from '@/api/shop';
 import { shopStore } from '@/store';
 const shop_store = shopStore();
-interface shop_list {
-    id: number;
-    name: string;
-};
 
 const props = defineProps({
     value: {
@@ -136,8 +132,8 @@ const base_list = reactive({
         { name: '指定商品', value: '0' },
         { name: '选择商品', value: '1' },
     ],
-    product_category_list: [] as shop_list[],
-    product_brand_list: [] as shop_list[],
+    product_category_list: [] as select_1[],
+    product_brand_list: [] as select_1[],
     sort_list: [
         { name: '综合', value: '0' },
         { name: '销量', value: '1' },
@@ -156,23 +152,27 @@ const base_list = reactive({
 });
 // 获取商品分类和品牌分类
 const init = () => {
-    ShopAPI.getShop().then((res) => {
-        const { goods_category, brand_list } = res.data;
-        base_list.product_category_list = goods_category;
-        base_list.product_brand_list = brand_list;
-        shop_store.set_category_brand(goods_category, brand_list);
-    });
-};
-
-onBeforeMount(() => {
     // 判断是否有历史数据
     if (!shop_store.is_shop_api) {
         shop_store.set_is_shop_api(true);
-        init();
+        ShopAPI.getShop()
+            .then((res) => {
+                const { goods_category, brand_list } = res.data;
+                base_list.product_category_list = goods_category;
+                base_list.product_brand_list = brand_list;
+                shop_store.set_category_brand(goods_category, brand_list);
+            })
+            .catch((err) => {
+                shop_store.set_is_shop_api(false);
+            });
     } else {
         base_list.product_category_list = shop_store.category_list;
         base_list.product_brand_list = shop_store.brand_list;
     }
+};
+
+onBeforeMount(() => {
+    init();
 });
 
 const active_index = ref(0);
diff --git a/src/layout/components/main/default/article-list.ts b/src/layout/components/main/default/article-list.ts
index 838575b9..e7496336 100644
--- a/src/layout/components/main/default/article-list.ts
+++ b/src/layout/components/main/default/article-list.ts
@@ -10,7 +10,7 @@ interface DefaultArticleList {
     content: {
         article_style: string;
         article_check: string;
-        article_type: string[];
+        article_category: string[];
         article_list: ArticleList[];
         number: number;
         sort: string;
@@ -41,7 +41,7 @@ const defaultArticleList: DefaultArticleList = {
         article_style: '1',
         article_check: '0',
         article_list: [],
-        article_type: [],
+        article_category: [],
         number: 4,
         sort: '0',
         sort_rules: '0',
diff --git a/src/layout/components/main/default/article-tabs.ts b/src/layout/components/main/default/article-tabs.ts
index 9c8316f1..502add65 100644
--- a/src/layout/components/main/default/article-tabs.ts
+++ b/src/layout/components/main/default/article-tabs.ts
@@ -10,7 +10,7 @@ interface articleTabsList {
     title: string;
     desc: string;
     article_check: string;
-    article_type: string[];
+    article_category: string[];
     number: number;
     sort: string;
     sort_rules: string;
@@ -58,12 +58,12 @@ const defaultArticleTabs: DefaultArticleTabs = {
         tabs_top_up: true,
         article_style: '0',
         tabs_list: [
-            { id: '1', title: '热门推荐', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '2', title: '测试一', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '3', title: '测试二', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '4', title: '测试三', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '5', title: '测试四', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '6', title: '测试五', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '1', title: '热门推荐', desc: '简介', article_check: '0', article_category: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '2', title: '测试一', desc: '简介', article_check: '0', article_category: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '3', title: '测试二', desc: '简介', article_check: '0', article_category: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '4', title: '测试三', desc: '简介', article_check: '0', article_category: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '5', title: '测试四', desc: '简介', article_check: '0', article_category: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '6', title: '测试五', desc: '简介', article_check: '0', article_category: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
         ],
         is_show: ['0', '1'],
     },
diff --git a/src/store/article.ts b/src/store/article.ts
index 2850796d..d42c0d6f 100644
--- a/src/store/article.ts
+++ b/src/store/article.ts
@@ -1,12 +1,12 @@
 import { ref, computed } from 'vue';
 import { defineStore } from 'pinia';
 export const articleStore = defineStore('article', () => {
-    // 链接是否需要调接口判断
+    // 文章是否需要调接口判断
     const is_article_api = ref(false);
-    // 链接数据
-    const article = ref<article_list[]>([]);
-    // 存储链接数据
-    const set_article = (data: article_list[]) => {
+    // 文章数据
+    const article = ref<select_1[]>([]);
+    // 存储文章数据
+    const set_article = (data: select_1[]) => {
         article.value = data;
         is_article_api.value = true;
     };
@@ -22,8 +22,3 @@ export const articleStore = defineStore('article', () => {
         set_is_article_api,
     };
 });
-interface article_list {
-    id: number;
-    name: string;
-    url?: string;
-}
diff --git a/src/store/modules/shop.ts b/src/store/modules/shop.ts
index 7c4d4ee4..74ad2947 100644
--- a/src/store/modules/shop.ts
+++ b/src/store/modules/shop.ts
@@ -2,18 +2,14 @@ import { ref } from 'vue';
 import { defineStore } from 'pinia';
 
 export const shopStore = defineStore('shop', () => {
-    interface product_list {
-        id: number;
-        name: string;
-    };
     // 上传是否需要调接口判断
     const is_shop_api = ref(false);
     // 上传分类列表
-    const category_list = ref<product_list[]>([]);
+    const category_list = ref<select_1[]>([]);
     // 上传品牌列表
-    const brand_list = ref<product_list[]>([]);
+    const brand_list = ref<select_1[]>([]);
     // 存储上传分类列表
-    const set_category_brand = (category: product_list[], brand: product_list[]) => {
+    const set_category_brand = (category: select_1[], brand: select_1[]) => {
         category_list.value = category;
         brand_list.value = brand;
         is_shop_api.value = true;
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index d90f7f60..3a9a6ed0 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -3,6 +3,10 @@ declare global {
     interface arrayIndex {
         [key: string]: any;
     }
+    interface select_1 {
+        id: string | number;
+        name: string;
+    }
     // 可视化数据
     interface commonComponentData {
         src: string;

From b67a327ffa527e0c24466a5cd3ea68706c8f668b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 21 Aug 2024 11:05:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E6=96=87=E7=AB=A0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83=20sws=202024-08-21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-article-list/model-article-list-content.vue  | 10 ++++------
 .../model-article-tabs/model-article-tabs-content.vue  |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue
index f8b52065..6cbb3ce3 100644
--- a/src/components/model-article-list/model-article-list-content.vue
+++ b/src/components/model-article-list/model-article-list-content.vue
@@ -22,16 +22,14 @@
                             <drag :data="form.article_list" :space-col="20" @remove="article_list_remove" @on-sort="article_list_sort">
                                 <template #default="{ row }">
                                     <upload v-model="row.new_url" :limit="1" size="40" styles="2"></upload>
-                                    <el-image :src="row.url" fit="contain" class="img">
+                                    <el-image :src="row.link.cover" fit="contain" class="img">
                                         <template #error>
                                             <div class="bg-f5 flex-row jc-c align-c radius h w">
                                                 <icon name="error-img" size="16" color="9"></icon>
                                             </div>
                                         </template>
                                     </el-image>
-                                    <div class="flex-1 flex-width">
-                                        <url-value v-model="row.link"></url-value>
-                                    </div>
+                                    <div class="flex-1 flex-width text-line-2 size-12 self-s">{{ row.link.title }}</div>
                                 </template>
                             </drag>
                             <el-button class="mtb-20 w" @click="add">+添加</el-button>
@@ -120,12 +118,12 @@ const init = () => {
     if (!article_store.is_article_api) {
         article_store.set_is_article_api(true);
         ArticleAPI.getInit()
-            .then((res) => {
+            .then((res: any) => {
                 const { article_category_list } = res.data;
                 base_list.article_category_list = article_category_list;
                 article_store.set_article(article_category_list);
             })
-            .catch((err) => {
+            .catch((err: any) => {
                 article_store.set_is_article_api(false);
             });
     } else {
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index a97b61b5..3d9eb52d 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -147,12 +147,12 @@ const init = () => {
     if (!article_store.is_article_api) {
         article_store.set_is_article_api(true);
         ArticleAPI.getInit()
-            .then((res) => {
+            .then((res: any) => {
                 const { article_category_list } = res.data;
                 base_list.article_category_list = article_category_list;
                 article_store.set_article(article_category_list);
             })
-            .catch((err) => {
+            .catch((err: any) => {
                 article_store.set_is_article_api(false);
             });
     } else {