From da5601e78440129e323ad0261f2d0e062ae0b129 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 7 Mar 2023 17:26:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A0=E6=9D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addPropaganda.vue | 99 +++++++++++++--- .../AppCooperationPropaganda/fodderList.vue | 108 +++++++++++++++--- 2 files changed, 172 insertions(+), 35 deletions(-) diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue index a88ce021..be93015e 100644 --- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue +++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue @@ -113,6 +113,8 @@ + +
退出预览
@@ -124,12 +126,15 @@
{{ item.title }}
-
-
- - {{ e.name }} + +
+
+ + {{ e.name }} +
-
+ +
取消
@@ -213,45 +218,104 @@ export default { }, flag: false, uploadList: [ + { + title: '从素材库上传', + list: [ + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-script.png', + name: '话术', + msgType: '0' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', + name: '图片', + msgType: '1' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', + name: '视频', + msgType: '4' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-document.png', + name: '文件', + msgType: '3' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-routine.png', + name: '小程序', + msgType: '2' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png', + name: '网页', + msgType: '5' + }, + ] + }, { title: '从本地上传', list: [ { - icon: 'https://cdn.cunwuyun.cn/dvcp/announce/img.png', + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', name: '图片', msgType: 'image' }, { - icon: 'https://cdn.cunwuyun.cn/dvcp/announce/video.png', + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', name: '视频', msgType: 'video' }, { - icon: 'https://cdn.cunwuyun.cn/dvcp/announce/folder.png', + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-document.png', name: '文件', msgType: 'file' - } + }, ] } ], uploadCircle: [ + { + title: '从素材库上传', + list: [ + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-script.png', + name: '话术', + msgType: '0' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', + name: '图片', + msgType: '1' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', + name: '视频', + msgType: '4' + }, + { + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png', + name: '网页', + msgType: '5' + }, + ] + }, { title: '从本地上传', list: [ { - icon: 'https://cdn.cunwuyun.cn/dvcp/announce/img.png', + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', name: '图片', msgType: 'image' }, { - icon: 'https://cdn.cunwuyun.cn/dvcp/announce/video.png', + icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', name: '视频', msgType: 'video' }, ] } ], - // upload: [], midiaIds: [], sum: null, // 筛选条件 @@ -357,6 +421,8 @@ export default { uni.chooseVideo(params) } else if(type == 'file') { uni.chooseFile(params) + } else { + uni.navigateTo({url: `./fodderList?type=${this.type}&msgType=${type}`}) } } else { this.$u.toast(`不能超过9个`) @@ -864,24 +930,23 @@ export default { } .uploadPopup { - + width: 100%; background: #F7F7F7; .upload_card { padding: 32px 32px 0 32px; box-sizing: border-box; - overflow-x: scroll; .upload_item { margin-bottom: 32px; } .upload_list { - overflow-x: scroll; - display: flex; - .list_item { text-align: center; width: 106px; height: 140px; + display: flex; + flex-wrap: nowrap; + .lists_item { margin-right: 48px; img { display: inline-block; diff --git a/src/project/huizhili/AppCooperationPropaganda/fodderList.vue b/src/project/huizhili/AppCooperationPropaganda/fodderList.vue index 6cd3cbe0..3e8dd182 100644 --- a/src/project/huizhili/AppCooperationPropaganda/fodderList.vue +++ b/src/project/huizhili/AppCooperationPropaganda/fodderList.vue @@ -1,31 +1,34 @@ @@ -35,21 +38,67 @@ export default { name: "fodderList", data() { return { - keyword: '', + mstType: null, + current: 1, + title: '', + type: '', + list: [], + checkedList: [], + typeArr: ['话术','图片','小程序','文件','视频','网页'] } }, methods: { - + getList() { + this.$http.post(`/app/appmaterialinfo/listByMST`,null,{ + params: { + mstType: this.mstType, + current: this.current, + title: this.title, + type: this.type, + } + }).then(res=> { + if(res?.data) { + this.list = res.data.records.map(e=> { + return { + ...e, + isChecked: this.checkedList.map(i=> i.id==e.id), + } + }) + } + }) + }, + submit() { + if (!this.checkedList.length) { + return this.$u.toast(`请选择${this.typeArr[this.mstType]}`) + } + uni.$emit("fodder", [this.selected]) + uni.setStorageSync('checkedList', this.checkedList) + uni.navigateBack() + } }, - onShow() { - + onLoad(o) { + if(o.type == 'CircleOfFriends') { + this.mstType = 1 + } else if(o.type == 'Residents') { + this.mstType = 2 + } else if (o.type == 'ResidentsGroup') { + this.mstType = 0 + } + this.type = o.msgType + this.checkedList = uni.getStorageSync('checkedList') || [] + this.getList() }, - + onReachBottom() { + this.current ++ + this.getList() + } } \ No newline at end of file