|
@@ -63,7 +63,7 @@
|
|
|
:bucket="bucket" :accept="acceptImage" :size="102400" :accessKeyId="accessKeyId"
|
|
|
:accessKeySecret="accessKeySecret"></upload-to-ali> -->
|
|
|
<a @click="getImageList(item)" v-if="item.imageUrl==''">选择图片</a>
|
|
|
- <img :src="item.imageUrl" alt="" v-else>
|
|
|
+ <img :src="item.imageUrl" alt="" v-else style="width:120px">
|
|
|
</a-form-item>
|
|
|
|
|
|
<a-form-item label="创意标题" :labelCol="labelCol" :wrapperCol="wrapperCol"
|
|
@@ -108,9 +108,9 @@
|
|
|
|
|
|
|
|
|
<a-range-picker name="buildTime" style="width: 400px;margin:10px 0" v-model="time" />
|
|
|
- <ul v-if="dataSource.length>0" style="overflow:auto;padding-left:0;height:380px">
|
|
|
+ <ul v-if="dataSource.length>0" :style="{height:materialType == 'CREATIVE_IMAGE_MODE_VIDEO'?'200px':'380px'}">
|
|
|
<a-checkbox-group v-model="checkVideo" @change="onChangeVideo" style="width:100%">
|
|
|
- <li v-for="(item,index) of dataSource" :key="index" class="chouzhen" style="padding-bottom:15px">
|
|
|
+ <li v-for="(item,index) of dataSource" :key="index" class="chouzhen" >
|
|
|
|
|
|
<!-- <video class="video" :src="item.url" controls="controls" style="width:100%">
|
|
|
您的浏览器不支持 video 标签。
|
|
@@ -155,9 +155,9 @@
|
|
|
</a-modal>
|
|
|
<a-modal :maskClosable="false" title="选择素材" v-model="visibleMatemalImage" @ok="handleOkShowImage" :width="1000">
|
|
|
<a-range-picker name="buildTime" style="width: 400px;margin:10px 0" v-model="time" />
|
|
|
- <ul v-if="dataSource.length>0" style="overflow:auto;padding-left:0">
|
|
|
+ <ul v-if="dataSource.length>0" style="overflow:auto;padding-left:0;">
|
|
|
<a-checkbox-group v-model="checkVideo" @change="onChangeVideo" style="width:100%">
|
|
|
- <li v-for="(item,index) of dataSource" :key="index" class="chouzhen" >
|
|
|
+ <li v-for="(item,index) of dataSource" :key="index" class="chouzhen" style="height:350px">
|
|
|
|
|
|
<!-- <video class="video" :src="item.url" controls="controls" style="width:100%">
|
|
|
您的浏览器不支持 video 标签。
|
|
@@ -320,10 +320,12 @@
|
|
|
this.ipagination.current = current
|
|
|
}
|
|
|
},
|
|
|
+ isImg:false,
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
getDataSource(page, pageSize) {
|
|
|
+ console.log(this.isImg)
|
|
|
this.ipagination.current = page
|
|
|
var params = {}
|
|
|
params.accountId = "1649600126891015"
|
|
@@ -333,15 +335,16 @@
|
|
|
params.startDate = moment(this.time[0]).format('YYYY-MM-DD')
|
|
|
params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
|
|
|
}
|
|
|
- if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO' || this.materialType ==
|
|
|
- 'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL') {
|
|
|
+ if ((this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO' || this.materialType ==
|
|
|
+ 'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL')&&!this.isImg) {
|
|
|
if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO') {
|
|
|
params.type = 2
|
|
|
} else {
|
|
|
params.type = 1
|
|
|
}
|
|
|
this.showVideoList('/bytedance/batch/getVideoList', params)
|
|
|
- } else {
|
|
|
+ } else if(this.isImg){
|
|
|
+ console.log(this.isImg)
|
|
|
this.showVideoList('/bytedance/batch/getImageList', params)
|
|
|
}
|
|
|
},
|
|
@@ -351,6 +354,8 @@
|
|
|
this.visibleMatemalImage = true
|
|
|
|
|
|
this.ipagination.current = 1
|
|
|
+
|
|
|
+ this.isImg=true;
|
|
|
var params = {}
|
|
|
params.accountId = '1649600126891015'
|
|
|
params.pageSize = this.ipagination.pageSize
|
|
@@ -391,7 +396,7 @@
|
|
|
this.checkVideo = []
|
|
|
this.nowItem = item
|
|
|
this.visibleMatemal = true
|
|
|
-
|
|
|
+ this.isImg=false
|
|
|
this.ipagination.current = 1
|
|
|
var params = {}
|
|
|
params.accountId = '1649600126891015'
|
|
@@ -966,7 +971,10 @@
|
|
|
.opt {
|
|
|
text-align: right;
|
|
|
}
|
|
|
-
|
|
|
+ ul{
|
|
|
+ overflow:auto;
|
|
|
+ padding-left:0
|
|
|
+ }
|
|
|
.chouzhen {
|
|
|
border-style: solid;
|
|
|
border-width: 1px;
|