Merge branch 'dev' of ssh://gitlab.bigaka.net:2287/Caden/common-templete into dev

src/components/Sidebar/index.vue

@@ -32,7 +32,7 @@ export default {
     sidebarItem
   },
   mounted () {
-    new this.$Http(true).get('/getMenus').then(res => {
+    this.axios.get('http://rap2api.taobao.org/app/mock/115626/getMenus').then(res => {
       this.menuList = res.data.data
     })
   },

src/pages/home/index.vue

@@ -30,11 +30,13 @@ export default {
   overflow hidden
 .content-box
   position absolute
-  left 260px
-  right 0
+  display inline-block
+  /*left 260px*/
+  /*right 0*/
   top 70px
   bottom 0
-  overflow-y scroll
+  width 80%
+  /*overflow-y scroll*/
   -webkit-transition left 0.3s ease-in-out
   transition left 0.3s ease-in-out
   background #F3F2F8