Merge branch 'jixian' of https://zhgit.sxzooh.com/Administrator/FenXiNspUniapp into jixian

# Conflicts: # pages/maps/index.vue
2026-08-13 16:17:10 +08:00 · 2026-08-13 16:17:10 +08:00 · fa44229ed2
parent ce1dc5b5a7 2f87639314
commit fa44229ed2
2 changed files with 484 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,24 @@
-/unpackage/
-/.idea/
+.DS_Store
+node_modules
+/dist
+
+/unpackage
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
--- a/components/my-icon/my-icon.vue
+++ b/components/my-icon/my-icon.vue