|
|
@@ -1,4 +1,5 @@
|
|
|
<template>
|
|
|
+<<<<<<< HEAD
|
|
|
<div>
|
|
|
<!-- 引入头部组件 -->
|
|
|
<HeaderComponent />
|
|
|
@@ -22,5 +23,32 @@ body {
|
|
|
padding-bottom: 60px;
|
|
|
position: relative;
|
|
|
min-height: 100vh;
|
|
|
+=======
|
|
|
+ <!-- <img alt="Vue logo" src="./assets/logo.png"> -->
|
|
|
+ <HelloWorld msg="Welcome to Your Vue.js App"/>
|
|
|
+</template>
|
|
|
+
|
|
|
+
|
|
|
+<script>
|
|
|
+// import HelloWorld from './components/HelloWorld.vue'
|
|
|
+import HelloWorld from './views/AdminPage.vue'
|
|
|
+
|
|
|
+export default {
|
|
|
+ name: 'App',
|
|
|
+ components: {
|
|
|
+ HelloWorld
|
|
|
+ }
|
|
|
+}
|
|
|
+</script>
|
|
|
+
|
|
|
+<style>
|
|
|
+#app {
|
|
|
+ font-family: Avenir, Helvetica, Arial, sans-serif;
|
|
|
+ -webkit-font-smoothing: antialiased;
|
|
|
+ -moz-osx-font-smoothing: grayscale;
|
|
|
+ text-align: center;
|
|
|
+ color: #2c3e50;
|
|
|
+ margin-top: 0px;
|
|
|
+>>>>>>> c67f431a476eb0e3cbc3c2abdf3e62ee084bbcd5
|
|
|
}
|
|
|
</style>
|
