Merge branch '01/21VipReset' into pre_online

src/layout/components/TagsView.vue

@@ -164,7 +164,7 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
     .tags-view-item {
-      width: 120px;
+      min-width: 120px;
       .icon {
         font-size: 20px;
         position: relative;

src/styles/sidebar.scss

@@ -44,7 +44,7 @@
 
     &.has-logo {
       .el-scrollbar {
-        height: calc(100% - 60px);
+        height: calc(100% - 80px);
       }
     }