Merge branch 'dev' of 139.196.37.202:guan.meihong/aiqiyi-program into dev

@@ -47,7 +47,7 @@ export default {
   }
 
   .fixed-header+.app-main {
-    padding-top: 50px;
+    padding-top: 84px;
   }
 }
 </style>

@@ -193,8 +193,8 @@ export default {
 
 <style lang="scss" scoped>
 .tags-view-container {
-  //height: 34px;
-  height: 0px;
+  height: 34px;
+  //height: 0px;
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;

@@ -6,7 +6,7 @@
       <div :class="{'fixed-header':fixedHeader}">
         <navbar />
         <!--        <tags-view v-if="needTagsView" />-->
-        <tags-view v-if="false" />
+        <tags-view v-if="needTagsView" />
       </div>
       <app-main />
       <right-panel v-if="showSettings">