Merge remote-tracking branch 'origin/dev' into dev

zxl

6 天以前 9797e46619f64bddb78d4b4eaa03d53069ac2ba4

 manager/src/views/video/VideoList.vue

@@ -954,13 +954,19 @@
        this.videoTagList = res.data;
      })
      this.upLoadVideoShow = true;
      console.log('--------------------->',row.tagList)
      if (row.tagList){
      this.chooseTag = row.tagList.map(item => {
        return item.tagName
      })
      }
      console.log('选中列表---》',row.goodsList)
      if (row.goodsList){
      row.goodsList.forEach(item => {
        item.goodsSkuId = item.id
      })
      }

      this.uploadVideoForm = {
        id: '',
        title: '',
@@ -977,6 +983,7 @@
      }


      if (row.tagList){
      // 遍历已选择的标签
      row.tagList.forEach(tag => {
        // 检查标签是否已存在于videoTagList中
@@ -989,6 +996,8 @@
          });
        }
      });
      }

      this.uploadVideoForm = row
      console.log("打印值",this.uploadVideoForm)
      this.uploadVideoForm.fileInfo= {};