修改问题

2024-09-19 15:54:30 +08:00 · 2024-09-19 15:54:30 +08:00 · d5434fd92e
parent 4a400d9816
commit d5434fd92e
1 changed files with 0 additions and 3 deletions
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@ -100,8 +100,6 @@
            },
        },
        methods: {
-<<<<<<< HEAD
-=======
            init() {
                // tabs选项卡数据过滤
                const filter_tabs_list = this.value.tabs_data;
@ -112,7 +110,6 @@
                    });
                }
            },
->>>>>>> dev-sws
            footer_height_computer(number) {
                this.padding_footer_computer = number * 2;
            },