From 7a63d38397296a764f0c6d7202f13546e5c452a9 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: Wed, 10 Jul 2024 14:05:28 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/activity/index.vue | 12 +- .../activity/initiateActivity.vue | 10 +- .../communityParty/comPromotion/add.vue | 106 ++++++++++++------ .../communityParty/comPromotion/index.vue | 2 +- 4 files changed, 85 insertions(+), 45 deletions(-) diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue index 1a07a293d..594abf225 100644 --- a/src/views/modules/communityParty/activity/index.vue +++ b/src/views/modules/communityParty/activity/index.vue @@ -181,7 +181,7 @@ gridList: [],//所属网格 unitList: [], statuslist: [ - { value: 0, label: '未进行' }, + { value: 0, label: '未开始' }, { value: 1, label: '进行中' }, { value: 2, label: '已结束' }, { value: 3, label: '已取消' } @@ -250,7 +250,7 @@ getStatusText(status) { switch (status) { case 0: - return '未进行'; + return '未开始'; case 1: return '进行中'; case 2: @@ -285,8 +285,8 @@ const url = "/actual/base/communityActivity/page"; let params = { - // pageSize: this.pageSize, - //pageNo: this.pageNo, + pageSize: this.pageSize, + pageNo: this.pageNo, agencyId: this.agencyId, ...this.formData, }; @@ -395,7 +395,7 @@ const url = "/actual/base/activityType/page" let params = { // agencyId: this.agencyId - pageSize: 20, + pageSize: 10, pageNo: 1, typeName: "", enabled: 0 @@ -597,7 +597,7 @@ address: "", assistingParty: "" } - this.pageSize = 20 + this.pageSize = 10 this.pageNo = 1 // this.loadTable() this.communityActivityList() diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue index 1401b0169..88a98cd44 100644 --- a/src/views/modules/communityParty/activity/initiateActivity.vue +++ b/src/views/modules/communityParty/activity/initiateActivity.vue @@ -82,7 +82,7 @@
- @@ -126,8 +126,8 @@
- + @@ -137,7 +137,7 @@ - @@ -733,7 +733,7 @@ export default { online: 0,//开关 cutOffTime: "",//截止时间 points: 0,//积分 - participants: 1,//活动人数 + participants: 0,//活动人数 sendMessage: 0,//推送数 sumUp: "",//活动总结 activityImgs: [],//图片列表 diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index 88e05adad..156f9cb3f 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -36,14 +36,12 @@
- - + + - - - - + + @@ -80,21 +78,21 @@ var geocoder // 新建一个正逆地址解析类 let loading // 加载动画 export default { data() { - let initFormData = () => { - let _form = { - title: "",//标题 - content: "",//内容 - tagId: "",//标签id - coverPic: "",//封面图 - releaseTime: "",//发布时间 - sendMsg: 0,//是否推送 - top: 0,//是否置顶 - status: 0 //状态 + // let initFormData = () => { + // let _form = { + // title: "",//标题 + // content: "",//内容 + // tagId: "",//标签id + // coverPic: "",//封面图 + // releaseTime: "",//发布时间 + // sendMsg: 0,//是否推送 + // top: 0,//是否置顶 + // status: 0 //状态 - } + // } - return _form - } + // return _form + // } return { adverTagList:[], @@ -118,11 +116,21 @@ export default { keyWords: '', activityId: '', - formData: initFormData(), + formData: { + title: "",//标题 + content: "",//内容 + tagId: "",//标签id + coverPic: "",//封面图 + releaseTime: "",//发布时间 + sendMsg: false,//是否推送 + top: false,//是否置顶 + status: 0 //状态 + }, serviceList: [], // gridList: [], agencyId: '', agencyName:"", + releaseTime: '', demandOptions: [], uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2', @@ -134,11 +142,15 @@ export default { mounted() { this.agencyName=this.$store.state.user.agencyName, this.agencyId=this.$store.state.user.agencyId, - this.advertisingTag() + this.advertisingTag() + this.setDefaultReleaseTime(); }, methods: { + checkbox1(val){ + console.log(val); + }, handleFileRemoved(file) { // 处理从子组件接收到的删除文件的信息 console.log('File removed:', file); @@ -164,10 +176,10 @@ export default { if(row!=null){ this.formData = JSON.parse(JSON.stringify(row)); } - this.formType=typeid - console.log(this.formData); + console.log(this.formData,"5164"); this.endLoading(); + this.setDefaultReleaseTime() }, async advertisingTag () { const url = "/actual/base/advertisingTag/page" @@ -187,11 +199,13 @@ export default { } }, handleOnlineRegistration(value) { - // console.log(value) - if (value) { - this.formData.top = 0; - } else { - this.formData.top = 1; + console.log(this.fileList); + if( value && this.fileList.length==0){ + console.log("51545"); + this.$message.error("置顶需上传封面图片") + this.formData.top = false; + + } }, @@ -250,6 +264,7 @@ export default { this.$refs['ref_form'].validate((valid, messageObj) => { this.formData.agencyName= this.agencyName this.formData.agencyId= this.agencyId + this.formData.status= 0 console.log("this.formData看看里面村的什么",this.formData) if (!valid) { app.util.validateRule(messageObj) @@ -264,7 +279,9 @@ export default { if (this.formType === 'edit') { let url = '/actual/base/communityPublicity/update' this.formData.sendMsg= this.formData.sendMsg? 1:0 - + this.formData.top= this.formData.top? 1:0 + console.log(this.formData.top); + console.log(this.formData,"formData"); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ @@ -283,6 +300,7 @@ export default { let url = '/actual/base/communityPublicity/save' console.log(this.formData,"formData"); this.formData.sendMsg= this.formData.sendMsg? 1:0 + this.formData.top= this.formData.top? 1:0 const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ @@ -302,7 +320,6 @@ export default { }, handleCancle() { - this.resetData() this.$emit('dialogCancle') @@ -310,7 +327,7 @@ export default { resetData() { this.fileList = [] - this.top = false + this.top = 0 this.formType = '' this.formData = { @@ -331,7 +348,29 @@ export default { if (loading) { loading.close() } - } + }, + setDefaultReleaseTime() { + const currentDate = new Date(); + const formattedDate = this.formatDate(currentDate, 'yyyy-MM-dd HH:mm:ss'); + this.formData.releaseTime = formattedDate; + }, + formatDate(date, format) { + const pad = (n) => (n < 10 ? '0' + n : n); + const year = date.getFullYear(); + const month = pad(date.getMonth() + 1); + const day = pad(date.getDate()); + const hours = pad(date.getHours()); + const minutes = pad(date.getMinutes()); + const seconds = pad(date.getSeconds()); + return format + .replace('yyyy', year) + .replace('MM', month) + .replace('dd', day) + .replace('HH', hours) + .replace('mm', minutes) + .replace('ss', seconds); + } + }, computed: { dataRule() { @@ -348,7 +387,8 @@ export default { ], tagId: [ { required: true, message: '请选择文章标签', trigger: 'blur' } - ] + ], + } }, diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue index 8f7ba9a07..8b0f55ab4 100644 --- a/src/views/modules/communityParty/comPromotion/index.vue +++ b/src/views/modules/communityParty/comPromotion/index.vue @@ -87,7 +87,7 @@ -