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

---
 .../model-article-list-content.vue                   |  2 +-
 .../model-article-tabs-content.vue                   |  2 +-
 src/layout/components/main/index.vue                 | 12 ++++++------
 src/store/index.ts                                   |  1 +
 src/store/{ => modules}/article.ts                   |  0
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename src/store/{ => modules}/article.ts (100%)

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 a45058df..f14bbaf2 100644
--- a/src/components/model-article-list/model-article-list-content.vue
+++ b/src/components/model-article-list/model-article-list-content.vue
@@ -63,7 +63,7 @@
 <script setup lang="ts">
 import { get_math } from '@/utils';
 import ArticleAPI from '@/api/article';
-import { articleStore } from '@/store/article';
+import { articleStore } from '@/store';
 const article_store = articleStore();
 const props = defineProps({
     value: {
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 1accb1a4..f27d5e0b 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -88,7 +88,7 @@
 <script setup lang="ts">
 import { get_math, tabs_style } from '@/utils';
 import ArticleAPI from '@/api/article';
-import { articleStore } from '@/store/article';
+import { articleStore } from '@/store';
 const article_store = articleStore();
 const props = defineProps({
     value: {
diff --git a/src/layout/components/main/index.vue b/src/layout/components/main/index.vue
index 58ef7dba..960ff03a 100644
--- a/src/layout/components/main/index.vue
+++ b/src/layout/components/main/index.vue
@@ -24,7 +24,7 @@
                         <li v-for="(item, index) in diy_data" :key="index" :class="['flex ptb-12 plr-10 gap-y-8 re align-c drawer-drag', { 'drawer-drag-bg': item.show_tabs }]" @click="on_choose(index, item.show_tabs)">
                             <el-icon class="iconfont icon-drag size-16 cr-d" />
                             <span class="size-12 cr-6">{{ item.name }}</span>
-                            <el-icon class="iconfont icon-close-b size-16 abs" :style="[ item.show_tabs ? '' : 'display:none']" @click.stop="del(index)" />
+                            <el-icon class="iconfont icon-close-b size-16 abs" :style="[item.show_tabs ? '' : 'display:none']" @click.stop="del(index)" />
                         </li>
                     </TransitionGroup>
                 </VueDraggable>
@@ -46,7 +46,7 @@
                     <!-- 页面设置 -->
                     <page-settings :show-page="page_data.show_tabs" :page-data="page_data" @page_settings="page_settings"></page-settings>
                     <div class="model-wall" :style="content_style">
-                        <div :style="`padding-top:${ top_padding }px; margin-top: ${ top_margin }px;padding-bottom:${ bottom_navigation_show ? footer_nav_counter_store.padding_footer : 0 }px;`">
+                        <div :style="`padding-top:${top_padding}px; margin-top: ${top_margin}px;padding-bottom:${bottom_navigation_show ? footer_nav_counter_store.padding_footer : 0}px;`">
                             <VueDraggable v-model="diy_data" :animation="500" :touch-start-threshold="2" group="people" class="drag-area re" ghost-class="ghost" :on-sort="on_sort" :on-start="on_start" :on-end="on_end">
                                 <div v-for="(item, index) in diy_data" :key="item.id" :class="model_class(item)" :style="model_style(item)" @click="on_choose(index, item.show_tabs)">
                                     <div v-if="item.show_tabs" class="plug-in-right" chosenClass="close">
@@ -165,7 +165,7 @@ 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/modules/footer-nav-content';
+import { footerNavCounterStore } from '@/store';
 const footer_nav_counter_store = footerNavCounterStore();
 const app = getCurrentInstance();
 import { isEmpty } from 'lodash';
@@ -213,12 +213,12 @@ watchEffect(() => {
     if (data) {
         // 底部按钮显示
         const content = data.content;
-        bottom_navigation_show.value = content.bottom_navigation_show == '1' ? true: false;
+        bottom_navigation_show.value = content.bottom_navigation_show == '1' ? true : false;
         // 通用样式设置
         const new_style = data.style;
         content_style.value = gradient_computer(new_style.common_style) + background_computer(new_style.common_style);
         main_content_style.value = padding_computer(new_style.common_style);
-        
+
         const { immersive_style, up_slide_display } = new_style;
         // 不开启沉浸式 和 上滑显示
         if (immersive_style || !up_slide_display) {
@@ -618,4 +618,4 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri
         overflow: hidden;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/store/index.ts b/src/store/index.ts
index 9b0b1f55..6d2b5ed3 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -12,4 +12,5 @@ export * from './modules/upload';
 export * from './modules/shop';
 export * from './modules/url-value';
 export * from './modules/custom';
+export * from './modules/article';
 export { store };
diff --git a/src/store/article.ts b/src/store/modules/article.ts
similarity index 100%
rename from src/store/article.ts
rename to src/store/modules/article.ts