提交

2023-07-20 19:27:46 +08:00
parent 8cc4549dca
commit d5c86e2038
12 changed files with 274 additions and 41 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,14 @@
 <template>
+<<<<<<< HEAD
  <router-view/>
+=======
+  <router-view />
+  <login></login>
+>>>>>>> 542e853 (提交)
 </template>
 <script setup>
-import { useRouter } from 'vue-router'
-const router = useRouter()
-// router.push(`/edit-choosing`)
+import login from '@/components/public/login.vue'
+
 </script>
 <style lang="less">
 * {