Merge branch 'develop/3.1.4' into test

src/views/content/article/detail.vue

@@ -333,7 +333,9 @@ export default {
 
     // 添加
     getAdd() {
-      this.form.contentShareLayoutList.push({})
+      this.form.contentShareLayoutList.push({
+        layoutType: 0
+      })
     },
 
     // 上传图片
@@ -409,6 +411,7 @@ export default {
         this.$set(e, 'contentPic', row.audioPic)
         this.$set(e, 'contentType', row.audioType)
         this.$set(e, 'platformId', row.platformId)
+        this.$set(e, 'status', row.status)
       } else {
         let e = this.index == -1 ? 'leftButton' : 'rightButton'
         this.$set(this.form, `${e}ContentId`, row.audioId)
@@ -460,7 +463,7 @@ export default {
     },
 
     statusFormatter(row) {
-      return this.selectDictLabel(this.disabledOptions, row.status)
+      return row.layoutType !== 0 ? this.selectDictLabel(this.disabledOptions, row.status) : ''
     }
   }
 }