Merge branch 'develop/3.0.6' into test

src/views/music/album/detail.vue

@@ -36,7 +36,7 @@
       <el-form-item label="歌曲列表：" style="width: 1000px;">
         <el-button type="primary" icon="el-icon-plus" @click="getDialog">添加歌曲</el-button>
         <!-- 列表 -->
-        <el-table class="table" :data="form.programList" height="329px" v-loading="form_loading">
+        <el-table :data="form.programList" height="329px" v-loading="form_loading">
           <el-table-column label="ID" prop="id" align="center" />
           <el-table-column label="歌曲名称" prop="name" align="center" show-overflow-tooltip />
           <el-table-column label="歌手名称" prop="singerName" align="center" show-overflow-tooltip />
@@ -324,9 +324,4 @@ export default {
 .form-btn {
   margin-top: 20px;
 }
-
-.table {
-  width: calc(100% - 100px);
-  margin-left: 100px;
-}
 </style>