魏志佳 4 éve
szülő
commit
8ed0112c38
1 módosított fájl, 0 hozzáadás és 12 törlés
  1. 0 12
      src/views/modules/BatchCreate/components/material.vue

+ 0 - 12
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"
->>>>>>> f4e0df217b9ef19b2ed5afe1a0ae179d92ee4a41
                       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)">选择图片</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>
-=======
                       <a @click="getImageList(item)" v-if="item.imageUrl==''">选择图片</a>
                       <img :src="item.imageUrl" alt="" v-else>
->>>>>>> f4e0df217b9ef19b2ed5afe1a0ae179d92ee4a41
                     </a-form-item>
 
                     <a-form-item label="创意标题" :labelCol="labelCol" :wrapperCol="wrapperCol"