ttt

frontHu · Sep 28, 2018 · ab82580 · ab82580
2 parents e5acaa0 + d16215a
commit ab82580
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,21 +1,9 @@
-# backend
+#### 博客网站后台管理系统 
+一个自己的博客后台管理系统，目前做的比较粗糙，只做了一个博客内容提交功能， 关于博客的管理功能暂未开始动手。
 
-## Project setup
-```
-npm install
-```
+#### 登录页展示
 
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
+![](http://img1.timeface.cn/times/747b92248451be68e7dc40534ec7538c.png)
 
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Lints and fixes files
-```
-npm run lint
-```
+#### 博客页
+![](http://img1.timeface.cn/times/b82fc632cce48c3c8ba508f1bb2a4b1c.png)
diff --git a/src/App.vue b/src/App.vue
@@ -13,8 +13,13 @@ html, body {
   width: 100%;
   height: 100%;
   color: #606c71;
+<<<<<<< HEAD
   padding: 0;
   margin: 0;
+=======
+  margin: 0;
+  padding: 0;
+>>>>>>> d16215af17cfb3a79a7a3966247330113288389c
 }
 #app {
   width: 100%;