Merge branch 'master' of https://gitee.com/wjl2008_admin/tougao_web into zy-email

src/components/common/Home.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="wrapper">
         <v-head></v-head>
-        <v-sidebar></v-sidebar>
+       
+        <v-sidebar ></v-sidebar>
         <div class="content-box" :class="{ 'content-collapse': collapse }">
             <v-tags></v-tags>
             <div class="content">
@@ -34,10 +35,12 @@ export default {
         vTags
     },
     created() {
-        if(this.$route.meta.hideSidebar){
-				this.collapse=false
+        if(!this.$route.meta.hideSidebar){
+				this.collapse=true
 				
-			}
+			}else{
+                this.collapse=false
+            }
         bus.$on('collapse-content', (msg) => {
             this.collapse = msg;
             localStorage.setItem('collapse', this.collapse);