Merge branch 'develop/3.1.4' into test

src/views/content/article/detail.vue

@@ -52,6 +52,7 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column label="当前状态" prop="status" align="center" :formatter="statusFormatter" width="100px" />
           <el-table-column label="操作" align="center" width="100px">
             <template slot-scope="scope">
               <el-button type="delete" @click="getDelete(scope.$index)">删除</el-button>
@@ -183,11 +184,11 @@
 </template>
 
 <script>
-import { platformMixin, isFreeMixin } from '@/mixin/index'
+import { platformMixin, isFreeMixin, disabledMixin } from '@/mixin/index'
 import { detail, submit } from '@/api/content/article'
 import { list } from '@/api/operation/channel'
 export default {
-  mixins: [platformMixin, isFreeMixin],
+  mixins: [platformMixin, isFreeMixin, disabledMixin],
   data() {
     return {
       // 遮罩层
@@ -243,7 +244,6 @@ export default {
       dialogForm: {
         pageNum: 1,
         pageSize: 10,
-        status: 1,
         platformId: null,
         audioType: null
       },
@@ -457,6 +457,10 @@ export default {
 
     platformFormatter(row) {
       return this.selectDictLabel(this.platformOptions, row.platformId)
+    },
+
+    statusFormatter(row) {
+      return this.selectDictLabel(this.disabledOptions, row.status)
     }
   }
 }

src/views/music/album/index.vue

@@ -123,13 +123,16 @@ export default {
     // 列表
     getList() {
       this.loading = true
-      list(this.form).then(res => {
-        if (res.code === 0) {
-          this.tableData = res.data.records
-          this.total = res.data.total
-          this.loading = false
-        }
-      })
+      // 后端延迟
+      setTimeout(() => {
+        list(this.form).then(res => {
+          if (res.code === 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          }
+        })
+      }, 300);
     },
 
     // 搜索

src/views/music/list/index.vue

@@ -123,13 +123,16 @@ export default {
     // 列表
     getList() {
       this.loading = true
-      list(this.form).then(res => {
-        if (res.code === 0) {
-          this.tableData = res.data.records
-          this.total = res.data.total
-          this.loading = false
-        }
-      })
+      // 后端延迟
+      setTimeout(() => {
+        list(this.form).then(res => {
+          if (res.code === 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          }
+        })
+      }, 300);
     },
 
     // 搜索

src/views/music/menu/index.vue

@@ -118,13 +118,16 @@ export default {
     // 列表
     getList() {
       this.loading = true
-      list(this.form).then(res => {
-        if (res.code === 0) {
-          this.tableData = res.data.records
-          this.total = res.data.total
-          this.loading = false
-        }
-      })
+      // 后端延迟
+      setTimeout(() => {
+        list(this.form).then(res => {
+          if (res.code === 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          }
+        })
+      }, 300);
     },
 
     // 搜索