From c5528a773c64573868d62a4a589121762d5a2a14 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 6 Sep 2024 14:32:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(layout):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=92=8C=E7=BB=84=E4=BB=B6=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化了布局组件中的默认底部导航配置，将字符串类型的 nav_style 和 nav_type 更改为数字类型，以提高数据处理效率。此外，修正了通过引用传递 nav_content 和 nav_style，确保组件之间的数据同步更加可靠。
---
 .../footer-nav/footer-nav-content.vue         | 23 +++++++-------
 .../footer-nav/footer-nav-setting.vue         | 18 +++++------
 src/components/footer-nav/index.vue           | 20 +++++++++---
 .../components/main/default/footer-nav.ts     |  8 ++---
 src/views/layout/index.vue                    | 31 ++++++++++++++++---
 5 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/src/components/footer-nav/footer-nav-content.vue b/src/components/footer-nav/footer-nav-content.vue
index 86c87704..230ce46b 100644
--- a/src/components/footer-nav/footer-nav-content.vue
+++ b/src/components/footer-nav/footer-nav-content.vue
@@ -5,15 +5,15 @@
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="导航样式">
                     <el-radio-group v-model="form.nav_style" is-button @change="nav_style_change">
-                        <el-radio value="0">图片加文字</el-radio>
-                        <el-radio value="1">图片</el-radio>
-                        <el-radio value="2">文字</el-radio>
+                        <el-radio :value="0">图片加文字</el-radio>
+                        <el-radio :value="1">图片</el-radio>
+                        <el-radio :value="2">文字</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="导航类型">
                     <el-radio-group v-model="form.nav_type" is-button @change="nav_type_change">
-                        <el-radio value="0">底部固定</el-radio>
-                        <el-radio value="1">底部悬浮</el-radio>
+                        <el-radio :value="0">底部固定</el-radio>
+                        <el-radio :value="1">底部悬浮</el-radio>
                     </el-radio-group>
                 </el-form-item>
             </card-container>
@@ -58,28 +58,29 @@ const props = defineProps({
         default: () => {},
     },
 });
-const form = reactive(props.value);
+const form = ref(props.value);
 const emit = defineEmits(['update:value']);
 const nav_style_change = (style: any) => {
     form.value.nav_style = style;
-    emit('update:value', form);
+    emit('update:value', form.value);
 };
 const nav_type_change = (type: any) => {
     form.value.nav_type = type;
-    emit('update:value', form);
+    emit('update:value', form.value);
 };
 const nav_content_remove = (index: number) => {
     form.value.nav_content.splice(index, 1);
-    emit('update:value', form);
+    emit('update:value', form.value);
 };
 const add = () => {
     form.value.nav_content.push({
         id: get_math(),
         name: '',
-        src: [],
-        src_checked: [],
+        img: [],
+        img_checked: [],
         link: {},
     });
+    emit('update:value', form.value);
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/footer-nav/footer-nav-setting.vue b/src/components/footer-nav/footer-nav-setting.vue
index d250a83e..a9d1c3e5 100644
--- a/src/components/footer-nav/footer-nav-setting.vue
+++ b/src/components/footer-nav/footer-nav-setting.vue
@@ -4,7 +4,7 @@
             <footer-nav-content :value="form.content" @update:value="content_update"></footer-nav-content>
         </template>
         <template v-else-if="type == '2'">
-            <footer-nav-styles :value="form.style" @update:value="style_update"></footer-nav-styles>
+            <footer-nav-styles :value="form.style"></footer-nav-styles>
         </template>
     </div>
 </template>
@@ -19,27 +19,23 @@ const props = defineProps({
         default: () => ({}),
     },
 });
-const form = reactive(props.value);
+const form = ref(props.value);
 const emit = defineEmits(['update:value']);
 const content_update = (value: any) => {
-    form.content = value;
-    let new_data = form.style.common_style;
+    form.value.content = value;
     const new_arry = ['margin', 'margin_left', 'margin_right', 'margin_top', 'margin_bottom', 'padding', 'padding_left', 'padding_right', 'padding_top', 'padding_bottom', 'radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right'];
-    if (value.nav_type == '1') {
+    if (value.nav_type == 1) {
         new_arry.forEach((item) => {
             if (item.indexOf('radius') !== -1) {
-                new_data[item] = 100;
+                form.value.style.common_style[item] = 100;
             } else {
-                new_data[item] = 10;
+                form.value.style.common_style[item] = 10;
             }
         });
     } else {
         new_arry.forEach((item) => {
-            new_data[item] = 0;
+            form.value.style.common_style[item] = 0;
         });
     }
 };
-const style_update = (value: any) => {
-    form.style = value;
-};
 </script>
diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index 93880463..0e8ccc3c 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -2,8 +2,8 @@
     <div class="footer-nav flex-row jc-c align-c" :class="showFooter ? 'br-2 br-primary' : ''" @click="footer_nav_event">
         <div class="footer-nav-content flex-row jc-c align-c w" :style="style_container">
             <ul class="flex-row jc-sa align-c w">
-                <li v-for="(item, index) in footerData?.content?.nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" @mouseenter="is_hover = index" @mouseleave="is_hover = 0">
-                    <div v-if="footerData.content.nav_style !== '2'" class="img re">
+                <li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" @mouseenter="is_hover = index" @mouseleave="is_hover = 0">
+                    <div v-if="nav_style !== 2" class="img re">
                         <div class="img-item abs radius-xs animate-linear w" :class="is_hover != index ? 'active' : ''">
                             <image-empty v-model="item.img[0]" error-img-style="width:1.5rem;height:1.5rem;"></image-empty>
                         </div>
@@ -11,7 +11,7 @@
                             <image-empty v-model="item.img_checked[0]" error-img-style="width:1.5rem;height:1.5rem;"></image-empty>
                         </div>
                     </div>
-                    <span v-if="footerData.content.nav_style !== '1'" class="animate-linear size-12 re z-i" :style="is_hover == index ? text_color_checked : default_text_color">{{ item.name }}</span>
+                    <span v-if="nav_style !== 1" class="animate-linear size-12 re z-i" :style="is_hover == index ? text_color_checked : default_text_color">{{ item.name }}</span>
                 </li>
             </ul>
         </div>
@@ -35,12 +35,24 @@ const style_container = ref('');
 const default_text_color = ref('');
 const text_color_checked = ref('');
 let is_hover = ref(0);
+interface footerNavData {
+    id: string;
+    name: string;
+    img: uploadList[];
+    img_checked: uploadList[];
+    link: object;
+}
+const nav_content = ref<footerNavData[]>([]);
+const nav_style = ref(0);
 
 watch(
-    props.footerData,
+    () => props.footerData,
     (newVal, oldValue) => {
+        console.log(newVal);
         const new_content = newVal?.content || {};
         const new_style = newVal?.style || {};
+        nav_content.value = new_content?.nav_content || [];
+        nav_style.value = new_content?.nav_style || 0;
         default_text_color.value = 'color:' + new_style.default_text_color || 'rgba(0, 0, 0, 1)';
         text_color_checked.value = 'color:' + new_style.text_color_checked || 'rgba(204, 204, 204, 1)';
 
diff --git a/src/views/layout/components/main/default/footer-nav.ts b/src/views/layout/components/main/default/footer-nav.ts
index fbc1c4db..20ff173e 100644
--- a/src/views/layout/components/main/default/footer-nav.ts
+++ b/src/views/layout/components/main/default/footer-nav.ts
@@ -3,8 +3,8 @@ import { online_url } from '@/utils';
 const new_url = await online_url('/static/app/tabbar/').then((res) => res);
 interface DefaultFooterNav {
     content: {
-        nav_style: string;
-        nav_type: string;
+        nav_style: number;
+        nav_type: number;
         nav_content: { id: string; name: string; img: uploadList[]; img_checked: uploadList[]; link: object }[];
     };
     style: {
@@ -15,8 +15,8 @@ interface DefaultFooterNav {
 }
 const defaultFooterNav = ref<DefaultFooterNav>({
     content: {
-        nav_style: '0',
-        nav_type: '0',
+        nav_style: 0,
+        nav_type: 0,
         nav_content: [
             { id: '1', name: '首页', img: [{ id: 1, url: new_url + 'home.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 1, url: new_url + 'active/home.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} },
             { id: '2', name: '分类', img: [{ id: 1, url: new_url + 'category.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 1, url: new_url + 'active/category.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} },
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 52ec8b6d..7dace106 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -37,6 +37,28 @@ interface diy_data_item {
     footer: headerAndFooter;
     diy_data: Array<any>;
 }
+const temp_form = ref<diy_data_item>({
+    id: '',
+    model: {
+        logo: '',
+        name: '',
+        is_enable: '1',
+        describe: '',
+    },
+    header: {
+        name: '页面设置',
+        show_tabs: '1',
+        key: 'page-settings',
+        com_data: defaultSettings.header_nav,
+    },
+    footer: {
+        name: '底部导航',
+        show_tabs: '0',
+        key: 'footer-nav',
+        com_data: defaultSettings.footer_nav,
+    },
+    diy_data: [],
+});
 const form = ref<diy_data_item>({
     id: '',
     model: {
@@ -49,13 +71,13 @@ const form = ref<diy_data_item>({
         name: '页面设置',
         show_tabs: '1',
         key: 'page-settings',
-        com_data: cloneDeep(defaultSettings.header_nav),
+        com_data: {},
     },
     footer: {
         name: '底部导航',
         show_tabs: '0',
         key: 'footer-nav',
-        com_data: defaultSettings.footer_nav,
+        com_data: {},
     },
     diy_data: [],
 });
@@ -122,6 +144,7 @@ const init = () => {
             loading_event(api_count.value);
         });
     } else {
+        form.value = cloneDeep(temp_form.value);
         api_count.value = 1;
         loading_event(api_count.value);
     }
@@ -172,9 +195,7 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false) =>
         //         item1.goods_ids = item.goods_list.map((item2: any) => item2.data.id).join(',') || '';
         //         item1.goods_list = [];
         //     });
-        // } else if (item.key == 'custom') {
-        //    item.com_data.content.data_source_content = {};
-        //}
+        // }
         return {
             ...item,
             show_tabs: '0',

From 7af5b1bb7ba023c9f16ae3e2dfce8f6361bdaf14 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 6 Sep 2024 14:39:04 +0800
Subject: [PATCH 2/2] ### commit message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除不必要的日志记录和注释，并修复注释中的代码错误。

在`footer-nav`组件中，移除了一行用于调试目的的`console.log`调用，以清理生产代码。此外，该组件的DTS类型错误已被纠正，以确保类型一致性。

在`layout`视图中，一个被注释掉的代码行被正确地更新为反映变量引用的更改，该更改旨在支持数据的动态加载。
---
 src/components/footer-nav/index.vue | 1 -
 src/views/layout/index.vue          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index 0e8ccc3c..1530f4a9 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -48,7 +48,6 @@ const nav_style = ref(0);
 watch(
     () => props.footerData,
     (newVal, oldValue) => {
-        console.log(newVal);
         const new_content = newVal?.content || {};
         const new_style = newVal?.style || {};
         nav_content.value = new_content?.nav_content || [];
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 7dace106..fe086920 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -88,7 +88,7 @@ const api_count = ref(0);
 
 const right_update = (item: any, diy: [Array<any>], header: headerAndFooter, footer: headerAndFooter) => {
     diy_data_item.value = item;
-    // form.value.diy_data = diy;
+    form.value.diy_data = diy;
     // form.value.header = header;
     // form.value.footer = footer;
     // 生成随机id