Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

webapp/packages/renderer/src/App.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <a-config-provider :locale="locale">
     <div
       id="app"
@@ -88,4 +89,35 @@ body {
   opacity: 0;
   transform: translateX(30px);
 }
+=======
+  <div id="app">
+    <app-header></app-header>
+    <router-view></router-view>
+  </div>
+</template>
+
+<script lang="ts">
+  import {defineComponent} from 'vue';
+  import AppHeader from '/@/components/AppHeader.vue'
+
+  export default defineComponent({
+    name: 'App',
+    components: {
+      AppHeader
+    },
+  });
+</script>
+
+<style>
+  #app {
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+  }
+
+  body {
+    margin: 0;
+    padding: 0;
+  }
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 </style>