From 15648d890d3047636682dc05b237b5c391674c0b Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 30 Mar 2022 11:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=832?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.js                               |  2 +-
 src/views/immediateRelease/index.vue             | 12 +++++++-----
 src/views/materialContent/materialList/index.vue |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 3e1dc64..f68c83d 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -461,7 +461,7 @@ export function setWeekly(str) {
     7: '七'
   }
   if (str) {
-    return str.split(',').map(i => a[i]).join('/')
+    return str.split(',').sort().map(i => a[i]).join('/')
   }
 }
 
diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue
index f97fec5..c836aee 100644
--- a/src/views/immediateRelease/index.vue
+++ b/src/views/immediateRelease/index.vue
@@ -389,7 +389,7 @@ export default {
       ],
       activeIndex: 0,
       activeItemIndex: 0,
-      release_id: null,
+      release_id: null, // 发布编辑
       releaseInfo: null,
       isEditMaterial: []
     }
@@ -540,9 +540,10 @@ export default {
               json.material_name = item.material_name
               json.img_path = item.img_path
               json.file_size = item.file_size
+              console.log(item)
               if (this.release_id) {
                 if (this.isEditMaterial.length != 0) {
-                  if (!item.create_time) {
+                  if (!item.create_time || (!item.classes && item.material_type == 2)) {
                     json.rm_id = null
                   } else {
                     json.rm_id = this.isEditMaterial[index].id
@@ -554,6 +555,7 @@ export default {
               json.ranking = index + 1
               return json
             })
+            console.log(this.form.release_materialDTOs)
             // 判断最外层是否有bgm
             const isBgm = this.selectedMaterial.find(item => {
               return item.material_type == 2
@@ -654,7 +656,7 @@ export default {
       this.contentIds.splice(index, 1)
       this.selectedEditData.splice(index, 1)
       this.selectedMaterial.splice(i, 1)
-      localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
+      // localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
     },
     // 选中可编辑的
     clickMaterialItem(id, item) {
@@ -723,7 +725,7 @@ export default {
           } else {
             this.selectedMaterial.splice(resultIndex, 1, this.audioListData[index])
           }
-          localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
+          // localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
         } else {
           this.selectedEditData[this.thisEditIndex].showAudioName = this.audioListData[index].material_name
           this.selectedEditData[this.thisEditIndex].showAudioUrl = this.audioListData[index].deposit_url
@@ -782,7 +784,7 @@ export default {
       this.selectContVisible = false
       this.selectedMaterial = []
       this.selectedMaterial = this.$refs.MaterialList.selectedMaterial
-      localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
+      // localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
       this.mulitText = '多选'
     },
     // 素材选择 - 取消按钮
diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue
index a5a8d54..dea885f 100644
--- a/src/views/materialContent/materialList/index.vue
+++ b/src/views/materialContent/materialList/index.vue
@@ -351,6 +351,7 @@ export default {
         }
       )
       localStorage.removeItem('selectedMaterial')
+      localStorage.removeItem('releaseId')
       localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
     },
     // 素材 - 编辑