From 3e31e2fe11a486b34b2997a3a1d70561d106f684 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 2 Sep 2024 17:22:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-article-list/index.vue   | 152 ++++++++++++++----
 .../model-article-list-styles.vue             |  17 +-
 .../model-article-tabs-content.vue            |  11 ++
 .../model-article-tabs-styles.vue             |  16 +-
 src/components/model-shop-list/index.vue      |  40 ++---
 .../model-shop-list-content.vue               |   4 +-
 .../model-shop-tabs-content.vue               |   4 +-
 .../components/main/default/article-list.ts   |   8 +-
 .../components/main/default/article-tabs.ts   |  15 +-
 .../components/main/default/shop-list.ts      |   4 +-
 .../components/main/default/shop-tabs.ts      |  61 +++----
 11 files changed, 229 insertions(+), 103 deletions(-)

diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue
index 4e61f905..69e6a707 100644
--- a/src/components/model-article-list/index.vue
+++ b/src/components/model-article-list/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="oh" :style="style_container">
         <div class="re oh" :style="style">
-            <div class="flex-warp" :class="article_theme_class" :style="article_theme !== '3' ? article_spacing : ''">
+            <div v-if="!['4'].includes(article_theme)" class="flex-warp" :class="article_theme_class" :style="article_theme !== '3' ? article_spacing : ''">
                 <template v-for="(item, index) in data_list" :key="index">
                     <div class="item bg-f oh" :class="article_theme == '0' ? 'flex-row' : 'flex-col'" :style="article_style">
                         <template v-if="article_theme !== '3'">
@@ -25,6 +25,30 @@
                     </div>
                 </template>
             </div>
+            <div v-else class="oh" :class="article_theme_class">
+                <el-carousel :key="carousel_key" indicator-position="none" :interval="interval_time" arrow="never" :autoplay="is_roll ? true : false">
+                    <el-carousel-item v-for="(item1, index1) in article_carousel_list" :key="index1" class="flex" :style="article_spacing">
+                        <div v-for="(item, index) in item1.carousel_list" :key="index" class="item bg-f oh flex-col" :style="article_style">
+                            <template v-if="item.new_cover.length > 0">
+                                <image-empty v-model="item.new_cover[0].url" class="img" :style="img_radius" :error-img-style="error_img"></image-empty>
+                            </template>
+                            <template v-else> <image-empty v-model="item.data.cover" class="img" :style="img_radius" :error-img-style="error_img"></image-empty> </template>
+                            <div class="jc-sb flex-1 flex-col" :style="article_theme !== '0' ? content_padding : ''">
+                                <div class="title text-line-2" :style="article_name">{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}</div>
+                                <div class="flex-row jc-sb gap-8 align-e mt-10">
+                                    <div :style="article_date">{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}</div>
+                                    <div v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
+                                        <icon name="eye"></icon>
+                                        <div>
+                                            {{ item.data.access_count ? item.data.access_count : '16' }}
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </el-carousel-item>
+                </el-carousel>
+            </div>
         </div>
     </div>
 </template>
@@ -57,7 +81,6 @@ interface ArticleList {
     new_title: string;
     new_cover: uploadList[];
 }
-const containerRef = ref<HTMLElement | null>(null);
 // 数据
 const data_list = ref<ArticleList[]>([]);
 // 风格
@@ -81,8 +104,7 @@ const content_spacing = ref('');
 // 文章间距
 const article_spacing = ref('');
 const article_spacing_children = ref('');
-const article_item_width = ref('104');
-const article_item_height = ref('104');
+const article_item_height = ref('155');
 
 const article_style = ref({});
 const default_data_list: ArticleList = {
@@ -91,8 +113,16 @@ const default_data_list: ArticleList = {
     new_title: '测试文章标题',
     new_cover: [],
 };
-const get_auto_data_list = async (new_content: any) => {
-    const { category, number, sort, sort_rules, is_cover } = new_content;
+// 轮播图列数
+const carousel_col = ref('2');
+// 轮播图key值
+const carousel_key = ref('0');
+// 轮播图定时轮播
+const interval_time = ref(2000);
+// 轮播图是否滚动
+const is_roll = ref(1);
+const get_auto_data_list = async () => {
+    const { category, number, sort, sort_rules, is_cover } = new_content.value;
     const new_data = {
         article_keywords: '',
         article_category_ids: category.join(','),
@@ -116,32 +146,44 @@ const get_auto_data_list = async (new_content: any) => {
         data_list.value = Array(4).fill(default_data_list);
     }
 };
-const data_type_is_change = ref(0);
-watch(
-    () => data_type_is_change.value,
-    (newVal, oldValue) => {
-        if (newVal !== oldValue && String(newVal) === '1') {
-            get_auto_data_list(props.value?.content);
+
+const new_content = computed(() => props.value?.content || {});
+const new_style = computed(() => props.value?.style || {});
+watchEffect(() => {
+    if (new_content.value.data_type == '0') {
+        if (!isEmpty(new_content.value.data_list)) {
+            data_list.value = new_content.value.data_list;
+            data_list.value = cloneDeep(new_content.value.data_list);
+        } else {
+            data_list.value = Array(4).fill(default_data_list);
         }
-    },
-    { deep: true }
-);
+    } else {
+        get_auto_data_list();
+    }
+});
+// 轮播宽度
+const multicolumn_columns_width = computed(() => {
+    const { carousel_col } = toRefs(new_content.value);
+    // 计算间隔的空间。(gap * gap数量) / 模块数量
+    let gap = carousel_col.value !== '0' ? (new_style.value.article_spacing * carousel_col.value) / (Number(carousel_col.value) + 1) : '0';
+    return `calc(${100 / (Number(carousel_col.value) + 1)}% - ${gap}px)`;
+});
+// 文章内容高度
+const article_name_height_computer = computed(() => {
+    return new_style.value.name_size * 2.4 + 'px';
+});
+const article_name_line_height_computer = computed(() => {
+    return new_style.value.name_size * 1.2 + 'px';
+});
+// 轮播高度
+const carousel_height_computer = computed(() => {
+    return new_style.value.name_size * 2 + new_style.value.article_height + 'px';
+});
 watch(
     props.value,
     (newVal, oldValue) => {
         const new_content = newVal?.content;
         const new_style = newVal?.style;
-        // 内容
-        data_type_is_change.value = new_content.data_type;
-        if (String(new_content.data_type) === '0') {
-            if (!isEmpty(new_content.data_list)) {
-                data_list.value = new_content.data_list;
-                data_list.value = cloneDeep(new_content.data_list);
-            } else {
-                data_list.value = Array(4).fill(default_data_list);
-            }
-        }
-
         article_theme.value = new_content.theme;
         field_show.value = new_content.field_show;
         // 样式
@@ -169,7 +211,13 @@ watch(
         } else if (article_theme.value == '3') {
             style.value = `padding: 0 ${new_style.content_spacing}px;background:#fff;` + content_radius.value;
         } else if (article_theme.value == '4') {
-            article_item_width.value = `${new_style.article_width}px`;
+            // 更新轮播图的key，确保更换时能重新更新轮播图
+            carousel_col.value = new_content.carousel_col || '1';
+            carousel_key.value = get_math();
+            // 滚动时间
+            interval_time.value = (new_style.interval_time || 2) * 1000;
+            // 是否滚动修改
+            is_roll.value = new_style.is_roll;
             article_item_height.value = `${new_style.article_height}px`;
             article_style.value += content_radius.value;
         }
@@ -177,7 +225,7 @@ watch(
             style_container.value = common_styles_computer(new_style.common_style);
         }
     },
-    { immediate: true, deep: true }
+    { deep: true, immediate: true }
 );
 const article_theme_class = computed(() => {
     switch (article_theme.value) {
@@ -189,10 +237,34 @@ const article_theme_class = computed(() => {
             return 'style3 flex-col';
         case '3':
             return 'style4 flex-col';
-        case '4':
-            return 'style5 flex-row';
+        default:
+            return 'style5';
+    }
+});
+
+interface ArticleCarouselList {
+    carousel_list: ArticleList[];
+}
+const article_carousel_list = computed(() => {
+    // 深拷贝一下，确保不会出现问题
+    const cloneList = cloneDeep(data_list.value);
+    // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+    if (cloneList.length > 0) {
+        // 每页显示的数量
+        const num = Number(carousel_col.value) + 1;
+        console.log(num);
+        // 存储数据显示
+        let nav_list: ArticleCarouselList[] = [];
+        // 拆分的数量
+        const split_num = Math.ceil(cloneList.length / num);
+        for (let i = 0; i < split_num; i++) {
+            nav_list.push({ carousel_list: cloneList.slice(i * num, (i + 1) * num) });
+        }
+        return nav_list;
+    } else {
+        // 否则的话，就返回全部的信息
+        return [{ carousel_list: cloneList }];
     }
-    return `style${article_theme.value}`;
 });
 </script>
 <style lang="scss" scoped>
@@ -232,12 +304,24 @@ const article_theme_class = computed(() => {
 }
 .style5 {
     .item {
-        min-width: v-bind(article_item_width);
-        width: v-bind(article_item_width);
+        width: v-bind(multicolumn_columns_width);
+        min-width: v-bind(multicolumn_columns_width);
         .img {
             width: 100%;
-            height: v-bind(article_item_height);
+            max-height: v-bind(article_item_height);
+        }
+        .title {
+            height: v-bind(article_name_height_computer);
+            line-height: v-bind(article_name_line_height_computer);
         }
     }
 }
+
+:deep(.el-carousel) {
+    width: 100%;
+    .el-carousel__container {
+        // height: v-bind(article_item_height);
+        height: v-bind(carousel_height_computer);
+    }
+}
 </style>
diff --git a/src/components/model-article-list/model-article-list-styles.vue b/src/components/model-article-list/model-article-list-styles.vue
index d26842a5..063cfe82 100644
--- a/src/components/model-article-list/model-article-list-styles.vue
+++ b/src/components/model-article-list/model-article-list-styles.vue
@@ -23,7 +23,6 @@
                 <el-form-item label="内间距">
                     <padding :value="form.padding"></padding>
                 </el-form-item>
-
                 <template v-if="theme == '0'">
                     <el-form-item label="内容间距">
                         <slider v-model="form.content_spacing"></slider>
@@ -35,14 +34,24 @@
                     </el-form-item>
                 </template>
                 <template v-if="theme == '4'">
-                    <el-form-item label="内容宽度">
-                        <slider v-model="form.article_width" :max="1000"></slider>
-                    </el-form-item>
                     <el-form-item label="内容高度">
                         <slider v-model="form.article_height" :max="1000"></slider>
                     </el-form-item>
                 </template>
             </card-container>
+            <div class="divider-line"></div>
+            <template v-if="theme == '4'">
+                <card-container>
+                    <div class="mb-12">轮播设置</div>
+                    <el-form-item label="自动轮播">
+                        <el-switch v-model="form.is_roll" :active-value="1" :inactive-value="0" />
+                    </el-form-item>
+                    <el-form-item label="间隔时间">
+                        <slider v-model="form.interval_time" :min="1" :max="100"></slider>
+                    </el-form-item>
+                </card-container>
+                <div class="divider-line"></div>
+            </template>
         </el-form>
         <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_style_update" />
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 1973e325..e691147f 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -16,6 +16,11 @@
                         <el-radio v-for="item in base_list.article_theme_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
+                <el-form-item v-if="form.theme == '4'" label="轮播列数">
+                    <el-radio-group v-model="form.article_carousel_col">
+                        <el-radio v-for="item in base_list.carousel_col_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
             </card-container>
             <div class="divider-line"></div>
             <card-container>
@@ -123,6 +128,12 @@ const base_list = reactive({
         { name: '无图模式', value: '3' },
         { name: '左右滑动展示', value: '4' },
     ],
+    carousel_col_list: [
+        { name: '单列展示', value: '0' },
+        { name: '两列展示', value: '1' },
+        { name: '三列展示', value: '2' },
+        { name: '四列展示', value: '3' },
+    ],
     data_type_list: [
         { name: '选择文章', value: '0' },
         { name: '筛选文章', value: '1' },
diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue
index 1a481276..394469dd 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -50,14 +50,24 @@
                     </el-form-item>
                 </template>
                 <template v-if="theme == '4'">
-                    <el-form-item label="内容宽度">
-                        <slider v-model="form.article_width" :max="1000"></slider>
-                    </el-form-item>
                     <el-form-item label="内容高度">
                         <slider v-model="form.article_height" :max="1000"></slider>
                     </el-form-item>
                 </template>
             </card-container>
+            <div class="divider-line"></div>
+            <template v-if="theme == '4'">
+                <card-container>
+                    <div class="mb-12">轮播设置</div>
+                    <el-form-item label="自动轮播">
+                        <el-switch v-model="form.is_roll" :active-value="1" :inactive-value="0" />
+                    </el-form-item>
+                    <el-form-item label="间隔时间">
+                        <slider v-model="form.interval_time" :max="100"></slider>
+                    </el-form-item>
+                </card-container>
+                <div class="divider-line"></div>
+            </template>
         </el-form>
         <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index 1de9f125..f21f0d5b 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -56,7 +56,7 @@
                                     </div>
                                     <div v-if="form.is_shop_show">
                                         <template v-if="form.shop_type == 'text'">
-                                            <div class="plr-11 ptb-3 round cr-f" :style="trends_config('button', 'gradient') + `color: ${ new_style.shop_button_text_color };`">{{ form.shop_button_text }}</div>
+                                            <div class="plr-11 ptb-3 round cr-f" :style="trends_config('button', 'gradient') + `color: ${new_style.shop_button_text_color};`">{{ form.shop_button_text }}</div>
                                         </template>
                                         <template v-else>
                                             <icon class="round plr-6 ptb-5" :name="!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart'" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size + ''" :styles="button_gradient()"></icon>
@@ -83,7 +83,7 @@
                                 </div>
                                 <div v-if="form.is_shop_show">
                                     <template v-if="form.shop_type == 'text'">
-                                        <div class="plr-11 ptb-3 round cr-f" :style="trends_config('button', 'gradient') + `color: ${ new_style.shop_button_text_color };`">{{ form.shop_button_text }}</div>
+                                        <div class="plr-11 ptb-3 round cr-f" :style="trends_config('button', 'gradient') + `color: ${new_style.shop_button_text_color};`">{{ form.shop_button_text }}</div>
                                     </template>
                                     <template v-else>
                                         <icon class="round plr-6 ptb-5" :name="!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart'" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size + ''" :styles="button_gradient()"></icon>
@@ -132,7 +132,7 @@
                                     </div>
                                     <div v-if="form.is_shop_show">
                                         <template v-if="form.shop_type == 'text'">
-                                            <div class="plr-11 ptb-3 round cr-f" :style="trends_config('button', 'gradient') + `color: ${ new_style.shop_button_text_color };`">{{ form.shop_button_text }}</div>
+                                            <div class="plr-11 ptb-3 round cr-f" :style="trends_config('button', 'gradient') + `color: ${new_style.shop_button_text_color};`">{{ form.shop_button_text }}</div>
                                         </template>
                                         <template v-else>
                                             <icon class="round plr-6 ptb-5" :name="!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart'" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size + ''" :styles="button_gradient()"></icon>
@@ -206,23 +206,23 @@ const default_list = {
             bg_color: '#EA3323',
             br_color: '',
             color: '#fff',
-            url: ''
+            url: '',
         },
         {
             name: '包邮',
             bg_color: '',
             br_color: '#EA3323',
             color: '#EA3323',
-            url: ''
+            url: '',
         },
         {
             name: '领劵',
             bg_color: '',
             br_color: '#EA9223',
             color: '#EA9223',
-            url: ''
-        }
-    ]
+            url: '',
+        },
+    ],
 };
 const list = ref<data_list[]>([]);
 
@@ -369,15 +369,15 @@ const button_gradient = () => {
     return gradient_handle(new_style.value.shop_button_color, '90deg');
 };
 // icon标志显示样式
-const icon_style = (item: { bg_color: string; color: string; br_color: string; }) => {
+const icon_style = (item: { bg_color: string; color: string; br_color: string }) => {
     let style = `background: ${item.bg_color};color: ${item.color};`;
     if (!isEmpty(item.br_color)) {
-        style += `border: 1px solid ${item.br_color};`
+        style += `border: 1px solid ${item.br_color};`;
     } else {
-        style += `border: 1px solid ${item.bg_color};`
+        style += `border: 1px solid ${item.bg_color};`;
     }
     return style;
-}
+};
 // 公共样式
 const style_container = computed(() => {
     if (props.isCommonStyle) {
@@ -391,16 +391,16 @@ const style_container = computed(() => {
 // 记录当前显示的轮播图的数据
 // 不换行显示
 const multicolumn_columns_width = computed(() => {
-    const { single_line_number } = toRefs(form.value);
-    // 计算间隔的空间。(gap * gap数量) / 模块数量 
-    let gap = (new_style.value.content_outer_spacing * (single_line_number.value - 1)) / single_line_number.value;
-    return `calc(${ 100 / single_line_number.value }% - ${ gap }px)` ;
+    const { carousel_col } = toRefs(form.value);
+    // 计算间隔的空间。(gap * gap数量) / 模块数量
+    let gap = (new_style.value.content_outer_spacing * (carousel_col.value - 1)) / carousel_col.value;
+    return `calc(${100 / carousel_col.value}% - ${gap}px)`;
 });
 const multicolumn_columns_height = computed(() => new_style.value.content_outer_height + 'px');
 const interval_list = ref({
     time: 2000,
     is_roll: true,
-    notice_length: 1
+    notice_length: 1,
 });
 interface nav_list {
     split_list: data_list[];
@@ -411,7 +411,7 @@ const shop_content_list = computed(() => {
     // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
     if (cloneList.length > 0) {
         // 每页显示的数量
-        const num = form.value.single_line_number;
+        const num = form.value.carousel_col;
         // 存储数据显示
         let nav_list: nav_list[] = [];
         // 拆分的数量
@@ -424,7 +424,7 @@ const shop_content_list = computed(() => {
         // 否则的话，就返回全部的信息
         return [{ split_list: cloneList }];
     }
-})
+});
 // 轮播图定时显示
 const interval_time = ref(2000);
 // 轮播图是否滚动
@@ -447,7 +447,7 @@ watchEffect(() => {
         interval_list.value = {
             time: time,
             is_roll: display_is_roll,
-            notice_length: notice_length
+            notice_length: notice_length,
         };
         // 更新轮播图的key，确保更换时能重新更新轮播图
         carouselKey.value = get_math();
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 e6f558a0..7f73ee10 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -8,8 +8,8 @@
                         <el-radio v-for="item in base_list.product_style_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item v-if="form.theme == '5'" label="单行显示">
-                    <el-radio-group v-model="form.single_line_number" class="ml-4">
+                <el-form-item v-if="form.theme == '5'" label="轮播列数">
+                    <el-radio-group v-model="form.carousel_col" class="ml-4">
                         <el-radio :value="1">1个</el-radio>
                         <el-radio :value="2">2个</el-radio>
                         <el-radio :value="3">3个</el-radio>
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 d19203b2..3fba7ff1 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -16,8 +16,8 @@
                         <el-radio v-for="item in base_list.product_style_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item v-if="form.theme == '5'" label="单行显示">
-                    <el-radio-group v-model="form.single_line_number" class="ml-4">
+                <el-form-item v-if="form.theme == '5'" label="轮播列数">
+                    <el-radio-group v-model="form.carousel_col" class="ml-4">
                         <el-radio :value="1">1个</el-radio>
                         <el-radio :value="2">2个</el-radio>
                         <el-radio :value="3">3个</el-radio>
diff --git a/src/views/layout/components/main/default/article-list.ts b/src/views/layout/components/main/default/article-list.ts
index c13922d7..acca3baa 100644
--- a/src/views/layout/components/main/default/article-list.ts
+++ b/src/views/layout/components/main/default/article-list.ts
@@ -36,8 +36,9 @@ interface DefaultArticleList {
         padding: paddingStyle;
         article_spacing: number;
         content_spacing: number;
-        article_width: number;
         article_height: number;
+        interval_time: number; //滚动时间
+        is_roll: number;
         common_style: object;
     };
 }
@@ -91,8 +92,9 @@ const defaultArticleList: DefaultArticleList = {
         },
         content_spacing: 10, // 内容间距
         article_spacing: 10, // 文章间距
-        article_width: 155, // 文章宽度
-        article_height: 155, // 文章宽度
+        article_height: 155, // 文章高度
+        interval_time: 2, //滚动时间
+        is_roll: 1, // 是否轮播
         common_style: { ...defaultCommon, padding: 10, padding_top: 10, padding_bottom: 10, padding_left: 10, padding_right: 10 },
     },
 };
diff --git a/src/views/layout/components/main/default/article-tabs.ts b/src/views/layout/components/main/default/article-tabs.ts
index 8ed02e33..18d6d84a 100644
--- a/src/views/layout/components/main/default/article-tabs.ts
+++ b/src/views/layout/components/main/default/article-tabs.ts
@@ -22,6 +22,7 @@ interface DefaultArticleTabs {
         tabs_theme: string;
         tabs_top_up: boolean;
         article_theme: string;
+        article_carousel_col: string;
         tabs_list: articleTabsList[];
         field_show: string[];
     };
@@ -49,8 +50,9 @@ interface DefaultArticleTabs {
         padding: paddingStyle;
         article_spacing: number;
         content_spacing: number;
-        article_width: number;
         article_height: number;
+        interval_time: number; //滚动时间
+        is_roll: number;
         common_style: object;
     };
 }
@@ -59,6 +61,7 @@ const defaultArticleTabs: DefaultArticleTabs = {
         tabs_theme: '0',
         tabs_top_up: true,
         article_theme: '0',
+        article_carousel_col: '2',
         tabs_list: [
             { id: '1', title: '热门推荐', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: true, data_list: [] },
             { id: '2', title: '测试一', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: true, data_list: [] },
@@ -70,7 +73,10 @@ const defaultArticleTabs: DefaultArticleTabs = {
         field_show: ['0', '1'],
     },
     style: {
-        tabs_checked: [{ color: '#FF2222', color_percentage: undefined }, { color: '#FF9898', color_percentage: undefined }],
+        tabs_checked: [
+            { color: '#FF2222', color_percentage: undefined },
+            { color: '#FF9898', color_percentage: undefined },
+        ],
         tabs_direction: '90deg',
         tabs_weight_checked: '500',
         tabs_size_checked: 14,
@@ -114,8 +120,9 @@ const defaultArticleTabs: DefaultArticleTabs = {
         },
         content_spacing: 10, // 内容间距
         article_spacing: 10, // 文章间距
-        article_width: 155, // 文章宽度
-        article_height: 155, // 文章宽度
+        article_height: 155, // 文章高度
+        interval_time: 2, //滚动时间
+        is_roll: 1, // 是否轮播
         common_style: { ...defaultCommon, padding: 10, padding_top: 10, padding_left: 10, padding_right: 10, padding_bottom: 10 },
     },
 };
diff --git a/src/views/layout/components/main/default/shop-list.ts b/src/views/layout/components/main/default/shop-list.ts
index e42b647f..5003b51d 100644
--- a/src/views/layout/components/main/default/shop-list.ts
+++ b/src/views/layout/components/main/default/shop-list.ts
@@ -3,7 +3,7 @@ interface DefaultProductList {
     content: {
         theme: string;
         data_type: string;
-        single_line_number: number;
+        carousel_col: number;
         category: string[];
         data_ids: string[];
         product_show_list: string[];
@@ -54,7 +54,7 @@ const defaultProductList: DefaultProductList = {
     content: {
         theme: '0',
         data_type: '0',
-        single_line_number: 3,
+        carousel_col: 3,
         product_show_list: [],
         data_list: [],
         category: [],
diff --git a/src/views/layout/components/main/default/shop-tabs.ts b/src/views/layout/components/main/default/shop-tabs.ts
index 1f835574..0282b5c9 100644
--- a/src/views/layout/components/main/default/shop-tabs.ts
+++ b/src/views/layout/components/main/default/shop-tabs.ts
@@ -17,7 +17,7 @@ interface DefaultProductList {
         tabs_theme: string;
         tabs_top_up: boolean;
         theme: string;
-        single_line_number: number,
+        carousel_col: number;
         tabs_list: articleTabsList[];
         is_show: string[];
         is_shop_show: boolean;
@@ -31,20 +31,20 @@ interface DefaultProductList {
     style: {
         tabs_checked: color_list[];
         tabs_direction: string;
-        tabs_weight_checked: string,
-        tabs_size_checked: number,
-        tabs_color_checked: string,
-        tabs_weight: string,
-        tabs_size: number,
-        tabs_color: string,
+        tabs_weight_checked: string;
+        tabs_size_checked: number;
+        tabs_color_checked: string;
+        tabs_weight: string;
+        tabs_size: number;
+        tabs_color: string;
         tabs_spacing: number;
         shop_padding: paddingStyle;
         shop_img_radius: radiusStyle;
         shop_radius: radiusStyle;
         content_outer_spacing: number;
         content_outer_height: number;
-        is_roll: boolean,
-        interval_time: number,
+        is_roll: boolean;
+        interval_time: number;
         content_spacing: number;
         shop_title_typeface: string;
         shop_title_size: number;
@@ -58,10 +58,10 @@ interface DefaultProductList {
         shop_score_typeface: string;
         shop_score_size: number;
         shop_score_color: string;
-        shop_button_typeface:string;
+        shop_button_typeface: string;
         shop_button_size: number;
         shop_button_color: color_list[];
-        shop_button_text_color: string,
+        shop_button_text_color: string;
         shop_icon_size: number;
         shop_icon_color: string;
         common_style: object;
@@ -72,10 +72,10 @@ const defaultProductList: DefaultProductList = {
         tabs_theme: '0',
         tabs_top_up: false,
         theme: '0',
-        single_line_number: 3,
+        carousel_col: 3,
         tabs_list: [
-            { id: '1', title: '热门推荐', img: [], desc: '简介', data_type: '0', category: [], data_ids: [], number: 4,  sort: '0', sort_rules: '0', data_list: [] },
-            { id: '2', title: '测试一', img: [], desc: '简介', data_type: '0', category: [], data_ids: [], number: 4,  sort: '0', sort_rules: '0', data_list: [] },
+            { id: '1', title: '热门推荐', img: [], desc: '简介', data_type: '0', category: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] },
+            { id: '2', title: '测试一', img: [], desc: '简介', data_type: '0', category: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] },
             { id: '3', title: '测试二', img: [], desc: '简介', data_type: '0', category: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] },
             { id: '4', title: '测试三', img: [], desc: '简介', data_type: '0', category: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] },
         ],
@@ -89,7 +89,10 @@ const defaultProductList: DefaultProductList = {
         shop_button_size: '1',
     },
     style: {
-        tabs_checked: [{ color: '#FF2222', color_percentage: undefined }, { color: '#FF9898', color_percentage: undefined }],
+        tabs_checked: [
+            { color: '#FF2222', color_percentage: undefined },
+            { color: '#FF9898', color_percentage: undefined },
+        ],
         tabs_direction: '90deg',
         tabs_weight_checked: '500',
         tabs_size_checked: 14,
@@ -99,10 +102,10 @@ const defaultProductList: DefaultProductList = {
         tabs_color: 'rgba(51,51,51,1)',
         tabs_spacing: 20,
         shop_padding: {
-            padding: 10, 
-            padding_top: 10, 
-            padding_bottom: 10, 
-            padding_left: 10, 
+            padding: 10,
+            padding_top: 10,
+            padding_bottom: 10,
+            padding_left: 10,
             padding_right: 10,
         },
         shop_img_radius: {
@@ -125,32 +128,32 @@ const defaultProductList: DefaultProductList = {
         is_roll: true,
         interval_time: 2,
         shop_title_typeface: '500',
-        shop_title_size: 14,    
-        shop_title_color: "#333333",
+        shop_title_size: 14,
+        shop_title_color: '#333333',
         shop_price_typeface: '500',
         shop_price_size: 18,
-        shop_price_color: "#EA3323;",
+        shop_price_color: '#EA3323;',
         shop_sold_number_typeface: '400',
         shop_sold_number_size: 10,
-        shop_sold_number_color: "#999999",
+        shop_sold_number_color: '#999999',
         shop_score_typeface: '400',
         shop_score_size: 10,
-        shop_score_color: "#999999",
-        shop_button_typeface:'400',
+        shop_score_color: '#999999',
+        shop_button_typeface: '400',
         shop_button_size: 12,
         shop_button_color: [
             {
                 color: '#FF3D53',
-                color_percentage: undefined
+                color_percentage: undefined,
             },
             {
                 color: '#D73A3A',
-                color_percentage: undefined
-            }
+                color_percentage: undefined,
+            },
         ],
         shop_button_text_color: '#fff',
         shop_icon_size: 10,
-        shop_icon_color: "#fff",
+        shop_icon_color: '#fff',
         common_style: { ...defaultCommon, padding: 10, padding_top: 10, padding_bottom: 10, padding_left: 10, padding_right: 10 },
     },
 };

From f5b7584e972dd4b48c46875465dc3731337df33b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 2 Sep 2024 17:24:57 +0800
Subject: [PATCH 2/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-article-list/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue
index 69e6a707..cdbe0f84 100644
--- a/src/components/model-article-list/index.vue
+++ b/src/components/model-article-list/index.vue
@@ -252,7 +252,6 @@ const article_carousel_list = computed(() => {
     if (cloneList.length > 0) {
         // 每页显示的数量
         const num = Number(carousel_col.value) + 1;
-        console.log(num);
         // 存储数据显示
         let nav_list: ArticleCarouselList[] = [];
         // 拆分的数量

From c232cd698d49b043763e4e39ad97d76c3804824d Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 2 Sep 2024 18:16:16 +0800
Subject: [PATCH 3/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                      |  17 +++-
 src/views/layout/components/main/index.vue | 101 ++++++++++++---------
 src/views/layout/index.vue                 |  37 ++++++--
 3 files changed, 98 insertions(+), 57 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8913256a..b9e0292a 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -187,12 +187,21 @@ p {
 }
 // 链接弹窗表格用到  ------ end
 
-
-.el-color-predefine__colors .el-color-predefine__color-selector{
+.el-color-predefine__colors .el-color-predefine__color-selector {
     box-shadow: 0 0.2rem 0.8rem rgba(50, 55, 58, 0.1);
 }
 .el-color-picker .el-color-picker__trigger .el-color-picker__color {
     background-image: linear-gradient(45deg, #ccc 25%, transparent 25%), linear-gradient(135deg, #ccc 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #ccc 75%), linear-gradient(135deg, transparent 75%, #ccc 75%);
     background-size: 12px 12px;
-    background-position: 0 0, 6px 0, 6px -6px, 0 6px;
-}
\ No newline at end of file
+    background-position:
+        0 0,
+        6px 0,
+        6px -6px,
+        0 6px;
+}
+
+// 全屏轮播大小调整
+.loading-custom {
+    --el-loading-spinner-size: 13rem;
+    --el-loading-fullscreen-spinner-size: 13rem;
+}
diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue
index 68713c91..80876624 100644
--- a/src/views/layout/components/main/index.vue
+++ b/src/views/layout/components/main/index.vue
@@ -2,9 +2,9 @@
     <!-- 左侧模块 -->
     <div class="siderbar flex-col">
         <el-collapse v-model="activeNames">
-            <el-collapse-item v-for="(com, i) in components" :key="i" :title="com.title" :name="com.key">
-                <VueDraggable v-model="com.item" :animation="500" ghost-class="ghost" :group="{ name: 'people', pull: 'clone', put: false }" class="component flex-row flex-wrap" :clone="clone_item_com_data" :on-start="onStart" :sort="false" :force-fallback="true">
-                    <div v-for="item in com.item" :key="item.key" class="item">
+            <el-collapse-item v-for="(com, i) in components" :key="i" :title="com.name" :name="com.key">
+                <VueDraggable v-model="com.data" :animation="500" ghost-class="ghost" :group="{ name: 'people', pull: 'clone', put: false }" class="component flex-row flex-wrap" :clone="clone_item_com_data" :on-start="onStart" :sort="false" :force-fallback="true">
+                    <div v-for="item in com.data" :key="item.key" class="item">
                         <div class="main-border siderbar-hidden main-show tc">释放鼠标将组件添加到此处</div>
                         <div class="siderbar-show main-hidden flex-col jc-c align-c gap-4">
                             <img class="img radius-xs" :src="url_computer(item.key)" />
@@ -165,8 +165,9 @@ import { background_computer, get_math, gradient_computer, padding_computer, rad
 import { cloneDeep } from 'lodash';
 import { SortableEvent, VueDraggable } from 'vue-draggable-plus';
 import defaultSettings from './index';
-import { footerNavCounterStore } from '@/store';
+import { footerNavCounterStore, commonStore } from '@/store';
 const footer_nav_counter_store = footerNavCounterStore();
+const common_store = commonStore();
 const app = getCurrentInstance();
 import { isEmpty } from 'lodash';
 const props = defineProps({
@@ -252,45 +253,50 @@ watch(
 
 // 父组件调用的方法
 const emits = defineEmits(['rightUpdate']);
-const activeNames = reactive(['1', '2', '3']);
-const components = reactive([
-    {
-        title: '基础组件',
-        key: '1',
-        item: [
-            { key: 'carousel', name: '轮播图' },
-            { key: 'search', name: '搜索框' },
-            { key: 'nav-group', name: '导航组' },
-            { key: 'notice', name: '公告' },
-            { key: 'video', name: '视频' },
-            { key: 'user-info', name: '用户信息' },
-            { key: 'tabs', name: '选项卡' },
-            { key: 'article-tabs', name: '文章选项卡' },
-            { key: 'shop-tabs', name: '商品选项卡' },
-            { key: 'article-list', name: '文章列表' },
-            { key: 'shop-list', name: '商品列表' },
-            { key: 'img-magic', name: '图片魔方' },
-            { key: 'data-magic', name: '数据魔方' },
-            { key: 'hot-zone', name: '热区' },
-            { key: 'custom', name: '自定义' },
-        ],
-    },
-    {
-        title: '营销组件',
-        key: '2',
-        item: [{ key: 'coupon', name: '优惠券' }],
-    },
-    {
-        title: '工具组件',
-        key: '3',
-        item: [
-            { key: 'float-window', name: '悬浮按钮' },
-            { key: 'text-title', name: '文本标题' },
-            { key: 'auxiliary-blank', name: '辅助空白' },
-            { key: 'row-line', name: '横线' },
-            { key: 'rich-text', name: '富文本' },
-        ],
-    },
+const activeNames = reactive(['base', 'plugins', 'tool']);
+interface componentsData {
+    name: string;
+    key: string;
+    data: componentsData[];
+}
+const components = ref<componentsData[]>([
+    // {
+    //     name: '基础组件',
+    //     key: 'base',
+    //     data: [
+    //         { key: 'carousel', name: '轮播图' },
+    //         { key: 'search', name: '搜索框' },
+    //         { key: 'nav-group', name: '导航组' },
+    //         { key: 'notice', name: '公告' },
+    //         { key: 'video', name: '视频' },
+    //         { key: 'user-info', name: '用户信息' },
+    //         { key: 'tabs', name: '选项卡' },
+    //         { key: 'article-tabs', name: '文章选项卡' },
+    //         { key: 'shop-tabs', name: '商品选项卡' },
+    //         { key: 'article-list', name: '文章列表' },
+    //         { key: 'shop-list', name: '商品列表' },
+    //         { key: 'img-magic', name: '图片魔方' },
+    //         { key: 'data-magic', name: '数据魔方' },
+    //         { key: 'hot-zone', name: '热区' },
+    //         { key: 'custom', name: '自定义' },
+    //     ],
+    // },
+    // {
+    //     name: '营销组件',
+    //     key: 'plugins',
+    //     data: [{ key: 'coupon', name: '优惠券' }],
+    // },
+    // {
+    //     name: '工具组件',
+    //     key: 'tool',
+    //     data: [
+    //         { key: 'float-window', name: '悬浮按钮' },
+    //         { key: 'text-title', name: '文本标题' },
+    //         { key: 'auxiliary-blank', name: '辅助空白' },
+    //         { key: 'row-line', name: '横线' },
+    //         { key: 'rich-text', name: '富文本' },
+    //     ],
+    // },
 ]);
 const url_computer = (name: string) => {
     const new_url = ref(new URL(`../../../../assets/images/layout/siderbar/${name}.png`, import.meta.url).href).value;
@@ -549,6 +555,15 @@ const scroll = () => {
 // 在组件挂载时默认执行
 onMounted(() => {
     page_settings();
+    nextTick(() => {
+        const interval = setInterval(() => {
+            // 获取分类
+            if (common_store.common.module_list.length > 0) {
+                components.value = common_store.common.module_list;
+                clearInterval(interval);
+            }
+        }, 1000);
+    });
 });
 //页面设置
 const page_settings = () => {
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 43efe0a7..aab9c03c 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-wrapper no-copy">
+    <div v-loading.fullscreen.lock="loading" class="app-wrapper no-copy" element-loading-background="rgba(255,255,255,1)" element-loading-custom-class="loading-custom">
         <template v-if="!is_empty">
             <navbar v-model="form.model" @preview="preview" @save="save" @save-close="save_close" />
             <div class="app-wrapper-content flex-row">
@@ -64,6 +64,7 @@ const form = ref<diy_data_item>({
 const diy_data_item = ref({});
 
 const key = ref('');
+const api_count = ref(0);
 
 const right_update = (item: any, diy: [Array<any>], header: headerAndFooter, footer: headerAndFooter) => {
     diy_data_item.value = item;
@@ -90,15 +91,20 @@ const init = () => {
         if (html_index !== -1) {
             new_data.id = new_data.id.substring(0, html_index);
         }
-    }
-    if (new_data.id) {
-        DiyAPI.getInit(new_data).then((res: any) => {
-            if (res.data) {
-                form.value = form_data_transfor_diy_data(res.data);
-            } else {
-                is_empty.value = true;
-            }
-        });
+        if (new_data.id) {
+            DiyAPI.getInit(new_data).then((res: any) => {
+                if (res.data) {
+                    form.value = form_data_transfor_diy_data(res.data);
+                    api_count.value += 1;
+                    loading_event(api_count.value);
+                } else {
+                    is_empty.value = true;
+                }
+            });
+        }
+    } else {
+        api_count.value = 1;
+        loading_event(api_count.value);
     }
 };
 
@@ -113,8 +119,19 @@ const common_init = () => {
         // module_list ---- 模块列表
         //page_link_list ---- 页面链接
         common_store.set_common(res.data);
+        api_count.value += 1;
+        loading_event(api_count.value);
     });
 };
+// 加载动画
+const loading = ref(true);
+const loading_event = (count: number) => {
+    if (count == 2) {
+        setTimeout(() => {
+            loading.value = false;
+        }, 500);
+    }
+};
 //#endregion 页面初始化数据 ---------------------end
 
 //#region 顶部导航回调方法 ---------------------start

From f6bb52d6e459e1bad4d57f68f010abab4ba97ec6 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 2 Sep 2024 19:04:18 +0800
Subject: [PATCH 4/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-article-list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue
index cdbe0f84..af21cf39 100644
--- a/src/components/model-article-list/index.vue
+++ b/src/components/model-article-list/index.vue
@@ -213,7 +213,7 @@ watch(
         } else if (article_theme.value == '4') {
             // 更新轮播图的key，确保更换时能重新更新轮播图
             carousel_col.value = new_content.carousel_col || '1';
-            carousel_key.value = get_math();
+            carousel_key.value = new_style.interval_time + new_style.is_roll;
             // 滚动时间
             interval_time.value = (new_style.interval_time || 2) * 1000;
             // 是否滚动修改

From 4a8228ce6c606c74c34456cc1e13f82e72d98033 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 3 Sep 2024 10:01:37 +0800
Subject: [PATCH 5/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/upload/index.vue              | 2 +-
 src/components/common/upload/transform-category.vue | 6 +++++-
 src/components/model-article-tabs/index.vue         | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index e6d70262..50e65e42 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -54,7 +54,7 @@
                             <el-button @click="mult_del_event">删除{{ upload_type_name }}</el-button>
                             <!-- <el-cascader :show-all-levels="false" clearable></el-cascader> -->
                             <div class="right-classify ml-12">
-                                <transform-category :data="type_data_list" :check-img-ids="check_img_ids" :placeholder="upload_type_name + '移动至'" @call-back="transform_category_event"></transform-category>
+                                <transform-category :data="type_data_list" :check-img-ids="check_img_ids" :type="upload_type_name" :placeholder="upload_type_name + '移动至'" @call-back="transform_category_event"></transform-category>
                             </div>
                         </div>
                         <div class="right-search">
diff --git a/src/components/common/upload/transform-category.vue b/src/components/common/upload/transform-category.vue
index de7b3d9f..eceed778 100644
--- a/src/components/common/upload/transform-category.vue
+++ b/src/components/common/upload/transform-category.vue
@@ -38,6 +38,10 @@ const props = defineProps({
         type: String,
         default: () => '',
     },
+    type: {
+        type: String,
+        default: '图片', // tree/list
+    },
 });
 interface cascaderData {
     value: string;
@@ -153,7 +157,7 @@ const confirm = () => {
         });
     } else {
         if (!props.checkImgIds) {
-            ElMessage.warning('请先选择图片!');
+            ElMessage.warning('请先选择' + props.type + '!');
         }
         if (!category_id.value) {
             ElMessage.warning('请先选择分组!');
diff --git a/src/components/model-article-tabs/index.vue b/src/components/model-article-tabs/index.vue
index 25e30508..8ead6ff1 100644
--- a/src/components/model-article-tabs/index.vue
+++ b/src/components/model-article-tabs/index.vue
@@ -24,6 +24,7 @@ watch(
         new_data.content.theme = new_data.content.article_theme;
         new_data.content.data_type = new_data.content.tabs_list[0].data_type;
         new_data.content.category = new_data.content.tabs_list[0].category;
+        new_data.content.carousel_col = new_data.content.article_carousel_col;
         new_data.content.data_list = new_data.content.tabs_list[0].data_list;
         new_data.content.data_ids = new_data.content.tabs_list[0].data_ids;
         new_data.content.number = new_data.content.tabs_list[0].number;

From b7baff7392561fe48b7c90d7b2b3feeaece82e20 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 3 Sep 2024 10:31:13 +0800
Subject: [PATCH 6/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts          |  21 ++--
 src/views/error-page/401.vue | 105 ----------------
 src/views/error-page/404.vue | 237 -----------------------------------
 src/views/layout/index.vue   |   1 +
 4 files changed, 11 insertions(+), 353 deletions(-)
 delete mode 100644 src/views/error-page/401.vue
 delete mode 100644 src/views/error-page/404.vue

diff --git a/src/router/index.ts b/src/router/index.ts
index a0dbdaca..7d195ce2 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -24,16 +24,6 @@ export const constantRoutes: RouteRecordRaw[] = [
                 name: 'Dashboard',
                 meta: { title: 'dashboard', icon: 'homepage', affix: true },
             },
-            {
-                path: '401',
-                component: () => import('@/views/error-page/401.vue'),
-                meta: { hidden: true },
-            },
-            {
-                path: '404',
-                component: () => import('@/views/error-page/404.vue'),
-                meta: { hidden: true },
-            },
         ],
     },
 ];
@@ -52,7 +42,16 @@ const router = createRouter({
  * 重置路由
  */
 export function resetRouter() {
-    router.replace({ path: '/login' });
+    router.replace({ path: '/dashboard' });
 }
+// 重定向到首页的守卫
+router.beforeEach((to, from, next) => {
+    if (to.matched.length === 0) {
+        //如果未匹配到路由
+        from.name ? next({ name: from.name }) : next({ path: '/' });
+    } else {
+        next();
+    }
+});
 
 export default router;
diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue
deleted file mode 100644
index e34b93d8..00000000
--- a/src/views/error-page/401.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
-<script lang="ts">
-export default {
-    name: 'Page401',
-};
-</script>
-
-<script setup lang="ts">
-import { reactive, toRefs } from 'vue';
-import { useRouter } from 'vue-router';
-
-const state = reactive({
-    errGif: `../../assets/401_images/401.gif`,
-    ewizardClap: 'https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646',
-    dialogVisible: false,
-});
-
-const { errGif, ewizardClap, dialogVisible } = toRefs(state);
-
-const router = useRouter();
-
-function back() {
-    router.back();
-}
-</script>
-
-<template>
-    <div class="errPage-container">
-        <el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back"> 返回 </el-button>
-        <el-row>
-            <el-col :span="12">
-                <h1 class="text-jumbo text-ginormous">Oops!</h1>
-                gif来源<a href="https://zh.airbnb.com/" target="_blank">airbnb</a> 页面
-                <h2>你没有权限去该页面</h2>
-                <h6>如有不满请联系你领导</h6>
-                <ul class="list-unstyled">
-                    <li>或者你可以去:</li>
-                    <li class="link-type">
-                        <router-link to="/dashboard"> 回首页 </router-link>
-                    </li>
-                    <li class="link-type">
-                        <a href="https://www.taobao.com/">随便看看</a>
-                    </li>
-                    <li>
-                        <a href="#" @click.prevent="dialogVisible = true">点我看图</a>
-                    </li>
-                </ul>
-            </el-col>
-            <el-col :span="12">
-                <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream." />
-            </el-col>
-        </el-row>
-        <el-dialog v-model="dialogVisible" title="随便看">
-            <img :src="ewizardClap" class="pan-img" />
-        </el-dialog>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.errPage-container {
-    width: 800px;
-    max-width: 100%;
-    margin: 100px auto;
-
-    .pan-back-btn {
-        color: #fff;
-        background: #008489;
-        border: none !important;
-    }
-
-    .pan-gif {
-        display: block;
-        margin: 0 auto;
-    }
-
-    .pan-img {
-        display: block;
-        width: 100%;
-        margin: 0 auto;
-    }
-
-    .text-jumbo {
-        font-size: 60px;
-        font-weight: 700;
-        color: #484848;
-    }
-
-    .list-unstyled {
-        font-size: 14px;
-
-        li {
-            padding-bottom: 5px;
-        }
-
-        a {
-            color: #008489;
-            text-decoration: none;
-
-            &:hover {
-                text-decoration: underline;
-            }
-        }
-    }
-}
-</style>
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
deleted file mode 100644
index b95dab94..00000000
--- a/src/views/error-page/404.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
-<script lang="ts">
-export default {
-    name: 'Page404',
-};
-</script>
-
-<script setup lang="ts">
-function message() {
-    return 'The webmaster said that you can not enter this page...';
-}
-</script>
-
-<template>
-    <div class="wscn-http404-container"></div>
-</template>
-
-<style lang="scss" scoped>
-.wscn-http404-container {
-    position: absolute;
-    top: 40%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
-
-.wscn-http404 {
-    position: relative;
-    width: 1200px;
-    padding: 0 50px;
-    overflow: hidden;
-
-    .pic-404 {
-        position: relative;
-        float: left;
-        width: 600px;
-        overflow: hidden;
-
-        &__parent {
-            width: 100%;
-        }
-
-        &__child {
-            position: absolute;
-
-            &.left {
-                top: 17px;
-                left: 220px;
-                width: 80px;
-                opacity: 0;
-                animation-name: cloudLeft;
-                animation-duration: 2s;
-                animation-timing-function: linear;
-                animation-delay: 1s;
-                animation-fill-mode: forwards;
-            }
-
-            &.mid {
-                top: 10px;
-                left: 420px;
-                width: 46px;
-                opacity: 0;
-                animation-name: cloudMid;
-                animation-duration: 2s;
-                animation-timing-function: linear;
-                animation-delay: 1.2s;
-                animation-fill-mode: forwards;
-            }
-
-            &.right {
-                top: 100px;
-                left: 500px;
-                width: 62px;
-                opacity: 0;
-                animation-name: cloudRight;
-                animation-duration: 2s;
-                animation-timing-function: linear;
-                animation-delay: 1s;
-                animation-fill-mode: forwards;
-            }
-
-            @keyframes cloudLeft {
-                0% {
-                    top: 17px;
-                    left: 220px;
-                    opacity: 0;
-                }
-
-                20% {
-                    top: 33px;
-                    left: 188px;
-                    opacity: 1;
-                }
-
-                80% {
-                    top: 81px;
-                    left: 92px;
-                    opacity: 1;
-                }
-
-                100% {
-                    top: 97px;
-                    left: 60px;
-                    opacity: 0;
-                }
-            }
-
-            @keyframes cloudMid {
-                0% {
-                    top: 10px;
-                    left: 420px;
-                    opacity: 0;
-                }
-
-                20% {
-                    top: 40px;
-                    left: 360px;
-                    opacity: 1;
-                }
-
-                70% {
-                    top: 130px;
-                    left: 180px;
-                    opacity: 1;
-                }
-
-                100% {
-                    top: 160px;
-                    left: 120px;
-                    opacity: 0;
-                }
-            }
-
-            @keyframes cloudRight {
-                0% {
-                    top: 100px;
-                    left: 500px;
-                    opacity: 0;
-                }
-
-                20% {
-                    top: 120px;
-                    left: 460px;
-                    opacity: 1;
-                }
-
-                80% {
-                    top: 180px;
-                    left: 340px;
-                    opacity: 1;
-                }
-
-                100% {
-                    top: 200px;
-                    left: 300px;
-                    opacity: 0;
-                }
-            }
-        }
-    }
-
-    .bullshit {
-        position: relative;
-        float: left;
-        width: 300px;
-        padding: 30px 0;
-        overflow: hidden;
-
-        &__oops {
-            margin-bottom: 20px;
-            font-size: 32px;
-            font-weight: bold;
-            line-height: 40px;
-            color: #1482f0;
-            opacity: 0;
-            animation-name: slideUp;
-            animation-duration: 0.5s;
-            animation-fill-mode: forwards;
-        }
-
-        &__headline {
-            margin-bottom: 10px;
-            font-size: 20px;
-            font-weight: bold;
-            line-height: 24px;
-            color: #222;
-            opacity: 0;
-            animation-name: slideUp;
-            animation-duration: 0.5s;
-            animation-delay: 0.1s;
-            animation-fill-mode: forwards;
-        }
-
-        &__info {
-            margin-bottom: 30px;
-            font-size: 13px;
-            line-height: 21px;
-            color: grey;
-            opacity: 0;
-            animation-name: slideUp;
-            animation-duration: 0.5s;
-            animation-delay: 0.2s;
-            animation-fill-mode: forwards;
-        }
-
-        &__return-home {
-            display: block;
-            float: left;
-            width: 110px;
-            height: 36px;
-            font-size: 14px;
-            line-height: 36px;
-            color: #fff;
-            text-align: center;
-            cursor: pointer;
-            background: #1482f0;
-            border-radius: 100px;
-            opacity: 0;
-            animation-name: slideUp;
-            animation-duration: 0.5s;
-            animation-delay: 0.3s;
-            animation-fill-mode: forwards;
-        }
-
-        @keyframes slideUp {
-            0% {
-                opacity: 0;
-                transform: translateY(60px);
-            }
-
-            100% {
-                opacity: 1;
-                transform: translateY(0);
-            }
-        }
-    }
-}
-</style>
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index aab9c03c..511a0ae0 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -143,6 +143,7 @@ const save = () => {
 };
 const save_close = () => {
     formmat_form_data(form.value);
+    window.close();
 };
 const formmat_form_data = (data: diy_data_item) => {
     const clone_form = cloneDeep(data);

From 090960f09530257d8fdc70413d4efa874e52f2f1 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 3 Sep 2024 10:53:24 +0800
Subject: [PATCH 7/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/layout/main/foot/cart-checked.png  | Bin 964 -> 0 bytes
 src/assets/images/layout/main/foot/cart.png   | Bin 633 -> 0 bytes
 .../layout/main/foot/category-checked.png     | Bin 877 -> 0 bytes
 .../images/layout/main/foot/category.png      | Bin 468 -> 0 bytes
 .../images/layout/main/foot/home-checked.png  | Bin 734 -> 0 bytes
 src/assets/images/layout/main/foot/home.png   | Bin 604 -> 0 bytes
 .../images/layout/main/foot/user-checked.png  | Bin 767 -> 0 bytes
 src/assets/images/layout/main/foot/user.png   | Bin 593 -> 0 bytes
 src/views/layout/components/navbar/index.vue  |  44 +++++++++---------
 src/views/layout/index.vue                    |  12 +++--
 10 files changed, 31 insertions(+), 25 deletions(-)
 delete mode 100644 src/assets/images/layout/main/foot/cart-checked.png
 delete mode 100644 src/assets/images/layout/main/foot/cart.png
 delete mode 100644 src/assets/images/layout/main/foot/category-checked.png
 delete mode 100644 src/assets/images/layout/main/foot/category.png
 delete mode 100644 src/assets/images/layout/main/foot/home-checked.png
 delete mode 100644 src/assets/images/layout/main/foot/home.png
 delete mode 100644 src/assets/images/layout/main/foot/user-checked.png
 delete mode 100644 src/assets/images/layout/main/foot/user.png

diff --git a/src/assets/images/layout/main/foot/cart-checked.png b/src/assets/images/layout/main/foot/cart-checked.png
deleted file mode 100644
index a9c7315a97f2403ae46381f7ee1ea53cdb71606b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 964
zcmWlXdrXs87{<$hfJlLk2J8eGOt}aMDXc(8Tc9m%ftKD^di_X|Aj2#eqz2g_o8TqI
zIB_Ko<>E*ta@m*~x49`Y0YO{}%8VK%v16bN+>l)$B+tI@k8{p@{&>#wd*1gPS1Kg*
zfVTo@G#Xtd6{*QHiCX^N<ep%>lt!a@H7bj=V)6=(9Pfz1S0k|i5*@;Fp)ny=3R4-R
z`>0xJL=X>KxkxPporj=o=&dl=pfDg*fZbB~WI|^~S`l{UgQtesisBLkaAC9|ga@4o
zsYMX!sDi;qh62%INc2z}5z0qQK5PV7d9aouN(jA~(sGpu7Elat3ZN#yQBoG^3Mfk`
zPAh?A86`}Vfv=)0d@~``z+?kk4h9b~V#G?2t%6jKcjYLtU~4u4vymjD-pNygAiym~
zasfj4R5ZIC!91{wVI(NX@O&_NC@+Ulh438g5Mp~C*hNSwq$C10@-&o-R7V9Vcpppw
z<OU>2DO0f)JQc-H#w4vtV6rD-9ZY1$EU?<Z<RkDs_-DarAz}8ruO236K-8!e8rqTB
zd-eWt7t4cue{A@u$|%mth~L~?UtM}J|Mc;#;p^8fcb#>)K5sqgJl@n;{XwNoElN$<
z9mCjI|L@<w*Op%_K7T$pGwq(der>3~yZel@sovozwVDkYRcdlHiy6vQdYZ|(x5`Ah
z+RVGN?!6z5<V1}Bg&zANv9fX^&Ear#Pi?ag2O8G~UX2XOUsbg8=UWTw*5}(f3CzBq
zn`_&DKa|zhex;&i;5_}TlXYcvdGAb^yGn4L|1cu0@D_2n^U;CYeODh>?P+`B>CIUQ
z{Pv(tseiih=l;^Fpsz*}YDRotHnX@pUMDW4-x>32cstnQW^{UMvl)bU5_dgpZZyu6
zI~vWo9hPJNI4asRd8+GsZF)-8c5TFXPf96gI;2JN<vnf0=%t>eoZlLp%4#1|W_<X;
zhn}GhXL0B3)MwSRtzX2lZ`5fo=a2mo)!%zl^nlki9?7n4u-~3r9QSNt3F=FCou2-t
zNfLL;$RBdCr(-(G*R=I(7yA9;rzZPO9|^BGX-IM%+qLQzHx7QPytp8L#<|0)Z@WL%
zn50?u8~D|ypt9!vO?8VfqibYg+YIZ8b8L_0>j^9U<sXqh)lD4z;lV~_$ATl*J^8w&
zZvN0Y&v&}vHM8rkHF5meqp|}`pU8=_KCd&gPHW>amf*(G3;*~DvAN|9USBWy6=*WC
KLNu61eDXi4X48NG

diff --git a/src/assets/images/layout/main/foot/cart.png b/src/assets/images/layout/main/foot/cart.png
deleted file mode 100644
index 6782acce5ae03591b468e5ac8d659314d5fbd2f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 633
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv81St^l79S0HVI1kB9LjKRRv)YQ__
z62dkI0|*;PA}Kd<1_Ov7oP?+ZDgzn<G!V#u>w+^Nf^aU7@vHNi9MCnoB|(0{42wjz
zR@!`<t}F2Cjhxhnn|q2f(-OJaUOc{d>cGS%Uk{a|u8!sp)<g$xYzyby{N;%k0|R5B
zr;B5V#p$b)Zx$^!5MW?0U?~3m=$QK><=IRA|NmZgIxM2urR(~a%U42HFOfWZB7Z6O
z>`=RKy~Zy#!FDEkD#f`Q*9+*S>WS5ynO4sF@Nb`@aA~!GcbuWp$*{KPr4LREGQabh
z9R5LR)7G{WafZ_h`#T#?a3vUet(&^$Ghg14lk1a~wI0o>l)S)WJUjpAv<t-_->;k%
zG@1YV1Ac#-UC#tEKK+yXG41l@Td)3j+|#<*(roQ>=RvKPU0}xDJ-#P3UuG~TeD3%&
zUGA&6-pv5J`tp5?-KQ3|lxZA)u+p?5X>r#5QxgJgb9Tmksd?7_tK-YjsP0bVlv_Hx
zp3VKc%J=gP$J`C;3yj|6aE01<9h020@x>9*9rpsOKAGz`9uXHV;|-Xz=Gx~q*^}8A
zrWTo&%{@Kg(c{w@tMsfFernqEk?)i8Y5#h0`Nb#howSepzSAdp`uY0Tj%t^48dm8u
y9+*Gvd&6fFeU@!Lm({-h_mkH<8dhgo&nQ)7E>nNwd<-zw7(8A5T-G@yGywomZUTn@

diff --git a/src/assets/images/layout/main/foot/category-checked.png b/src/assets/images/layout/main/foot/category-checked.png
deleted file mode 100644
index c0a5868b31db41da6021674af692783a2001f778..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 877
zcmW+!4NOy47=2J6wUO9pv`S&Zs_m$QQJJAFKY6V!ZG}Q#dF7|{7u*snK{OyT&1P0o
zWSImE88FRUqh=dp4e_r~2XVN#$Wm7rZZ2C{Shs9yWFbtDF*$pWlYHlX_kLf_J@?D)
zG?nR+c_}=CAd(GwjhR_rWrNFMIMX_qOAv7aQz@-ww#YHU_$EqgAW%VH4V4vK1;je+
zD@XPLIGhj{LurDn6gDRkmDpQ?B8qKzy$sxZq^VJ5gQXUE<&YXsNFkqs(*>=CEyc;%
z++2%Ig^0_8)qx}hTyCgnq-)tKSpmBfE*C0oNG<?Jj%qu2O4QXsqytBR0tym6XdCz>
z+g9sh^_dgKl0=6D1rpXpR1~x{()MFZ5maXEE=Gn1hDz2CBg-#@yd2v|SnVjS!VVQE
zE6Qs?*RtlB>ljy@Jod4fdPw!dijEV^Xf(~{vI-(S(Pm5KJrCLKtBWCTTU$*@37I8a
zSz20JT%2bRV=xuD&EU)6Wd>fa!{M-4NHQyHYAO;52AvMc<S7F)@~;dU6)pevL2pOn
zL=K;P?RrMsfkXbt*z!vae`Q}H<F7XluOZ)4Kk~~8N4jt@b84}oZcmT<z0O}#n@^6-
z-mgjN{^zGIQ`CE2enc=d+x};}xl=&@5P$eqyXYc4E_$p_3%;G%Ivth0(Y9yw`1TKW
z-ac})_3Xm<6J<c;%b&Q%`8{oZN!Dm79@)B&8c6Klx~%^Au-i8GY4x3xSAFldbS!+b
z&c_F~aLyd^2xH$L8?6j<%EnU&pC@v$?!us~;Zei9`SioT+ZFqz^<7F~!RAeu!_vOp
z&nn`%<107jnsQP%`fkdO`U*`$;nmYIr*&hJSLRiU#52F0+quTE6{qvhd^j^e`I~ke
z^nPyCKK$8rVyJQ@DZDDa+Cybun;X^rJJIAF4irr)Tim2Wc-C`C>I;2T(t1BCyeqME
zZE$%WC&a$kEaCAV%xt@R<*hMVlABB9hVG06GU}u5|NQHGC8OThk~90H=@_9fK6RgZ
z7Ow93=0{#@)pkMOJFf(%qkC`I5_V0CQwK%M-68IaM=$%=zIOIc4hUYzo_2eBCjMyD
oKM%)trQeGg{pwqNiT#c>qPKU0TK(B~H1jzKgSJc)P`lp!9}yy+iU0rr

diff --git a/src/assets/images/layout/main/foot/category.png b/src/assets/images/layout/main/foot/category.png
deleted file mode 100644
index dab409be5fd33e39bf4497e90ad8d55b68af2a31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0HTy2F5U8YikQ+!Ucg0
zQ&UqQX=Y{yQ37N`6ad9xnxJ%+A#VuKM9GpMzhH(K$FIBQas7O7aA}3Ryj1GDD;GC5
zd+WXoJu7-NjDdks#?!?y#NzbTsi(I!EAY4~D=0ASyFKs!|BKphn_d`9UU%DAG0#be
zmHF=mxr5dWpD!4`Zj)^I{IKx5tn4bEe+zP?iXNX8KOppLpS;P2TTO4cUOaS3WGwht
zXJMm!{C4-o;=Ug(kG+@#R_EGov1RAY*Y0-6I45^{t%~cCyp`fV(sqA$;=3$Z`aWgO
zEmP?il}@4QN7u0Ldtj6Npp(<0gD)Y;EFn$WYI{4chYRNosZ+BSPn~nDC?VMG@WQp4
zQ%xlg^apC1<~I1Ts`BPs?tJv(bX8c~#U=6b-!7fG<|BS{uiwm&NTbr9c`x-=?+SL`
zwW&m8nNF=^lM#!)#*dOkzJj^iUnq3;y{P}amSwHOg%p;z-WMcTb;B>6alL-z{VV=E
X_cR3`Ud)gK1}1~2tDnm{r-UW|GrP4>

diff --git a/src/assets/images/layout/main/foot/home-checked.png b/src/assets/images/layout/main/foot/home-checked.png
deleted file mode 100644
index eeb1211e9556cc5863660d6f0e94abf1f5321b72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 734
zcmW+zc}SB16#u+3$23hXr<Mm<X?Co%ZO!H8Hs_{&>gKh}eYP^IKf(hQw40HG%s|V`
ze@ca<un;lG4yhE$BxPRUon|SBxXet;e(ek1!SC_j@5g)3oJ7i88NLjHAYA2f5~VGN
z)4tik7DF|Uj}V02=A?uasSP4o14TO2r{E=oN(Zh6nG|-2;Ufft4<9iiRoEs(x(*H;
zy6DV<fr2IzdIM6maN<Fv1eFCH^}kJzXccyfK~ZoMVAC;VWq~?{pjZUPK~F)EhD}@q
zOR-l5p^`QmgIW(eE|>y@#L|N-F|A?~-6EhNFA?l`M4Z4u1;XVBjYCutI3)JSuqzhP
z$q16riiv7SQV^qpEEWDS@H`G}CcRxkI^=0!iIAp4ik7Bz7l6q}rU6b|Wa!~?EFeez
z%61D*fs#}a>l=;{Y?sB!z7jvzUrP(~^Rtt~Jza0wT3X7@=7Mb1f#6{G^|c?%3uB`L
z?JpZ2H9V})irrs$e66vam6S_FDcq0ay=N|56Z&`MdUZCnE(*@APBe|ohc%k)Evq2A
z|K!WA%$(i$@-C#kRGc?Z_<+BCO~<Qov&4Qn+NP@>E8N1ltG(a1`?AMum7!awxcBFE
zQLUoPS6($xKY7x!e3oB#%Uiv2ujt~`$i(Rkj<qa)blrM;p4(rrF*@pcy|u*rp}IoC
zC>iN6lu}rot88$x4)T-zr)M~I?2dXitK+=~t0Pf-nD0hRe<K1fm4>v;5P^S-gIbI?
zDzlddUWlS<jbThF`wq`-x|8WS_<WA(oLhXA(SIm-p}3skH}lrl!CGLt?`zC4H5+>@
zH?7{&eOtZr0``a4E!p?hHeU%7jZG!1jXmEP&l<aY{M@6xyvWbtk;bTD&Px5bDZ;5v
zN<JUSm>m0gnjC6OZ<Ynk6-MqpU-<0z(9n|_RqF{Ah633Bj`<Dy?AC10A>>k0@-&9J
F_7B@gUC;mk

diff --git a/src/assets/images/layout/main/foot/home.png b/src/assets/images/layout/main/foot/home.png
deleted file mode 100644
index 5145831241e9404f3b7b1a56ffe4ead1d981c0ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv81S$pJngu0Yzv#KagCSXx?ITU&d0
zc%TX!LsY`m!x?a8KoN6ua|<wVaBu*M14Yct%z%OrH9#&Ln3|dbrGO+v8IS>#0<yQX
z_~!$iWl$327tAp4&w`(?m-2D3Ji4*|!=**NmiNx?`nrEhRgsZ`tQbdoyspZ#Q%ARV
zhB@mu=ccE5@qe!U$-uzq;pyTSVsZNJl<P&!1_G{(%2qc-ZYMNXcV9mDzdp90(IM$n
zaN48aTXtE!$#9SHJg@lKRwzmQb?uGK$3q`oIXmyz134LPiJ7uFJSVE^rn$7%-fEMQ
z(#YR_YrDf9lg*hNc{}I3E;!=5W<P6nuwh)|%6}7Ldmjee|0N=DMsCAt_s{3c7u5Z6
zDP_NM^}QIkq=dv*J~@v4A4}q*WPKaV^Ji4&I)AV|oyOCrXzJOY5VCGd&Bdy4F~^+(
zEkUbIrfdq6*mBs&Mtn|M?ZcxNnX-4jU{3#jpemC8M&pAWTMoW#tDPb7lh^;i`xfCH
zZjX69)pZunC=Y(u(tgx_@uI(mbAG@5Ah30fbIxX7v$tMWZVKXpa~|B|nw~jPYp0a;
zU8aX8#9JST#Bbam6&&cj-DI=o)4X@{yfmw0t1BLzU_Ef@S?l(FTUfRQCVBl2i;sL|
WsOh=r_Xc2mFnGH9xvX<aXaWEY`su|0

diff --git a/src/assets/images/layout/main/foot/user-checked.png b/src/assets/images/layout/main/foot/user-checked.png
deleted file mode 100644
index b72fd438243e2c25bb3e68e33e8169f254eb8a95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmW+zYfMrB6uzb=iWq5Wies6k6SW6a2pS3kLLe7;so*87t=3vKU9C*bM=b}LO<NDm
zRe!XH=34KXGke+0%Ib%%S*}cLbN147X|}I>`*9xMzO!?_bB^0+$m9e>1P}zl(Q1??
zIwms4@}_;f{j!K4yo5%*MMXoXtWf77LJrCWmK2NA5ta_N3}O@HHe}{QpoPN;($26O
za$t8tX@Q><D|E=VgPn@C2IRXS$^tI~QEC|NusV=UL2ib`2tNtD#1NBkxv(e=$t329
zk)VZ84}}@N|5>RKYqQ{;j8%Hjd6W`l9?W)xD<I5*Km(PHnL-sX{WUh^JCR|9J{Kt@
z0#h(w!ayGh^f|CNV6ubEMNU4nw0<k2Hbe&QdaTreC1L6}x{yafq(_Vz{0u}Y5H3e(
zI<sb6CgL?%red@uZUD6rKFL^TfZPNLNelDn3d-rLsdk$TW@4dl&&|`NTauRYSW~|y
z$DVdSx#KxlRpxRkq-)|9&CblsOplF@41at-F!1W-vnTiOTy1Y_y>#wOqx(>KQPK9T
zCZi@(T<dP4-yzm2<(A~$_b<1aAEt9FJ}!TAL{k?uJyi02Q=E@GDImBG2<wOmi90n;
z%?bL(pAS{<-5EOjsCn0Fne2MK|Gf)e*q7r+>)A5x35&3POJdg!bMT8kcNvHGv*vB+
z<HHxDTIK4&!UYL@?)LpU+tHd%Q3bo7Yp$5QU*Or-G3D`JWjOHQclb}yXX4mE$rWdB
zWubc3-`w?SIAxiD*g5@Zo8OX&b3w1USKIo(UhA?nh=T8~;N7Z>?nrce_3sMNlBEqT
zlOJN6sM%QcfFb%vSe-F`yr0DnY~=UdF5fdq3A;;TiVMh$9=}^uWo`Ah;-E{@Bekve
z7FqiQ$MNX_uahI_{5*K0+npdAt9h4{(-vqOYEf?!NGHxmdNmJQr5<-`itUf<l<qNq
e_3@$Lxy@;R&wlxJvX`Tve?n+g24%a#RrL?-b7yz}

diff --git a/src/assets/images/layout/main/foot/user.png b/src/assets/images/layout/main/foot/user.png
deleted file mode 100644
index d85073c7b97c01e137ea463e5a416c5ba92654af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv81St^l79S0HU^X=wrm?(Xi!sKCt3
z3?c<2O-)UKl0XJT2}B&ohKR%ULBxTAK)pbKtQaT=lm%LcrWj&o#yYVEplftXg8YIR
z1m|?JeS3NT=SRt7TN|{0pFXr>eM`0d^_2^Yv*O*&l^*wo1schTUfMM+S?`?H#;ThP
z42+(hE{-7<r|(XFS=3}8;wH%ZJIK++;Xv(5+xP#g=4KvubP}rH{ye<sxzB@VbsPV&
zzy15FVz)uvp74HE|3ydE=;bsRtv6!-VAuPJcTesA&2N+z80;u7XwR2tk=goA>dxuc
zc1LHve8O+h%VoO8<Q=ot%J}JX-SiT4r-ofv`IOh`V(YVCPF_1p+9Iys57lG6#aCRj
zv!uyQ_r0T^Gw<3mwbdu*|K#@W?dEW6We%CvrmGXr|4Mex=B3G;7X{jmm>zrgsHyr#
z?0GIm>C+A$7%j>!9@)w8ruFB_Gpzn)(XVA4|FAwtJzKD*)3u)Ko|Unv*H*p2NqV<E
z#hky~xLjy4duLPalan*^+AjKf#9VUmy8htQmLMtCiA&ul?9Z#sYt#OEOp^2C*JKMP
z9reica=u0Kp++B!qa8(;1$cX&yD;h8@_el?fe)X|{o4MMt>4gie#@G_Y{1xH@O1Ta
JS?83{1OOq+<^2Ev

diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue
index 746f9b4d..dc5eb529 100644
--- a/src/views/layout/components/navbar/index.vue
+++ b/src/views/layout/components/navbar/index.vue
@@ -2,7 +2,7 @@
     <!-- 顶部导航栏 -->
     <div class="navbar">
         <div class="nav-left">
-            <icon name="arrow-left" color="f">返回</icon>
+            <!-- <icon name="arrow-left" color="f">返回</icon> -->
             <div class="flex-row align-c">
                 <div class="name">
                     <div class="flex-row align-c gap-10 c-pointer" @click="dialog_visible = true">
@@ -27,17 +27,17 @@
             </div>
         </template>
         <div class="content pa-20">
-            <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="70" status-icon>
-                <el-form-item label="上传头像">
+            <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="50" status-icon>
+                <el-form-item label="封面">
                     <upload v-model="form.logo" :limit="1"></upload>
                 </el-form-item>
-                <el-form-item label="模版名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入模版名称" />
+                <el-form-item label="名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入名称" />
                 </el-form-item>
-                <el-form-item label="模版描述">
-                    <el-input v-model="form.describe" placeholder="请输入模版描述" :rows="4" type="textarea" />
+                <el-form-item label="描述">
+                    <el-input v-model="form.describe" placeholder="请输入描述" :rows="4" type="textarea" />
                 </el-form-item>
-                <el-form-item label="模版开关">
+                <el-form-item label="开关">
                     <el-switch v-model="form.is_enable" active-value="1" inactive-value="0"></el-switch>
                 </el-form-item>
             </el-form>
@@ -110,7 +110,7 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
 <style lang="scss" scoped>
 .navbar {
     height: 8rem;
-    padding: 0 3.7rem;
+    padding: 0 3rem;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -119,21 +119,21 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
         display: flex;
         align-items: center;
         .name {
-            padding-left: 2rem;
-            margin: 0 2rem;
+            // padding-left: 2rem;
+            // margin: 0 2rem;
             color: #fff;
             position: relative;
-            &::before {
-                content: '';
-                display: inline-block;
-                width: 0.1rem;
-                height: 65%;
-                background-color: #fff;
-                position: absolute;
-                left: 0;
-                top: 50%;
-                transform: translateY(-50%);
-            }
+            // &::before {
+            //     content: '';
+            //     display: inline-block;
+            //     width: 0.1rem;
+            //     height: 65%;
+            //     background-color: #fff;
+            //     position: absolute;
+            //     left: 0;
+            //     top: 50%;
+            //     transform: translateY(-50%);
+            // }
             .img {
                 width: 2.2rem;
                 height: 2.2rem;
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 511a0ae0..1a6562a5 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -142,10 +142,9 @@ const save = () => {
     formmat_form_data(form.value);
 };
 const save_close = () => {
-    formmat_form_data(form.value);
-    window.close();
+    formmat_form_data(form.value, true);
 };
-const formmat_form_data = (data: diy_data_item) => {
+const formmat_form_data = (data: diy_data_item, close: boolean = false) => {
     const clone_form = cloneDeep(data);
     clone_form.header.show_tabs = true;
     clone_form.footer.show_tabs = false;
@@ -161,6 +160,13 @@ const formmat_form_data = (data: diy_data_item) => {
     const new_data = diy_data_transfor_form_data(clone_form);
     DiyAPI.save(new_data).then((res) => {
         ElMessage.success('保存成功');
+        if (!close) return;
+        ElMessageBox.confirm('您确定要关闭本页吗？', '提示')
+            .then(() => {
+                // 关闭页面
+                window.close();
+            })
+            .catch(() => {});
     });
 };
 //#endregion 顶部导航回调方法 ---------------------end

From f0ce30037fdb1b48ce100ab9cfec69012c801a23 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 3 Sep 2024 11:00:15 +0800
Subject: [PATCH 8/8] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sw?=
 =?UTF-8?q?s=202024-09-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.ts                                     | 8 ++++----
 src/views/layout/components/main/default/footer-nav.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 204ec433..fcc4d846 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -328,14 +328,14 @@ export const tabs_style = (color: string, style: string | number | boolean | und
  * 如果环境变量VITE_APP_BASE_API被设置为'/dev-api'，则从本地开发环境中导入临时数据
  * 否则，从cookie中获取资源主机地址
  * 这种设计允许开发者在不同的环境中灵活切换资源URL的来源，以适应不同的开发和生产需求
- *
+ * @param directory {string} - 资源目录名称
  * @returns {Promise<string>} 返回一个Promise，解析为包含资源URL的字符串
  */
-export const online_url = async () => {
+export const online_url = async (directory: string) => {
     if (import.meta.env.VITE_APP_BASE_API == '/dev-api') {
         let temp_data = await import(import.meta.env.VITE_APP_BASE_API == '/dev-api' ? '../../temp.d' : '../../temp_pro.d');
-        return temp_data.default.temp_attachment_host + '/static/app/tabbar/';
+        return temp_data.default.temp_attachment_host + directory;
     } else {
-        return get_cookie('attachment_host') + '/static/app/tabbar/';
+        return get_cookie('attachment_host') + directory;
     }
 };
diff --git a/src/views/layout/components/main/default/footer-nav.ts b/src/views/layout/components/main/default/footer-nav.ts
index aa82083b..e8bfe579 100644
--- a/src/views/layout/components/main/default/footer-nav.ts
+++ b/src/views/layout/components/main/default/footer-nav.ts
@@ -1,7 +1,7 @@
 import defaultCommon from './index';
 import { online_url } from '@/utils';
 
-const new_url = await online_url();
+const new_url = await online_url('/static/app/tabbar/');
 interface DefaultFooterNav {
     content: {
         nav_style: string;