Merge branch '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);
       }
     }
 

src/views/teamDetail/components/studentList.vue

@@ -146,14 +146,11 @@
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>
         <el-button type="primary" native-type="reset">重置</el-button>
-      </el-form-item>
-      <el-form-item>
         <el-button
           type="primary"
           v-permission="'export/musicGroupStudent'"
           @click="onMusicGroupExport"
-          >导出</el-button
-        >
+          >导出</el-button>
       </el-form-item>
     </save-form>