Merge branch 'dev-sws' into dev-yxl

src/components/footer-nav/footer-nav-content.vue

@@ -22,7 +22,7 @@
                 <div class="mb-12">导航内容</div>
                 <div class="size-12 cr-c mb-20">图片建议宽高80*80；鼠标拖拽左侧圆点可调整导航顺序</div>
                 <div class="nav-list">
-                    <drag :data="form.nav_content" type="card" :space-col="20" @remove="nav_content_remove">
+                    <drag :data="form.nav_content" type="card" :space-col="20" @remove="nav_content_remove" @on-sort="on_sort">
                         <template #default="{ row }">
                             <div class="w">
                                 <el-form-item label="图标" label-width="45">
@@ -72,6 +72,9 @@ const nav_content_remove = (index: number) => {
     form.value.nav_content.splice(index, 1);
     emit('update:value', form.value);
 };
+const on_sort = (item: any) => {
+    form.value.nav_content = item;
+};
 const add = () => {
     form.value.nav_content.push({
         id: get_math(),

src/views/layout/components/main/default/article-tabs.ts

@@ -62,7 +62,7 @@ interface DefaultArticleTabs {
 const defaultArticleTabs: DefaultArticleTabs = {
     content: {
         tabs_theme: '0',
-        tabs_top_up: '1',
+        tabs_top_up: '0',
         article_theme: '0',
         article_carousel_col: '2',
         tabs_list: [