zhuxinbo 4 years ago
parent
commit
f4e0df217b
1 changed files with 2 additions and 16 deletions
  1. 2 16
      src/views/modules/BatchCreate/components/material.vue

+ 2 - 16
src/views/modules/BatchCreate/components/material.vue

@@ -57,25 +57,13 @@
                       </div>
                     </a-form-item>
 
-<<<<<<< HEAD
                     <a-form-item label="封面上传" :labelCol="labelCol" :wrapperCol="wrapperCol"
-=======
-                    <a-form-item label="选择封面" :labelCol="labelCol" :wrapperCol="wrapperCol"
->>>>>>> 8ccaf7354dc64fe0bbf705099e1993a7c3904270
                       v-if="(materialType=='CREATIVE_IMAGE_MODE_VIDEO_VERTICAL'||materialType=='CREATIVE_IMAGE_MODE_VIDEO')">
                       <!-- <upload-to-ali v-model="item.imageUrl" :customDomain="customDomain" preview :region="region"
                         :bucket="bucket" :accept="acceptImage" :size="102400" :accessKeyId="accessKeyId"
                         :accessKeySecret="accessKeySecret"></upload-to-ali> -->
-<<<<<<< HEAD
                       <a @click="getImageList(item)" v-if="item.imageUrl==''">选择图片</a>
                       <img :src="item.imageUrl" alt="" v-else>
-=======
-                      <a @click="getImageList(item)">选择图片</a>
-                      <div>
-                        <!-- <img :src="item.imageUrl" style="width:300px" v-show="materialType=='CREATIVE_IMAGE_MODE_VIDEO'&&item.videoUrl" />
-                        <img :src="item.videoUrl" style="width:120px"  v-show="materialType=='CREATIVE_IMAGE_MODE_VIDEO_VERTICAL'&&item.videoUrl" /> -->
-                      </div>
->>>>>>> 8ccaf7354dc64fe0bbf705099e1993a7c3904270
                     </a-form-item>
 
                     <a-form-item label="创意标题" :labelCol="labelCol" :wrapperCol="wrapperCol"
@@ -353,7 +341,6 @@
         }
       },
       getImageList(item) {
-        console.log(item)
         this.checkVideo = []
         this.nowItem = item
         this.visibleMatemalImage = true
@@ -412,9 +399,9 @@
         if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO' || this.materialType ==
           'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL') {
           if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO') {
-            params.type = 2
-          } else {
             params.type = 1
+          } else {
+            params.type = 0
           }
 
           this.showVideoList('/bytedance/batch/getVideoList', params)
@@ -428,7 +415,6 @@
         this.loadingVideoList = true
 
         getAction(url, params).then(res => {
-          console.log(res)
           if (res.success) {
             this.dataSource = res.result.records
             this.ipagination.total = res.result.total