From 23410184b393a2d2142921fa3c4636713d865821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 4 Jul 2024 10:09:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=B8=83=E5=9C=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/comPromotion/add.vue | 16 +++++++++++++++- .../communityParty/comPromotion/index.vue | 4 ++-- src/views/modules/plugins/rent/upload-image.vue | 10 +++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index 80c492d7a..214225974 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -25,7 +25,7 @@ @@ -90,6 +90,7 @@ export default { sendMsg: 0,//是否推送 top: 0,//是否置顶 status: 0 //状态 + } return _form @@ -121,6 +122,7 @@ export default { serviceList: [], // gridList: [], agencyId: '', + agencyName:"", demandOptions: [], uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2', @@ -130,11 +132,19 @@ export default { }, components: { Tinymce, UploadImage }, mounted() { + this.agencyName=this.$store.state.user.agencyName, + this.agencyId=this.$store.state.user.agencyId, this.advertisingTag() }, methods: { + handleFileRemoved(file) { + // 处理从子组件接收到的删除文件的信息 + console.log('File removed:', file); + this.formData.coverPic="" + // 例如，可以在这里更新父组件的文件列表或执行其他操作 + }, // 获取广告标签 advertisingTag(){ @@ -251,11 +261,14 @@ export default { }, 10000) this.$refs['ref_form'].validate((valid, messageObj) => { + this.formData.agencyName= this.agencyName + this.formData.agencyId= this.agencyId console.log("this.formData看看里面村的什么",this.formData) if (!valid) { app.util.validateRule(messageObj) this.btnDisable = false } else { + this.addActivity() } }) @@ -264,6 +277,7 @@ export default { if (this.formType === 'edit') { let url = '/actual/base/communityPublicity/update' this.formData.sendMsg= this.formData.sendMsg? 1:0 + const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue index 87cf54560..51eac7a7a 100644 --- a/src/views/modules/communityParty/comPromotion/index.vue +++ b/src/views/modules/communityParty/comPromotion/index.vue @@ -53,13 +53,13 @@ {{ scope.row.status === 1 ? '已下线' : '已发布' }} - + diff --git a/src/views/modules/plugins/rent/upload-image.vue b/src/views/modules/plugins/rent/upload-image.vue index 5791c78ae..0e06070d9 100644 --- a/src/views/modules/plugins/rent/upload-image.vue +++ b/src/views/modules/plugins/rent/upload-image.vue @@ -15,7 +15,7 @@
- + @@ -73,6 +73,11 @@ export default { console.log('xxxxxx', this.rowIndex) }, methods: { + handleFileRemoved(file) { + // 处理从子组件接收到的删除文件的信息 + console.log('File removed:', file); + // 例如，可以在这里更新父组件的文件列表或执行其他操作 + }, handleRemove(file) { const delFile = file.url this.fileList.forEach((item, key) => { @@ -80,7 +85,10 @@ export default { this.fileList.splice(key, 1) } }) + this.$emit('file-removed', file); + console.log(this.fileList); }, + handlePictureCardPreview(file) { this.dialogImageUrl = file.url this.dialogVisible = true From 6fdec0784a5a8cba070dab748d9682f34a98b56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 4 Jul 2024 10:46:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/upload-image.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/modules/plugins/rent/upload-image.vue b/src/views/modules/plugins/rent/upload-image.vue index 0e06070d9..eb14222d1 100644 --- a/src/views/modules/plugins/rent/upload-image.vue +++ b/src/views/modules/plugins/rent/upload-image.vue @@ -15,7 +15,7 @@
- + @@ -73,11 +73,6 @@ export default { console.log('xxxxxx', this.rowIndex) }, methods: { - handleFileRemoved(file) { - // 处理从子组件接收到的删除文件的信息 - console.log('File removed:', file); - // 例如，可以在这里更新父组件的文件列表或执行其他操作 - }, handleRemove(file) { const delFile = file.url this.fileList.forEach((item, key) => { From e6ce5001710205f45bacb0061e07e6566e49585b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 5 Jul 2024 13:53:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E5=AE=9E=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/activity/eventDetails.vue | 66 +++++++++++++------ .../communityParty/comPromotion/add.vue | 1 - .../communityParty/comPromotion/event.vue | 4 +- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue index 25825e9d8..fae8220b7 100644 --- a/src/views/modules/communityParty/activity/eventDetails.vue +++ b/src/views/modules/communityParty/activity/eventDetails.vue @@ -87,24 +87,24 @@
报名名单
- + - - - - - + @@ -117,23 +117,23 @@
活动实况
- + - - -