From 6bee9d53e3103c2f66623e1fa41daa234ad1e192 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 8 Mar 2023 10:09:12 +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 --- .../AppCooperationPropagandaBeta.vue | 1 + .../addPropaganda.vue | 74 +++++++++++++++---- .../AppCooperationPropaganda/detail.vue | 4 +- .../AppCooperationPropaganda/fodderList.vue | 29 ++++---- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue index f6c1a29f..3f30331f 100644 --- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue +++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue @@ -161,6 +161,7 @@ export default { uni.removeStorageSync('startTime') uni.removeStorageSync('endTime') uni.removeStorageSync('selectDeptUser') + uni.removeStorageSync('checkedList') this.$dict.load('mstStatus').then(() => { this.getList() }) diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue index a3d4a28e..1db9c9b7 100644 --- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue +++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue @@ -35,7 +35,8 @@
添加素材
-
+ +
@@ -44,7 +45,20 @@
{{ item.name }}
{{ item.fileSizeStr }}
-
删除
+
删除
+
+
+ +
+
+
+ +
+
+
{{ item.title }}
+
{{ item.fileSizeStr }}
+
+
删除
@@ -96,7 +110,7 @@
{{ content }}
- +
@@ -112,9 +126,22 @@
- - - + +
+ + + +
+
+

{{ item.title }}

+

{{ item.fileSizeStr }}

+

{{ item.linkUrl }}

+
+
+ +
+
+
退出预览
@@ -327,6 +354,15 @@ export default { circleTagsRemove: [], // 朋友圈剔除 startTime: '', endTime: '', + checkedList: [], + sucaiIcon: [ + 'https://cdn.cunwuyun.cn/dvcp/announce/ic-script.png', + 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', + 'https://cdn.cunwuyun.cn/dvcp/announce/ic-routine.png', + 'https://cdn.cunwuyun.cn/dvcp/announce/ic-document.png', + 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', + 'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png', + ] } }, methods: { @@ -371,12 +407,8 @@ export default { return name.substring(name.lastIndexOf('.')) }, - getExamines(e) { - console.log(e); - }, - uploadBtn(type) { - let count = 9 - (this.files?.length || 0) + let count = 9 - (this.files?.length || 0) - (this.checkedList?.length || 0) if(count > 0){ let params = { count, @@ -423,6 +455,7 @@ export default { uni.chooseFile(params) } else { uni.navigateTo({url: `./fodderList?type=${this.type}&msgType=${type}`}) + this.showUpload = false } } else { this.$u.toast(`不能超过9个`) @@ -464,6 +497,12 @@ export default { remove(index) { this.files.splice(index, 1) + + }, + + removeSucai(index) { + this.checkedList.splice(index, 1) + uni.setStorageSync("checkedList", this.checkedList) }, choiceTime(e) { @@ -497,7 +536,7 @@ export default { ] this.form.contents.push(...firstContent) // 图片 - const picUrl = this.files.filter(i=> ['.jpg','.jpeg','.png'].indexOf(this.getExtension(i.name)) == 1).map(e=>{ + const picUrl = this.files.filter(i=> ['.jpg','.jpeg','.png'].indexOf(this.getExtension(i.name)) !== -1).map(e=>{ return { imgPicUrl: e.url, msgType: '1', @@ -506,7 +545,7 @@ export default { }) this.form.contents.push(...picUrl) // 视频 - const video = this.files.filter(i=> ['.mp4'].indexOf(this.getExtension(i.name)) == 1).map(e=>{ + const video = this.files.filter(i=> ['.mp4'].indexOf(this.getExtension(i.name)) !== -1).map(e=>{ return { imgPicUrl: e.url, msgType: '2', @@ -524,6 +563,10 @@ export default { }) this.form.contents.push(...files) + if(this.checkedList.length) { + this.form.contents.push(...this.checkedList) + } + if(this.type=='Residents' || this.type=='CircleOfFriends') { this.forms.contents = this.form.contents this.forms.taskTitle = this.form.taskTitle @@ -609,6 +652,7 @@ export default { uni.removeStorageSync('startTime') uni.removeStorageSync('endTime') uni.removeStorageSync('selectDeptUser') + uni.removeStorageSync('checkedList') }, }, @@ -694,6 +738,10 @@ export default { } }) }) + uni.$on("fodder",()=> { + this.checkedList = uni.getStorageSync('checkedList') + }) + this.checkedList = uni.getStorageSync('checkedList') } } diff --git a/src/project/huizhili/AppCooperationPropaganda/detail.vue b/src/project/huizhili/AppCooperationPropaganda/detail.vue index d96b7d50..5ec11c1f 100644 --- a/src/project/huizhili/AppCooperationPropaganda/detail.vue +++ b/src/project/huizhili/AppCooperationPropaganda/detail.vue @@ -142,8 +142,8 @@ export default { this.webpage = res.data.contents.filter(v=> v.msgType == 4) this.miniapp = res.data.contents.filter(v=> v.msgType == 5) this.approver = res.data.examines - this.resSum = res.data.groupList.reduce((pre, cur) => pre + cur.customerCount, 0) - this.cirSum = res.data.executorList.reduce((pre, cur) => pre + cur.customerCount, 0) + this.resSum = res.data.groupList?.reduce((pre, cur) => pre + cur.customerCount, 0) + this.cirSum = res.data.executorList?.reduce((pre, cur) => pre + cur.customerCount, 0) // if(res.data.status==1) { // 拒绝 // this.approver = res.data.examines.filter(e=> e.examineStatus == 2) // } else { // 通过 diff --git a/src/project/huizhili/AppCooperationPropaganda/fodderList.vue b/src/project/huizhili/AppCooperationPropaganda/fodderList.vue index 49e4b634..7e28de4c 100644 --- a/src/project/huizhili/AppCooperationPropaganda/fodderList.vue +++ b/src/project/huizhili/AppCooperationPropaganda/fodderList.vue @@ -1,7 +1,7 @@