From 6c06dd50d014a512823225dfe01033aa0e805b71 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Sep 2024 17:29:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.diy----=20footer=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue    | 14 ++++++--------
 components/diy/footer.vue | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 8cbb3854..1a67d5e8 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -37,16 +37,14 @@
             };
         },
 
-                computed: {
-          diy_content_style(){
-              return {
-                  paddingBottom: this.padding_footer_computer
-              }
-          }
-                },
+        computed: {
+            diy_content_style() {
+                return `padding-bottom:${this.padding_footer_computer}rpx`;
+            },
+        },
         methods: {
             footer_height_computer(number) {
-                this.padding_footer_computer = number * 2 + 'rpx';
+                this.padding_footer_computer = number * 2;
             },
         },
     };
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index 0d86ecaa..f7fae9ea 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -1,14 +1,14 @@
 <template>
-    <view class="footer-nav flex-row jc-c align-c">
+    <view class="footer-nav flex-row jc-c align-c bottom-line-exclude">
         <view class="footer-nav-content flex-row jc-c align-c wh" :style="style_container">
             <ul class="flex-row jc-sa align-c wh padding-0">
-                <li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" @mouseenter="is_active = index" @mouseleave="is_active = 0">
+                <li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-index="index" @click="handle_event">
                     <view v-if="nav_style !== 2" class="img pr">
                         <view class="img-item pa border-radius-xs animate-linear" :class="is_active != index ? 'active' : ''">
-                            <img :src="item.img[0].url" class="wh-auto" />
+                            <img :src="item.img[0].url" class="wh-auto ht-auto" />
                         </view>
                         <view class="img-item pa border-radius-xs animate-linear" :class="is_active == index ? 'active' : ''">
-                            <img :src="item.img_checked[0].url" class="wh-auto" />
+                            <img :src="item.img_checked[0].url" class="wh-auto ht-auto" />
                         </view>
                     </view>
                     <span v-if="nav_style !== 1" class="animate-linear size-12 pr z-i" :style="is_active == index ? text_color_checked : default_text_color">{{ item.name }}</span>
@@ -52,13 +52,22 @@
 
                 this.style_container = common_styles_computer(new_style.common_style);
                 let footer_height = new_style.common_style.padding_top + new_style.common_style.padding_bottom + new_style.common_style.margin_top + new_style.common_style.margin_bottom + 50;
+                // #ifndef APP
+                // 底部菜单距离底部的安全距离
+                footer_height = footer_height + uni.getSystemInfoSync().statusBarHeight - 40;
+                // #endif
                 if (footer_height >= 70) {
                     footer_height = footer_height;
                 } else {
                     footer_height = 70;
                 }
+                console.log(footer_height);
                 this.$emit('footer-height', footer_height);
             },
+            handle_event(e) {
+                console.log(e);
+                this.is_active = e.currentTarget.dataset.index;
+            },
         },
     };
 </script>
@@ -74,7 +83,6 @@
         max-width: 800px;
         /* #endif */
         margin: 0 auto;
-        padding: 0;
         cursor: pointer;
         background-color: transparent;
         .footer-nav-content {

From 03bfb4c0b9bf00ca4cde80616a076b892bb9e3a1 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Sep 2024 17:44:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.diy----=20footer=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                | 4 +++-
 components/diy/footer.vue | 4 +++-
 pages/diy/init_data.js    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f67649b5..58ecda11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
 *.log
 unpackage
 sitemap.json
-.prettierrc.cjs
\ No newline at end of file
+.prettierrc.cjs
+pages/diy/init_data.js
+pages/diy/init_data copy.js
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index f7fae9ea..1938c4d4 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -2,7 +2,7 @@
     <view class="footer-nav flex-row jc-c align-c bottom-line-exclude">
         <view class="footer-nav-content flex-row jc-c align-c wh" :style="style_container">
             <ul class="flex-row jc-sa align-c wh padding-0">
-                <li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-index="index" @click="handle_event">
+                <li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-index="index" :data-link="item.link" @click="handle_event">
                     <view v-if="nav_style !== 2" class="img pr">
                         <view class="img-item pa border-radius-xs animate-linear" :class="is_active != index ? 'active' : ''">
                             <img :src="item.img[0].url" class="wh-auto ht-auto" />
@@ -19,6 +19,7 @@
 </template>
 
 <script>
+    const app = getApp();
     import { common_styles_computer } from '@/common/js/common/common.js';
     export default {
         props: {
@@ -67,6 +68,7 @@
             handle_event(e) {
                 console.log(e);
                 this.is_active = e.currentTarget.dataset.index;
+                app.globalData.url_open(e.currentTarget.dataset.link.page);
             },
         },
     };
diff --git a/pages/diy/init_data.js b/pages/diy/init_data.js
index ce30a938..22e3d04f 100644
--- a/pages/diy/init_data.js
+++ b/pages/diy/init_data.js
@@ -30,7 +30,7 @@ const initData = {
                 "tips": "请输入搜索内容",
                 "is_search_show": "0",
                 "search_type": "text",
-                "search_tips": "搜索",
+                "search_tips": "搜索", 
                 "hot_word_list": [],
                 "bottom_navigation_show": "1"
             },

From 79ab25b7378072fe756206c61480d2fcbf8f391c Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Sep 2024 17:44:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.diy----=20footer=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/init_data.js | 298 -----------------------------------------
 1 file changed, 298 deletions(-)
 delete mode 100644 pages/diy/init_data.js

diff --git a/pages/diy/init_data.js b/pages/diy/init_data.js
deleted file mode 100644
index 22e3d04f..00000000
--- a/pages/diy/init_data.js
+++ /dev/null
@@ -1,298 +0,0 @@
-const initData = {
-    "id": "36",
-    "model": {
-        "logo": "",
-        "name": "DIY-默认页面09051613",
-        "is_enable": "1",
-        "describe": ""
-    },
-    "header": {
-        "name": "页面设置",
-        "show_tabs": "1",
-        "key": "page-settings",
-        "com_data": {
-            "content": {
-                "theme": "1",
-                "logo": [],
-                "title": "新建页面",
-                "link": [],
-                "indicator_location": "center",
-                "positioning_name": "默认定位名称",
-                "is_arrows_show": "1",
-                "is_center": "0",
-                "is_icon_show": "1",
-                "icon_src": "",
-                "icon_img": [],
-                "icon_class": "",
-                "search_botton_img": [],
-                "search_botton_icon": "",
-                "is_tips_show": "1",
-                "tips": "请输入搜索内容",
-                "is_search_show": "0",
-                "search_type": "text",
-                "search_tips": "搜索", 
-                "hot_word_list": [],
-                "bottom_navigation_show": "1"
-            },
-            "style": {
-                "header_background_type": "color_image",
-                "header_background_color_list": [{
-                    "color": "#fff"
-                }],
-                "header_background_direction": "180deg",
-                "header_background_img_style": 2,
-                "header_background_img": [],
-                "header_background_title_color": "#333",
-                "header_background_title_typeface": "500",
-                "header_background_title_size": 16,
-                "function_buttons_type": "black",
-                "immersive_style": "0",
-                "up_slide_display": "1",
-                "icon_color": "#ccc",
-                "button_inner_color": "#fff",
-                "search_botton_color_list": [{
-                        "color": "#FF973D"
-                    },
-                    {
-                        "color": "#FF3131"
-                    }
-                ],
-                "search_botton_direction": "90deg",
-                "search_botton_background_img_style": "",
-                "search_botton_background_img": [],
-                "search_button_radius": {
-                    "radius": 16,
-                    "radius_top_left": 16,
-                    "radius_top_right": 16,
-                    "radius_bottom_left": 16,
-                    "radius_bottom_right": 16
-                },
-                "tips_color": "#ccc",
-                "hot_words_color": "#000",
-                "search_border": "#E4E4E4",
-                "search_border_radius": {
-                    "radius": 16,
-                    "radius_top_left": 16,
-                    "radius_top_right": 16,
-                    "radius_bottom_left": 16,
-                    "radius_bottom_right": 16
-                },
-                "common_style": {
-                    "direction": "90deg",
-                    "color_list": [{
-                        "color": ""
-                    }],
-                    "background_img_style": 2,
-                    "padding": 0,
-                    "padding_top": 0,
-                    "padding_bottom": 0,
-                    "padding_left": 0,
-                    "padding_right": 0,
-                    "margin": 0,
-                    "margin_top": 0,
-                    "margin_bottom": 0,
-                    "margin_left": 0,
-                    "margin_right": 0,
-                    "radius": 0,
-                    "radius_top_left": 0,
-                    "radius_top_right": 0,
-                    "radius_bottom_left": 0,
-                    "radius_bottom_right": 0,
-                    "box_shadow_color": "",
-                    "box_shadow_x": 0,
-                    "box_shadow_y": 0,
-                    "box_shadow_blur": 0,
-                    "box_shadow_spread": 0,
-                    "background_img": []
-                }
-            }
-        }
-    },
-    "footer": {
-        "name": "底部导航",
-        "show_tabs": "0",
-        "key": "footer-nav",
-        "com_data": {
-            "content": {
-                "nav_style": "0",
-                "nav_type": "0",
-                "nav_content": [{
-                        "id": "1",
-                        "name": "测试",
-                        "img": [{
-                            "id": "2789",
-                            "category_id": "16",
-                            "title": "1716286697491881.jpg",
-                            "original": "防伪码.jpg",
-                            "size": "17.22KB",
-                            "ext": ".jpg",
-                            "type": "image",
-                            "url": "http://shopxo.com/static/upload/images/plugins_antifakecode/2024/05/21/1716286697491881.jpg",
-                            "hash": "beeaeca3b41d05d4bdd4d61ae32199f7e397018a69f45f2ada70984bf4671997",
-                            "add_time": "2024-05-21 18:18:17",
-                            "category_name": "plugins_antifakecode",
-                            "type_name": "图片"
-                        }],
-                        "img_checked": [{
-                            "id": "2788",
-                            "category_id": "67",
-                            "title": "1715592661588453.jpg",
-                            "original": "商品重组.jpg",
-                            "size": "68.88KB",
-                            "ext": ".jpg",
-                            "type": "image",
-                            "url": "http://shopxo.com/static/upload/images/plugins_goodsrebuild/2024/05/13/1715592661588453.jpg",
-                            "hash": "de889ed962f4509b7fffab4dfda90fbac4d3e09f8e480ac748f17ebd316b52b9",
-                            "add_time": "2024-05-13 17:31:01",
-                            "category_name": "plugins_goodsrebuild",
-                            "type_name": "图片"
-                        }],
-                        "link": []
-                    },
-                    {
-                        "id": "2",
-                        "name": "分类",
-                        "img": [{
-                            "id": 1,
-                            "url": "http://shopxo.com/static/app/tabbar/category.png",
-                            "original": "",
-                            "title": "",
-                            "ext": ".png",
-                            "type": "img"
-                        }],
-                        "img_checked": [{
-                            "id": 1,
-                            "url": "http://shopxo.com/static/app/tabbar/active/category.png",
-                            "original": "",
-                            "title": "",
-                            "ext": ".png",
-                            "type": "img"
-                        }],
-                        "link": []
-                    },
-                    {
-                        "id": "3",
-                        "name": "购物车",
-                        "img": [{
-                            "id": 1,
-                            "url": "http://shopxo.com/static/app/tabbar/cart.png",
-                            "original": "",
-                            "title": "",
-                            "ext": ".png",
-                            "type": "img"
-                        }],
-                        "img_checked": [{
-                            "id": 1,
-                            "url": "http://shopxo.com/static/app/tabbar/active/cart.png",
-                            "original": "",
-                            "title": "",
-                            "ext": ".png",
-                            "type": "img"
-                        }],
-                        "link": []
-                    },
-                    {
-                        "id": "4",
-                        "name": "我的",
-                        "img": [{
-                            "id": 1,
-                            "url": "http://shopxo.com/static/app/tabbar/user.png",
-                            "original": "",
-                            "title": "",
-                            "ext": ".png",
-                            "type": "img"
-                        }],
-                        "img_checked": [{
-                            "id": 1,
-                            "url": "http://shopxo.com/static/app/tabbar/active/user.png",
-                            "original": "",
-                            "title": "",
-                            "ext": ".png",
-                            "type": "img"
-                        }],
-                        "link": []
-                    }
-                ]
-            },
-            "style": {
-                "text_color_checked": "rgba(255, 0, 0, 1)",
-                "default_text_color": "rgba(0, 0, 0, 1)",
-                "common_style": {
-                    "direction": "90deg",
-                    "color_list": [{
-                        "color": "rgba(255,255,255,1)"
-                    }],
-                    "background_img_style": 2,
-                    "padding": 0,
-                    "padding_top": 0,
-                    "padding_bottom": 0,
-                    "padding_left": 0,
-                    "padding_right": 0,
-                    "margin": 0,
-                    "margin_top": 0,
-                    "margin_bottom": 0,
-                    "margin_left": 0,
-                    "margin_right": 0,
-                    "radius": 0,
-                    "radius_top_left": 0,
-                    "radius_top_right": 0,
-                    "radius_bottom_left": 0,
-                    "radius_bottom_right": 0,
-                    "box_shadow_color": "",
-                    "box_shadow_x": 0,
-                    "box_shadow_y": 0,
-                    "box_shadow_blur": 0,
-                    "box_shadow_spread": 0,
-                    "background_img": []
-                }
-            }
-        }
-    },
-    "diy_data": [{
-        "name": "横线",
-        "show_tabs": "0",
-        "is_enable": "1",
-        "id": "s8iobsd3kuh",
-        "key": "row-line",
-        "com_data": {
-            "content": {
-                "styles": "dotted"
-            },
-            "style": {
-                "line_color": "#0E8EA2",
-                "line_width": 16,
-                "padding_top": 10,
-                "padding_bottom": 10,
-                "common_style": {
-                    "direction": "90deg",
-                    "color_list": [{
-                        "color": ""
-                    }],
-                    "background_img_style": 2,
-                    "padding": 0,
-                    "padding_top": 10,
-                    "padding_bottom": 10,
-                    "padding_left": 0,
-                    "padding_right": 0,
-                    "margin": 0,
-                    "margin_top": 0,
-                    "margin_bottom": 0,
-                    "margin_left": 0,
-                    "margin_right": 0,
-                    "radius": 0,
-                    "radius_top_left": 0,
-                    "radius_top_right": 0,
-                    "radius_bottom_left": 0,
-                    "radius_bottom_right": 0,
-                    "box_shadow_color": "",
-                    "box_shadow_x": 0,
-                    "box_shadow_y": 0,
-                    "box_shadow_blur": 0,
-                    "box_shadow_spread": 0,
-                    "background_img": []
-                }
-            }
-        }
-    }]
-};
-export default initData;
\ No newline at end of file

From fb798038406cd8244282fa35a1250161ef32eea3 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Sep 2024 17:45:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.diy----=20footer=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 58ecda11..e31c20b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ unpackage
 sitemap.json
 .prettierrc.cjs
 pages/diy/init_data.js
-pages/diy/init_data copy.js