chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -4,10 +4,7 @@
    class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
    @click="toggleClick"
  >
-    <svg-icon
-      icon-class="collapse"
-      :class="{ hamburger: true, 'is-active': isActive }"
-    />
+    <svg-icon icon-class="collapse" :class="{ hamburger: true, 'is-active': isActive }" />
  </div>
 </template>