From 76a5c7b4c7892055e52b7949a8d0e9950dbe93ab Mon Sep 17 00:00:00 2001 From: wangzimeng <3297159934@qq.com> Date: Fri, 11 Jul 2025 18:25:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8A=AC=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AF=B9=E5=AE=8C=E4=BA=86=E5=92=8C=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E8=8D=89=E7=A8=BF=E7=AE=B1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E7=BC=96=E8=BE=91=E8=8D=89=E7=A8=BF=E7=AE=B1?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=86=85=E5=8D=8F=E8=AE=AE=E6=8C=89=E9=92=AE=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=BA=AE=E8=B5=B7=E6=9D=A5=EF=BC=9B=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=AE=B1=E9=87=8C=E7=BC=96=E8=BE=91=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=A1=AB=E6=B4=BB=E5=8A=A8=E5=88=86=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E7=A1=AE=E8=AE=A4=E5=8F=91=E5=B8=83=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E2=80=9C=E5=B9=B3=E5=8F=B0=E5=88=86=E7=B1=BB=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E2=80=9D=E7=9A=84=E6=8F=90=E7=A4=BA=EF=BC=9B=E4=B8=8D?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BE=A4=E4=BA=8C=E7=BB=B4=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E4=B8=8A=E4=BC=A0=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/my/exercise.vue | 11 +- packageA/my/person-detail.vue | 4 +- packageB/editAct.vue | 428 ++++++++++++-------------- packageB/editDraft.vue | 44 ++- packageB/invoice/addHead.vue | 467 +++++++++++++++++++++++------ packageB/invoice/addInvoice.vue | 17 +- packageB/invoice/invoiceCenter.vue | 230 +++++++++----- packageB/invoice/invoiceInfo.vue | 28 +- pages/center/index.vue | 3 +- 9 files changed, 795 insertions(+), 437 deletions(-) diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index 40a9a70..aad2ea1 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -58,11 +58,11 @@ @click="toPay(item.id, item.order_no)">去支付 核销码 - + 开票中 + 查看开票 查看详情 @@ -252,8 +252,9 @@ }, //申请发票 toAddInvoic(id, order_no) { + const num = 1 uni.navigateTo({ - url: '/packageB/invoice/addInvoice?id=' + id + "&order_no=" + order_no + url: '/packageB/invoice/addInvoice?id=' + id + "&order_nos=" + order_no + "&num=" + num }) }, //查看发票 diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue index 1a0c132..7d63736 100644 --- a/packageA/my/person-detail.vue +++ b/packageA/my/person-detail.vue @@ -56,12 +56,12 @@ - + 身份信息 diff --git a/packageB/editAct.vue b/packageB/editAct.vue index 193d91f..0c9f2e3 100644 --- a/packageB/editAct.vue +++ b/packageB/editAct.vue @@ -223,14 +223,14 @@ 确认 - {{ item.title }} - @@ -325,6 +325,7 @@ 确定选择 + @@ -581,14 +582,11 @@ //活动转换的时间 times_b: '', //开始时间 times_e: '', //结束时间 - times_b_int: '', //开始时间 times_e_int: '', //结束时间 - //报名转换的时间 times_sinb: '', //开始时间 times_sine: '', //结束时间 - times_sinb_int: '', //开始时间 times_sine_int: '', //结束时间 @@ -608,28 +606,6 @@ loadStatus: "loading", selectHeadIndex: null, draftSelectIndex: null, - selectDradtForm: { - cate_ids: '', - // 活动分类名字 - cate_idsName: "", - content: '', - refund_id: '', - refund_idn: '', - price: '', - stock: '', - sign_time: '', - time: '', - images: '', - title: '', - address: '', - latitude: '', - longitude: '', - address_detail: '', //详细位置 - date: dayjs().add(4, 'hour').valueOf(), //活动开始时间 - date1: dayjs().add(8, 'hour').valueOf(), //活动结束时间 - birth: dayjs().add(4, 'hour').valueOf(), //报名开始日期 - birth1: dayjs().add(8, 'hour').valueOf(), //报名结束日期 - }, draftId: null, baoDraftShow: false, draftCount: 0, @@ -664,10 +640,6 @@ this.isFormValid = false this.getDetail() } - // if(this.original_activity_id){ - - // } - // this.getDraftList(); //var c=uni.getSystemInfoSync(); //844-94-70-100 = 580 @@ -678,7 +650,7 @@ onShow() { this.draftList = []; this.show = false; - this.getCardInfo(); + // this.getCardInfo(); this.getDraftList(); }, filters: { @@ -712,16 +684,14 @@ }, // 获取详情 getDetail() { - // uni.switchTab({ - // url: - // })//跳转tabbar页面的 uni.$u.http.get('/api/school.new_activity/detail', { params: { id: this.id || this.original_activity_id, } }).then(res => { if (res.code == 1) { - this.form = res.data.detail + this.form = res.data.detail; + // this.form.cate_ids = res.data.detail.cate_ids; console.log('cate_ids', this.form.cate_ids); this.form.cate_idsName = this.form.classes_cate.join(','); const idBqSet = new Set(this.form.cate_ids); @@ -732,22 +702,16 @@ return acc; }, []); console.log('bqArray', bqArray); - // let arrIdsName = bqArray.map((item) => { - // return item.name - // }) - // this.form.cate_idsName = arrIdsName.join(','); - console.log('cate_idsName', this.form.cate_idsName); - this.list = bqArray - console.log('getDetail list', this.list); - this.form.cate_ids = res.data.detail.cate_ids; - console.log('cate_ids', this.form.cate_ids); + this.list = bqArray; + console.log('getDetail——list', this.list); + this.form.content = this.form.content.replace(/<[^>]+>/g, ''); // 输出: "运动" this.value_slide = res.data.detail.join_info.percent; this.price = this.form.price this.priceDo() - + //退款类名 this.form.refund_idn = this.form.refund_info.title; // 转换为 fileList 格式 this.fileList1 = this.form.images.map(url => ({ @@ -764,23 +728,18 @@ message: '' }) this.QunQrcode1 = this.qunQrcode - - // formatDate(dateStr) { - // if (!dateStr) return ''; - // return dateStr.slice(5, 16); - // } - // this.times_b_int = this.form.start_time_text - // this.times_e_int = this.form.end_time_text - // res.data.detail + // console.log('qunQrcode', this.qunQrcode); + this.currents = this.form.refund_id; + //活动时间 const time_start = this.form.start_time_text.slice(5, 16) const time_end = this.form.end_time_text.slice(5, 16) this.form.time = time_start + ' - ' + time_end - + //报名时间 const signTime_start = this.form.sign_start_time_text.slice(5, 16) const signTime_end = this.form.sign_end_time_text.slice(5, 16) this.form.sign_time = signTime_start + ' - ' + signTime_end - console.log('qunQrcode', this.qunQrcode); + if (!this.original_activity_id) { //编辑情况 this.times_b_int = this.form.start_time_text @@ -788,6 +747,7 @@ this.times_sinb_int = this.form.sign_start_time_text this.times_sine_int = this.form.sign_end_time_text } else { + //重发 this.times_b_int = '' this.times_e_int = '' this.times_sinb_int = '' @@ -796,6 +756,7 @@ this.form.time = '' } if (this.type == 2) { + //已取消重发 this.form.title = '' } @@ -810,7 +771,7 @@ } }).catch(error => {}); }, - //草稿箱 + //草稿箱详情 getDraftDetail() { console.log('getDraftDetail', this.draftId); uni.$u.http.get('/api/school.newactivity.activity_drafts/detail', { @@ -820,11 +781,9 @@ }).then(res => { if (res.code == 1) { this.form = res.data.detail - this.price = res.data.detail.price - this.priceDo() - console.log('this.priceName',this.priceName,this.price); - this.form.content = this.form.content.replace(/<[^>]+>/g, ''); // 输出: "运动" - this.value_slide = res.data.detail.join_info.percent; + this.form.cate_idsName = this.form.classes_cate.join(','); + // this.form.cate_ids = res.data.detail.cate_ids; + console.log('cate_ids', this.form.cate_ids); const idBqSet = new Set(this.form.cate_ids); const bqArray = this.bqList.reduce((acc, obj) => { if (this.form.cate_ids.includes(obj.id)) { @@ -833,15 +792,15 @@ return acc; }, []); console.log('bqArray', bqArray); - let arrIdsName = bqArray.map((item) => { - return item.name - }) - this.form.cate_idsName = arrIdsName.join(','); console.log('cate_idsName', this.form.cate_idsName); this.list = bqArray - this.form.cate_ids = res.data.detail.cate_ids; - - console.log('cate_ids', this.form.cate_ids); + console.log('getDraftDetail——list', this.list); + + + console.log('this.priceName',this.priceName,this.price); + this.form.content = this.form.content.replace(/<[^>]+>/g, ''); // 输出: "运动" + this.value_slide = res.data.detail.join_info.percent; + this.form.refund_idn = this.form.refund_info.title; // 转换为 fileList 格式 this.fileList1 = this.form.images.map(url => ({ @@ -851,14 +810,29 @@ })); this.list1 = this.form.images console.log('fileList1', this.fileList1); - - this.qunQrcode = ({ - url: this.form.image, - status: 'success', - message: '' - }) - this.QunQrcode1 = this.qunQrcode - + + + if(this.form.image == '' || this.form.image == null){ + this.qunQrcode = '' + this.QunQrcode1 = this.qunQrcode + console.log('草稿详情',this.QunQrcode1,this.QunQrcode); + }else { + this.qunQrcode = ({ + url: this.form.image || res.data.detail, + status: 'success', + message: '' + }) + this.QunQrcode1 = this.qunQrcode + console.log('草稿详情2',this.QunQrcode1,this.QunQrcode); + } + // this.qunQrcode = ({ + // url: this.form.image || res.data.detail, + // status: 'success', + // message: '' + // }) + // this.QunQrcode1 = this.qunQrcode + // console.log('草稿详情',this.QunQrcode1,this.QunQrcode); + // console.log('qunQrcode', this.qunQrcode); // formatDate(dateStr) { // if (!dateStr) return ''; // return dateStr.slice(5, 16); @@ -866,6 +840,7 @@ // this.times_b_int = this.form.start_time_text // this.times_e_int = this.form.end_time_text // res.data.detail + this.currents = this.form.refund_id; const time_start = this.form.start_time_text.slice(5, 16) const time_end = this.form.end_time_text.slice(5, 16) this.form.time = time_start + ' - ' + time_end @@ -873,8 +848,9 @@ const signTime_start = this.form.sign_start_time_text.slice(5, 16) const signTime_end = this.form.sign_end_time_text.slice(5, 16) this.form.sign_time = signTime_start + ' - ' + signTime_end + console.log('this.form.sign_time',this.form.sign_time); - console.log('qunQrcode', this.qunQrcode); + if (!this.original_activity_id) { this.times_b_int = this.form.start_time_text this.times_e_int = this.form.end_time_text @@ -891,7 +867,9 @@ if (this.type == 2) { this.form.title = '' } - + + this.price = res.data.detail.price + this.priceDo() this.mobile = this.detail.user.mobile.slice(0, 3) + 'XXXX' + this.detail.user.mobile.slice( 7); } else { @@ -951,12 +929,7 @@ this.cardStatus = res.data.status; }) }, - //选择政策 - selectItem(index, item) { - this.currents = index; - this.form.refund_id = item.id; - this.form.refund_idn = item.title; - }, + // async uploadQun(item) { // const result = await this.uploadFilePromise(item.file.url, 'user'); // this.qunQrcode = result; @@ -1042,6 +1015,36 @@ // uni.setStorageSync('zjlist', JSON.stringify(this.list)) // } }, + + /* 标签 */ + // 获取标签 + getBqList() { + uni.$u.http + .get("/api/school.new_activity/cate_list", { + params: { + page: 1, + limit: 100 + }, + }) + .then((res) => { + if (res.code == 1) { + this.bqList = res.data.list; + } else { + uni.showToast({ + title: res.msg, + icon: "none", + duration: 2000, + }); + } + }) + .catch((error) => { + uni.showToast({ + title: "请求失败，请稍后再试", + icon: "none", + duration: 2000, + }); + }); + }, //删除标签（本地） removebq(i) { this.list.splice(i, 1); @@ -1084,16 +1087,30 @@ this.form.cate_idsName = arr.join(','); console.log('this.form.cate_idsName', this.form.cate_idsName); }, - dateWeeks(e) { - return dateWeek(e); - }, closebq() { - this.showPopbq = false + this.showPopbq = false; + // this.list = [] + // let arr = this.list.map((item) => { + // return item.name + // }) + // this.form.cate_idsName = arr.join(','); + // console.log('this.form.cate_idsName', this.form.cate_idsName); + }, + surebq() { + this.showPopbq = false; + // this.list = [] + // let arr = this.list.map((item) => { + // return item.name + // }) + // this.form.cate_idsName = arr.join(','); + // console.log('this.form.cate_idsName', this.form.cate_idsName); }, openBq() { - this.showPopbq = true + this.showPopbq = true; }, - // 退费规则 + + /* 退费政策 */ + // 退费规则列表 getrefund_list() { uni.$u.http .get("/api/school.new_activity/refund_list", { @@ -1121,38 +1138,25 @@ }); }); }, - // 获取标签 - getBqList() { - uni.$u.http - .get("/api/school.new_activity/cate_list", { - params: { - page: 1, - limit: 100 - }, - }) - .then((res) => { - if (res.code == 1) { - this.bqList = res.data.list; - } else { - uni.showToast({ - title: res.msg, - icon: "none", - duration: 2000, - }); - } - }) - .catch((error) => { - uni.showToast({ - title: "请求失败，请稍后再试", - icon: "none", - duration: 2000, - }); - }); + //选择政策 + selectItem(index, item) { + // this.currents = index; + this.currents = item.id; + this.form.refund_id = item.id; + this.form.refund_idn = item.title; }, - //同意 - handleScroll() { - console.log('handleScroll:', 123) - this.agreeShow = true + opentuikuan() { + this.tuikuan = true; + //this.form.refund_id = 1; + //this.form.refund_idn = '随时退'; + }, + closetuikuan() { + this.tuikuan = false + }, + + + dateWeeks(e) { + return dateWeek(e); }, getTime() { const currentDate = new Date(); @@ -1163,6 +1167,9 @@ const formattedDate = `${year}-${month}-${day}`; return formattedDate; }, + + + /* 活动时间 */ dateShowHidden() { this.hdIndex = 1; // this.tempDefaultTime = new Date(new Date().getTime() + 8 * 60 * 60 * 1000); @@ -1175,19 +1182,6 @@ this.defaultTime = defaultTime; // this.defaultTime = new Date(this.form.start_time) }, - birthShowHidden() { - this.bmIndex = 1; - this.birthShow = true; - console.log('报名时间'); - // 计算当前时间加8小时 - const defaultTime = new Date(); - //defaultTime.setHours(defaultTime.getHours() + 8); - console.log('报名时间defaultTime', defaultTime); - this.defaultTime = defaultTime; - // this.defaultTime = new Date(this.form.sign_start_time) - - }, - // 活动开始时间 datefirm(e, index) { console.log('活动开始时间', e, e.time) @@ -1205,7 +1199,7 @@ } this.tempDefaultTime = null; // 使用后重置 //this.dateShow1 = true - + //this.form.date = dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'); //this.times_b = this.dateWeeks(e.value / 1000); //this.dateShow = false @@ -1228,7 +1222,7 @@ //获取当前时间 const currentTime = dayjs().format('YYYY-MM-DD HH'); // const currentTime = new Date(new Date().getTime() + 8 * 60 * 60 * 1000) - + console.log('currentTime', currentTime); var b = currentTime + ':00'; if (this.times_b == '' || this.times_b == null) { @@ -1258,7 +1252,7 @@ const currentTime = dayjs().format('YYYY-MM-DD HH'); var b = currentTime + ':00'; if (this.times_e == '' || this.times_e == null) { - + //判断是否this.times_e小于当前时间 用的是年月日而不是时间戳 if (this.isBeforeNow(b)) { uni.$u.toast('活动结束时间不能小于开始时间'); @@ -1298,27 +1292,27 @@ // } // this.dateShow=false; }, - isBeforeNow(dateTimeStr) { - // 替换空格为'T'以兼容ISO格式（部分浏览器需要） - const isoFormattedStr = dateTimeStr.replace(' ', 'T'); - const inputDate = new Date(isoFormattedStr); - const now = new Date(); - - return inputDate < now; - }, - isDateTimeBefore(datetimeStr1, datetimeStr2) { - // 转换为Date对象（兼容"YYYY-MM-DD HH:mm:ss"格式） - const date1 = new Date(datetimeStr1.replace(' ', 'T') + 'Z'); - const date2 = new Date(datetimeStr2.replace(' ', 'T') + 'Z'); - - return date1 <= date2; // 如果date1早于date2，返回true - }, datecel(e) { this.dateShow = false }, datecel1(e) { this.dateShow1 = false }, + + + /* 报名时间 */ + birthShowHidden() { + this.bmIndex = 1; + this.birthShow = true; + console.log('报名时间'); + // 计算当前时间加8小时 + const defaultTime = new Date(); + //defaultTime.setHours(defaultTime.getHours() + 8); + console.log('报名时间defaultTime', defaultTime); + this.defaultTime = defaultTime; + // this.defaultTime = new Date(this.form.sign_start_time) + + }, // 报名开始日期 birthConfirm(e, index) { // this.form.birth = dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'); @@ -1381,7 +1375,7 @@ const currentTime = dayjs().format('YYYY-MM-DD HH'); var b = currentTime + ':00'; if (this.times_sine == '' || this.times_sine == null) { - + //判断是否this.times_sine小于当前时间 用的是年月日而不是时间戳 if (this.isBeforeNow(b)) { uni.$u.toast('报名结束时间不能小于当前时间'); @@ -1422,41 +1416,48 @@ birthCancel1() { this.birthShow1 = false }, + //日期 + isBeforeNow(dateTimeStr) { + // 替换空格为'T'以兼容ISO格式（部分浏览器需要） + const isoFormattedStr = dateTimeStr.replace(' ', 'T'); + const inputDate = new Date(isoFormattedStr); + const now = new Date(); + + return inputDate < now; + }, + isDateTimeBefore(datetimeStr1, datetimeStr2) { + // 转换为Date对象（兼容"YYYY-MM-DD HH:mm:ss"格式） + const date1 = new Date(datetimeStr1.replace(' ', 'T') + 'Z'); + const date2 = new Date(datetimeStr2.replace(' ', 'T') + 'Z'); + + return date1 <= date2; // 如果date1早于date2，返回true + }, + + + /* 声明协议 */ close() { this.show = false; clearInterval(this.timer); }, - closetuikuan() { - this.tuikuan = false - }, open() { this.show = true // setTimeout(() => { // this.agree = true // }, 5000) }, - opentuikuan() { - this.tuikuan = true; - //this.form.refund_id = 1; - //this.form.refund_idn = '随时退'; + //同意 + handleScroll() { + console.log('handleScroll:', 123) + this.agreeShow = true }, change() { this.agree = true; this.agreeAdd = true; this.show = false }, - // 选择机构地址 - + // 协议 protocolClick(tag) { - //timeLog 开始倒计时 - // this.timeLog = 5; - // this.timer = setInterval(() => { - // this.timeLog--; - // if (this.timeLog === 0) { - // this.agreeShow=true; - // clearInterval(this.timer); - // } - // }, 1000); + console.log('editAct'); this.show = true }, // 获取入驻协议文章 @@ -1484,6 +1485,9 @@ }); }); }, + + + /*地址*/ choose() { console.log('choose', 11111) const that = this @@ -1500,8 +1504,10 @@ } }); }, - - + + + + //轮播图images // 回调参数为包含columnIndex、value、values confirm(e) { console.log('confirm', e.value) @@ -1510,13 +1516,10 @@ this.list1 = '', this.name = '' }, - - oversize(e) { this.$u.toast("请传1MB以内大小的图片！"); return false; }, - // 删除图片 deletePic(event) { const { @@ -1562,7 +1565,7 @@ console.error('Invalid index'); } }, - // 新增图片 + // 新增轮播图图片 async afterRead(event) { console.log('afterRead', this.fileList1); console.log('afterRead', this.list1); @@ -1695,6 +1698,9 @@ }); }); }, + + + // 查询状态 // -1未申请 0待审核 1审核通过 2审核失败 searchStatus() { @@ -1798,6 +1804,9 @@ let bmtime = '' console.log('addDraft',this.list); this.form.cate_ids = this.list.map(item => item.id).join(','); + // if (this.list.length != 0) { + // this.form.cate_ids = this.list.map(item => item.id).join(','); + // } if (this.times_b_int && this.times_e_int) { hdtime = this.times_b_int + ' - ' + this.times_e_int; } @@ -1871,50 +1880,7 @@ this.isFormValid = false this.baoDraftShow = true this.getDraftList(); - //置空 - // this.fileList1 = []; - // this.agree = false; - // this.list1 = ''; - // this.list = []; - // this.price = ''; - // this.priceName = '免费'; - // this.qunQrcode = ''; - // this.form = { - // cate_ids: '', - // // 活动分类名字 - // cate_idsName: "", - // content: '', - // refund_id: '', - // refund_idn: '', - // price: 1, - // stock: '', - // sign_time: '', - // time: '', - // images: '', - // title: '', - // address: '', - // latitude: '', - // longitude: '', - // address_detail: '', //详细位置 - // date: '', //活动开始时间 - // date1: '', //活动结束时间 - // birth: '', //报名开始日期 - // birth1: '', //报名结束日期 - // } - - - - // uni.showToast({ - // title: '存草稿成功！', - // icon: 'none', - // duration: 2000, - // }); - setTimeout(function() { - // uni.navigateTo({ - // url: "/packageA/my/orderList" - // }) - }, 1000); } else { this.$u.toast(res.msg); // uni.showToast({ @@ -2041,7 +2007,7 @@ }) } }).catch(error => {}); - this.closeDraftShow();s + this.closeDraftShow(); }, editDraft() { console.log('草稿'); @@ -2050,6 +2016,9 @@ let hdtime = '' let bmtime = '' this.form.cate_ids = this.list.map(item => item.id).join(','); + // if (this.list.length != 0) { + // this.form.cate_ids = this.list.map(item => item.id).join(','); + // } if (this.times_b_int && this.times_e_int) { hdtime = this.times_b_int + ' - ' + this.times_e_int; } @@ -2149,9 +2118,9 @@ }); }); }, - - - + + + //提交发布 apply() { if (this.cardStatus == -1) { this.cardShow = true; @@ -2161,10 +2130,7 @@ let urlEdit = '/api/school.new_activity/edit' let params = {}; console.log('平台分类',this.form.cate_ids,this.list); - this.form.cate_ids = this.list.map(item => item.id).join(','); - // if (!this.id) { - // this.form.cate_ids = this.list.map(item => item.id).join(','); - // } + // 校验详细地址 if (this.form.address_detail == '') { uni.showToast({ @@ -2279,6 +2245,10 @@ let bmtime = this.times_sinb_int + ' - ' + this.times_sine_int; console.log('formparams', this.form, this.form.cate_ids); console.log('images', this.form.images); + this.form.cate_ids = this.list.map(item => item.id).join(','); + // if (this.list.length != 0) { + // this.form.cate_ids = this.list.map(item => item.id).join(','); + // } params = { title: this.form.title, cate_ids: this.form.cate_ids, diff --git a/packageB/editDraft.vue b/packageB/editDraft.vue index 6cc1af0..c77c893 100644 --- a/packageB/editDraft.vue +++ b/packageB/editDraft.vue @@ -786,7 +786,7 @@ this.list1 = this.form.images console.log('fileList1', this.fileList1); } - if(this.form.image != '' || this.form.image != null){ + if(this.form.image != '' && this.form.image != null){ this.qunQrcode = ({ url: this.form.image, status: 'success', @@ -1357,6 +1357,7 @@ // 选择机构地址 protocolClick(tag) { + console.log('editDraft'); //timeLog 开始倒计时 // this.timeLog = 5; // this.timer = setInterval(() => { @@ -1654,13 +1655,19 @@ let params = {}; let hdtime = '' let bmtime = '' - this.form.cate_ids = this.list.map(item => item.id).join(','); + if(this.list.length != 0){ + this.form.cate_ids = this.list.map(item => item.id).join(','); + } if (this.times_b_int && this.times_e_int) { hdtime = this.times_b_int + ' - ' + this.times_e_int; } if (this.times_sinb_int && this.times_sine_int) { bmtime = this.times_sinb_int + ' - ' + this.times_sine_int; } + if (this.list.length != 0) { + this.form.cate_ids = this.list.map(item => item.id).join(','); + } + console.log('params，this.list',this.list,this.form.cate_ids); // let hdtime = this.times_b_int + ' - ' + this.times_e_int; // let bmtime = this.times_sinb_int + ' - ' + this.times_sine_int; params = { @@ -1783,6 +1790,8 @@ }, apply() { + console.log('apply',this.cardShow,this.cardStatus); + console.log('apply',this.form,this.form.cate_ids,this.form.image,this.qunQrcode); if (this.cardStatus == -1) { this.cardShow = true; return; @@ -1790,11 +1799,16 @@ let url = '/api/school.new_activity/add'; let urlEdit = '/api/school.new_activity/edit' let params = {}; - if (this.list.length != 0) { - this.form.cate_ids = this.list.map(item => item.id).join(','); - } - console.log('params，this.list',this.list,this.form.cate_ids); - // 校验详细地址 + console.log('apply',this.form,this.form.cate_ids,this.form.image,this.qunQrcode); + + if (this.qunQrcode == '' || this.qunQrcode == null ) { + uni.showToast({ + title: '请上传群二维码！', + icon: 'none', + duration: 2000 + }); + return; + }// 校验详细地址 if (this.form.address_detail == '') { uni.showToast({ title: '请输入详细地址！', @@ -1896,20 +1910,18 @@ }); return; } - if (this.qunQrcode == '' || this.qunQrcode == null) { - uni.showToast({ - title: '请上传群二维码！', - icon: 'none', - duration: 2000 - }); - return; - } + console.log('time',this.form.sign_time,this.form.time); console.log('hdtime',this.times_b_int ,this.times_e_int); console.log('hdtime',this.times_b_int , this.times_e_int); let hdtime = this.times_b_int + ' - ' + this.times_e_int; let bmtime = this.times_sinb_int + ' - ' + this.times_sine_int; - + // if (this.list.length != 0) { + // this.form.cate_ids = this.list.map(item => item.id).join(','); + // console.log('params，this.list',this.list,this.form.cate_ids); + // } + this.form.cate_ids = this.list.map(item => item.id).join(','); + console.log('params，this.list',this.list,this.form.cate_ids); console.log('formparams', this.form, this.form.cate_ids); console.log('images', this.form.images); params = { diff --git a/packageB/invoice/addHead.vue b/packageB/invoice/addHead.vue index 0185800..3404363 100644 --- a/packageB/invoice/addHead.vue +++ b/packageB/invoice/addHead.vue @@ -1,7 +1,7 @@