From e438887aa80970711a537be92ebb7f798a0f5b3a Mon Sep 17 00:00:00 2001
From: Mouse <mouse0w0@qq.com>
Date: Sat, 27 Mar 2021 22:12:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 002.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 002.txt

diff --git a/002.txt b/002.txt
new file mode 100644
index 0000000..95d09f2
--- /dev/null
+++ b/002.txt
@@ -0,0 +1 @@
+hello world
\ No newline at end of file
-- 
Gitee


From 73342263e3df6864c3ac3a9a6688defce8b92597 Mon Sep 17 00:00:00 2001
From: Sunruiyan <2358274283@qq.com>
Date: Thu, 1 Apr 2021 15:43:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E2=80=9C=E6=AF=8F?=
 =?UTF-8?q?=E6=97=A5=E4=B8=80=E5=8F=A5=E2=80=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js       |  2 ++
 src/view/Home.vue | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main.js b/src/main.js
index 3ac0fe9..e44259c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,6 +9,8 @@ import 'element-ui/lib/theme-chalk/index.css'
 
 import router from './router'
 // import store from './store'
+import '@/asset/app.css'
+
 
 Vue.use(Buefy)
 Vue.use(ElementUI)
diff --git a/src/view/Home.vue b/src/view/Home.vue
index c0f7fa2..ff1a327 100644
--- a/src/view/Home.vue
+++ b/src/view/Home.vue
@@ -3,14 +3,25 @@
       <div class="box">
           {{billboard.content}}
       </div>
+      <div class="columns">
+      <div class="column is-three-quarters">
+        <TopicList></TopicList>
+      </div>
+      <div class="column">
+        <CardBar></CardBar>
+      </div>
+      </div> 
   </div>
 </template>
 
 <script>
 import {getBillboard} from '@/api/billboard'
+import CardBar from "@/view/card/CardBar"
+import PostList from "@/view/post/index"
 
 export default {
   name: 'Home',
+  components: {CardBar, TopicList: PostList},
   data() {
       return {
           billboard: {
-- 
Gitee