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

This commit is contained in:
aixianling
2022-06-27 17:56:49 +08:00

View File

@@ -81,9 +81,9 @@
<ai-info-item label="群发内容" :value="item.content" isLine v-if="item.contentType == 'text'"></ai-info-item>
</ai-wrapper>
<ai-wrapper v-for="item in data.fileList" :key="item.id">
<!-- <ai-wrapper v-for="item in data.fileList" :key="item.id">
<ai-info-item label="图片" isLine v-if="item.contentType == 'image'">
<ai-uploader v-model="images" :instance="instance" :limit="1" disabled/>
<ai-uploader v-model="images" :instance="instance" :limit="9" disabled/>
</ai-info-item>
</ai-wrapper>
@@ -97,6 +97,23 @@
<ai-info-item label="附件" isLine v-if="item.contentType == 'file'">
<ai-file-list :fileList="fileDownLoad"></ai-file-list>
</ai-info-item>
</ai-wrapper> -->
<ai-wrapper>
<ai-info-item label="图片" isLine v-show="images.length">
<ai-uploader v-model="images" :instance="instance" :limit="9" disabled/>
</ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="视频" isLine v-show="videoArr.length" v-for="(item,index) in videoArr" :key="index">
<video :src="item.accessUrl" style="width: 100%; height:100%; object-fit: fill;" muted controls="controls"></video>
</ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="附件" isLine v-show="fileDownLoad.length">
<ai-file-list :fileList="fileDownLoad"></ai-file-list>
</ai-info-item>
</ai-wrapper>
</template>
@@ -145,6 +162,7 @@ export default {
images: [],
imgs: [],
videos: [],
videoArr: [],
files: [],
rules: {
deptList: [{required: true, message: '请选择发送范围'}],
@@ -191,8 +209,22 @@ export default {
this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
if (res?.data) {
this.data = res.data
this.images = [{url: res.data.fileList.filter(e => e.contentType == "image")[0]?.accessUrl}]
this.fileDownLoad = [{url: res.data.fileList.filter(e => e.contentType == "file")[0]?.accessUrl}]
// this.images = [{url: res.data.fileList.filter(e => e.contentType == "image").map().accessUrl}]
// this.fileDownLoad = [{url: res.data.fileList.filter(e => e.contentType == "file")[0]?.accessUrl}]
this.images = res.data.fileList.filter(e => e.contentType == "image")?.map(i => {
return {
url: i.accessUrl
}
})
this.fileDownLoad = res.data.fileList.filter(e => e.contentType == "file")?.map(v => {
return {
url: v.accessUrl
}
})
if (res.data.fileList.filter(e => e.contentType == "video")) {
this.videoArr = res.data.fileList.filter(e => e.contentType == "video")
}
}
})
},