From ec699798bfbe81b5a921c7147a6962492a0d16bf Mon Sep 17 00:00:00 2001 From: wangzimeng <3297159934@qq.com> Date: Fri, 4 Jul 2025 18:34:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=86=E5=8C=85packageA=E4=B8=AD?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=202=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E9=87=8D=E5=8F=91=E7=9A=84=E5=9B=BE=E7=89=87=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BB=B7=E6=A0=BC=E3=80=81=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=9F=9F=E6=8E=A5=E5=AF=8C=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E3=80=81=E8=B0=83=E6=95=B4=E6=8A=A5=E5=90=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- packageA/center/detail.vue | 7 +- packageA/center/detailSys.vue | 115 +- packageA/center/orderDetail.vue | 1265 ------------ packageA/my/ac-management.vue | 416 ---- packageA/my/exercise.vue | 102 +- packageA/my/management.vue | 726 ------- packageA/my/mentList.vue | 547 ----- packageA/my/orderList.vue | 128 +- packageA/my/pendinPay.vue | 7 +- packageA/my/pendinPayDetail.vue | 7 +- packageA/my/person-detail.vue | 4 +- packageA/my/refund.vue | 637 ------ packageB/editAct.vue | 268 ++- packageB/invoice/addHead.vue | 2 +- packageB/invoice/addInvoice.vue | 6 +- packageB/invoice/invoiceCenter.vue | 6 +- packageB/invoice/invoiceInfo.vue | 4 +- pages.json | 84 +- pages/center/index.vue | 3099 ++++++++++++++-------------- static/invoice/conRecord.png | Bin 2940 -> 0 bytes static/invoice/invInfoBk.png | Bin 19625 -> 0 bytes static/invoice/manageEdit.png | Bin 2451 -> 0 bytes static/invoice/manageRecord.png | Bin 2982 -> 0 bytes static/invoice/statusInv.png | Bin 2709 -> 0 bytes 25 files changed, 1915 insertions(+), 5517 deletions(-) delete mode 100644 packageA/center/orderDetail.vue delete mode 100644 packageA/my/ac-management.vue delete mode 100644 packageA/my/management.vue delete mode 100644 packageA/my/mentList.vue delete mode 100644 packageA/my/refund.vue delete mode 100644 static/invoice/conRecord.png delete mode 100644 static/invoice/invInfoBk.png delete mode 100644 static/invoice/manageEdit.png delete mode 100644 static/invoice/manageRecord.png delete mode 100644 static/invoice/statusInv.png diff --git a/manifest.json b/manifest.json index 663e9d0..54c7a59 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "多样青春活动版", - "appid" : "__UNI__F09A3D9", + "appid" : "__UNI__BD0139D", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", diff --git a/packageA/center/detail.vue b/packageA/center/detail.vue index f303dc6..7c62c8c 100644 --- a/packageA/center/detail.vue +++ b/packageA/center/detail.vue @@ -735,12 +735,7 @@ } }); }, - // 机构详情 - toMeDetail() { - uni.navigateTo({ - url: "/packageA/center/MechanismDetail?id=" + this.detail.shop.id - }) - }, + close() { this.type = 0 diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue index b028aa2..a5ddf5a 100644 --- a/packageA/center/detailSys.vue +++ b/packageA/center/detailSys.vue @@ -697,65 +697,65 @@ this.type = 3 }, // 确认时间 type = 0 0 支付 1 立即购买 2 预约 3确认时间 - confimTime() { - uni.$u.http.post('/api/school/hour_order/confirm', { - classes_order_id: this.orderId, - classes_lib_spec_id: this.classes_lib_spec_id, - order_no: this.order_no2, - is_compute: 1 - }).then(res => { - if (res.code == 1) { - this.order_no2 = res.data.order_no - this.timeCreat(res.data.order_no) - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - this.type = 2 - // _this.$api.toast(res.msg); - } - }).catch(error => { + // confimTime() { + // uni.$u.http.post('/api/school/hour_order/confirm', { + // classes_order_id: this.orderId, + // classes_lib_spec_id: this.classes_lib_spec_id, + // order_no: this.order_no2, + // is_compute: 1 + // }).then(res => { + // if (res.code == 1) { + // this.order_no2 = res.data.order_no + // this.timeCreat(res.data.order_no) + // } else { + // uni.showToast({ + // title: res.msg, + // icon: 'none', + // duration: 2000 + // }) + // this.type = 2 + // // _this.$api.toast(res.msg); + // } + // }).catch(error => { - }); + // }); - this.show = false - this.type = 0 - }, - // 预约下单 - timeCreat(order_no) { - uni.$u.http.post('/api/school/hour_order/create', { - order_no: order_no, - }).then(res => { - if (res.code == 1) { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000, - complete: function() { - setTimeout(function() { - uni.reLaunch({ - url: "/packageA/my/makeList?status=" + -1 - }) - }, 2000); - } + // this.show = false + // this.type = 0 + // }, + // // 预约下单 + // timeCreat(order_no) { + // uni.$u.http.post('/api/school/hour_order/create', { + // order_no: order_no, + // }).then(res => { + // if (res.code == 1) { + // uni.showToast({ + // title: res.msg, + // icon: 'none', + // duration: 2000, + // complete: function() { + // setTimeout(function() { + // uni.reLaunch({ + // url: "/packageA/my/makeList?status=" + -1 + // }) + // }, 2000); + // } - }) + // }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - this.type = 2 - // _this.$api.toast(res.msg); - } - }).catch(error => { + // } else { + // uni.showToast({ + // title: res.msg, + // icon: 'none', + // duration: 2000 + // }) + // this.type = 2 + // // _this.$api.toast(res.msg); + // } + // }).catch(error => { - }); - }, + // }); + // }, // 导航 toMap(latitude, longitude, name) { uni.openLocation({ @@ -767,12 +767,7 @@ } }); }, - // 机构详情 - toMeDetail() { - uni.navigateTo({ - url: "/packageA/center/MechanismDetail?id=" + this.detail.shop.id - }) - }, + close() { this.type = 0 diff --git a/packageA/center/orderDetail.vue b/packageA/center/orderDetail.vue deleted file mode 100644 index ce6e258..0000000 --- a/packageA/center/orderDetail.vue +++ /dev/null @@ -1,1265 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packageA/my/ac-management.vue b/packageA/my/ac-management.vue deleted file mode 100644 index 8298e89..0000000 --- a/packageA/my/ac-management.vue +++ /dev/null @@ -1,416 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index cc20191..40a9a70 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -58,11 +58,11 @@ @click="toPay(item.id, item.order_no)">去支付 核销码 - 申请开票 开票中 查看开票 + @click="checkInvoice(item.id, item.order_no)">查看开票 --> 查看详情 @@ -81,96 +81,7 @@ - - - - - - @@ -332,14 +243,7 @@ } }).catch(error => {}); }, - // 跳转预约 - toMake(id, orderId, classes_lib_id, type) { - uni.navigateTo({ - // url: "/packageA/center/applyDetail?id=" + id + "&orderId=" + orderId + "&type=" + 2 - url: "/packageA/center/orderDetail?id=" + id + "&orderId=" + orderId + "&type=" + 2 + - "&classes_lib_id=" + classes_lib_id - }) - }, + toInfo(id) { //123 uni.navigateTo({ diff --git a/packageA/my/management.vue b/packageA/my/management.vue deleted file mode 100644 index c7fbf4c..0000000 --- a/packageA/my/management.vue +++ /dev/null @@ -1,726 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packageA/my/mentList.vue b/packageA/my/mentList.vue deleted file mode 100644 index 8c7c550..0000000 --- a/packageA/my/mentList.vue +++ /dev/null @@ -1,547 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue index 895e08b..c881c11 100644 --- a/packageA/my/orderList.vue +++ b/packageA/my/orderList.vue @@ -64,11 +64,17 @@ {{ "报名中" }} - {{ dateWeeks(item.sign_start_time) }} {{ dateWeeks(item.sign_start_time) }} - --> + {{ dateWeeks(item.start_time) }} + {{ dateWeeks(item.start_time) }} + + {{ item.address_detail }} @@ -85,21 +91,30 @@ - - 修改 - + + + 修改 + + - + 核销： {{ item.verification_num }} /{{ item.stock }} + + + + style="display: flex;align-items: center;justify-content: flex-end;gap: 20rpx;"> 核销 修改 - 重发 - 详情 - + + 未通过原因：{{item.reason}} @@ -151,10 +171,13 @@ - + 取消 - 编辑 @@ -389,7 +412,7 @@ this.list = [] this.page = 1 this.hotList = [] - console.log('hotList',this.hotList); + console.log('hotList', this.hotList); // this.getHotList(this.selected); if (this.status == -2) { this.getAfterList(); @@ -566,12 +589,14 @@ console.log('跳转接口', val, this.auth_status); var auth_status = ''; if (val == 0) { - val = '1,2,3,4,5,-1'; + // val = '1,2,3,4,5,-1'; + val = '1,2,3,4,5'; auth_status = this.auth_status; console.log('val==0', this.auth_status); } else { if (val == '-1') { - auth_status = '0,1,2'; + // auth_status = '0,1,2'; + auth_status = '0,1'; } else { auth_status = '1'; } @@ -684,63 +709,8 @@ }) .catch((error) => {}); }, - // 跳转预约 - toMake(id, orderId, classes_lib_id, type) { - uni.navigateTo({ - // url: "/packageA/center/applyDetail?id=" + id + "&orderId=" + orderId + "&type=" + 2 - url: "/packageA/center/orderDetail?id=" + - id + - "&orderId=" + - orderId + - "&type=" + - 2 + - "&classes_lib_id=" + - classes_lib_id, - }); - }, - toDetail(id, orderId, classes_lib_id, order_no) { - let type = null; - if (this.selected == 0) { - type = 1; - } else if (this.selected == 3) { - type = 2; - } else if (this.selected == 9) { - type = 9; - } else if (this.selected == -3) { - type = -3; - } else if (this.selected == 6) { - type = 6; - } else { - type = 0; - } - uni.navigateTo({ - url: "/packageA/center/orderDetail?id=" + - id + - "&orderId=" + - orderId + - "&order_no=" + - order_no + - "&type=" + - type + - "&classes_lib_id=" + - classes_lib_id, - }); - }, - // 去支付 - toPay(id, orderId, classes_lib_id, order_no, type) { - uni.navigateTo({ - url: "/packageA/center/orderDetail?id=" + - id + - "&orderId=" + - orderId + - "&order_no=" + - order_no + - "&type=" + - 1 + - "&classes_lib_id=" + - classes_lib_id, - }); - }, + + // 售后 service(id) { uni.navigateTo({ @@ -823,6 +793,8 @@ this.status = status; if (status == -2) { this.getAfterList(); + }else if(status == -2){ + } else { this.getHotList(status); } @@ -1384,7 +1356,7 @@ } .bottom { - margin: 0rpx 10rpx 30rpx 10rpx; + margin: 0rpx 0rpx 30rpx 10rpx; .number { font-family: Source Han Sans CN, Source Han Sans CN; diff --git a/packageA/my/pendinPay.vue b/packageA/my/pendinPay.vue index 17e3f32..31e9e35 100644 --- a/packageA/my/pendinPay.vue +++ b/packageA/my/pendinPay.vue @@ -511,12 +511,7 @@ } }); }, - // 机构详情 - toMeDetail() { - uni.navigateTo({ - url: "/packageA/center/MechanismDetail?id=" + this.detail.shop.id - }) - }, + close() { this.type = 0 diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index 908ffd2..f9e203d 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -605,12 +605,7 @@ } }); }, - // 机构详情 - toMeDetail() { - uni.navigateTo({ - url: "/packageA/center/MechanismDetail?id=" + this.detail.shop.id - }) - }, + close() { this.type = 0 diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue index 7d63736..1a0c132 100644 --- a/packageA/my/person-detail.vue +++ b/packageA/my/person-detail.vue @@ -56,12 +56,12 @@ - + 身份信息 diff --git a/packageA/my/refund.vue b/packageA/my/refund.vue deleted file mode 100644 index 204ebab..0000000 --- a/packageA/my/refund.vue +++ /dev/null @@ -1,637 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packageB/editAct.vue b/packageB/editAct.vue index 7184506..b6ed26c 100644 --- a/packageB/editAct.vue +++ b/packageB/editAct.vue @@ -36,6 +36,7 @@ 添加图片 + @@ -60,18 +61,6 @@ placeholder="请输入详细地址/楼、门牌号"> - - - * - 报名时间 - - - - - - - @@ -91,6 +80,21 @@ + + + * + 报名时间 + + + {{ + form.sign_time == '' ? '请选择报名时间' : form.sign_time }} + + + + + *活动分类 @@ -134,7 +138,9 @@ 未上传 - + + + @@ -180,7 +186,7 @@ - + @@ -506,21 +512,23 @@ times_sine_int: '', //结束时间 qunQrcode: '', + QunQrcode1: '', //仅用于页面展示 boxHeight: 0, cardShow: false, cardStatus: 0, id: null, original_activity_id: null, type: null, + tempDefaultTime: null, }; }, onLoad(options) { - console.log('options', options.id,options.original_activity_id); - this.id = options.id + console.log('options', options.id, options.original_activity_id); + this.id = options.id this.original_activity_id = options.original_activity_id this.type = options.type console.log('this.id', this.id); - console.log('this.original_activity_id ', this.original_activity_id ); + console.log('this.original_activity_id ', this.original_activity_id); console.log('this.type', this.type); if (this.id || this.original_activity_id) { this.agree = true @@ -548,7 +556,8 @@ filters: { formatTimestamp(value) { if (!value) return ''; - const date = new Date(value * 1000); // 将秒转换为毫秒 + // const date = new Date(value * 1000); // 将秒转换为毫秒 + const date = new Date(new Date().getTime() + 8 * 60 * 60 * 1000) const year = date.getFullYear(); const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1，并补零 const day = String(date.getDate()).padStart(2, '0'); // 补零 @@ -568,6 +577,9 @@ }).then(res => { if (res.code == 1) { this.form = res.data.detail + this.price = this.form.price + this.priceDo() + this.form.content = this.form.content.replace(/<[^>]+>/g, ''); // 输出: "运动" this.value_slide = res.data.detail.join_info.percent; const idBqSet = new Set(this.form.cate_ids); const bqArray = this.bqList.reduce((acc, obj) => { @@ -584,7 +596,7 @@ 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); this.form.refund_idn = this.form.refund_info.title; // 转换为 fileList 格式 @@ -601,13 +613,30 @@ status: 'success', 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 + 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){ + if (!this.original_activity_id) { this.times_b_int = this.form.start_time_text this.times_e_int = this.form.end_time_text this.times_sinb_int = this.form.sign_start_time_text this.times_sine_int = this.form.sign_end_time_text - }else{ + } else { this.times_b_int = '' this.times_e_int = '' this.times_sinb_int = '' @@ -615,10 +644,10 @@ this.form.sign_time = '' this.form.time = '' } - if(this.type == 2){ + if (this.type == 2) { this.form.title = '' } - + this.mobile = this.detail.user.mobile.slice(0, 3) + 'XXXX' + this.detail.user.mobile.slice( 7); } else { @@ -632,7 +661,7 @@ }, priceDo() { var price = this.price; - console.log(price); + console.log('priceDo price:', price); if (price == '' || price == null || price == undefined || price == 0) { this.priceName = '免费'; this.priceShow = false; @@ -662,7 +691,7 @@ this.form.refund_idn = '不支持自动退款'; }, Time(val) { - console.log(val); + console.log('Time_val:', val); }, openUrl(url) { uni.navigateTo({ @@ -671,7 +700,7 @@ }, getCardInfo() { uni.$u.http.get('/api/school.real_name/info').then(res => { - console.log(res); + console.log('getCardInfo res:', res); this.cardShow = res.data.status != 1 ? true : false; this.cardStatus = res.data.status; }) @@ -689,15 +718,21 @@ // }, async uploadQun(item) { const result = await this.uploadFilePromise(item.file.url, 'user'); - console.log(result); + console.log('uploadQun result:', result); this.qunQrcode = result; console.log('qunQrcode', this.qunQrcode); + this.QunQrcode1 = this.qunQrcode + const baseUrl = 'https://qingchunta.hschool.com.cn'; // 你的域名 + this.QunQrcode1 = { + url: baseUrl + result // 拼接完整URL + }; + console.log('QunQrcode1', this.QunQrcode1); if (result.code != 1) { - uni.showToast({ - title: result.msg, - icon: 'none', - duration: 2000 - }); + // uni.showToast({ + // title: result.msg, + // icon: 'none', + // duration: 2000 + // }); return; } else { // uni.$u.http.post('/api/school.new_activity/edit_qrcode', { @@ -870,7 +905,7 @@ }, //同意 handleScroll() { - console.log(123) + console.log('handleScroll:', 123) this.agreeShow = true }, getTime() { @@ -884,6 +919,7 @@ }, dateShowHidden() { this.hdIndex = 1; + // this.tempDefaultTime = new Date(new Date().getTime() + 8 * 60 * 60 * 1000); this.dateShow = true; }, birthShowHidden() { @@ -893,8 +929,9 @@ // 活动开始时间 datefirm(e, index) { - console.log(e) + console.log('活动开始时间', e, e.time) var time = e.time; + // var time = this.tempDefaultTime || e.time if (index == 1) { //this.form.date = time; this.times_b = time; @@ -905,6 +942,7 @@ //this.dateShow = false this.form.time = this.times_b + ' - ' + this.times_e } + this.tempDefaultTime = null; // 使用后重置 //this.dateShow1 = true //this.form.date = dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'); @@ -916,6 +954,9 @@ hdnext() { //获取当前时间 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) { //判断是否this.times_b小于当前时间 用的是年月日而不是时间戳 @@ -1010,18 +1051,18 @@ // this.times_sinb = this.dateWeeks(e.value / 1000); // this.birthShow = false // this.birthShow1 = true - console.log('报名时间：',e) + console.log('报名时间：', e) var time = e.time; if (index == 1) { //this.form.date = time; this.times_sinb = time; this.times_sinb_int = time; - console.log('报名时间11：',e) + console.log('报名时间11：', e) } else { this.times_sine = time; this.times_sine_int = time; //this.dateShow = false - console.log('报名时间22：',this.times_sine,this.times_sine_int) + console.log('报名时间22：', this.times_sine, this.times_sine_int) this.form.sign_time = this.times_sinb + ' - ' + this.times_sine } }, @@ -1157,18 +1198,18 @@ }); }, choose() { - console.log(11111) + console.log('choose', 11111) const that = this uni.chooseLocation({ success: function(res) { - console.log(res) + console.log('choose res:', res) that.form.address = res.name // that.form.address_detail = res.address that.form.latitude = res.latitude that.form.longitude = res.longitude }, fail: function(rot) { - console.log(rot) + console.log('choose rot:', rot) } }); }, @@ -1184,9 +1225,6 @@ }, - - - oversize(e) { this.$u.toast("请传1MB以内大小的图片！"); return false; @@ -1204,16 +1242,29 @@ if (name === '1') { + console.log('删除照片？'); //单张 // this.list1 = this.fileList1.length > 0 ? this.fileList1[0].url : ''; - this.list1 = this.fileList1.map(item => item.url).join(','); - console.log('Updated list1:', this.list1); + // if (this.id || this.type == 1 || this.type == 2) { + // this.list1 = this.fileList1.map(url => { + // // 使用URL对象方法 + // // const urlObj = new URL(url); + // const urlObj = url.url.split('qingchunta.hschool.com.cn')[1] + // console.log('urlObj', urlObj); + // return urlObj; + // }).join(','); + // } else { + // this.list1 = this.fileList1.map(item => item.url).join(','); + // } + console.log('Updated 删除图片 fileList1:', this.fileList1); + console.log('Updated 删除图片 list1:', this.list1); } // 确保对应的 list 字段是一个数组 let list = this[`list${name}`]; + console.log('删除照片1', list); if (!Array.isArray(list)) { console.warn(`list${name} is not an array, skipping splice operation`); } else { @@ -1226,8 +1277,28 @@ }, // 新增图片 async afterRead(event) { - let lists = [].concat(event.file); + console.log('afterRead', this.fileList1); + console.log('afterRead', this.list1); + // this.fileList1 = this.fileList1.forEach(url => { + // console.log('url',url); + // url.url = url.url.split('qingchunta.hschool.com.cn')[1] + + // }); + // console.log('afterRead222', this.fileList1); + + const lists = [].concat(event.file); + console.log('新增照片List1', lists); + if (this.id || this.type == 1 || this.type == 2) { + + const lists = this.fileList1.concat(event.file); + console.log('id type', lists); + } else { + const lists = [].concat(event.file); + console.log('新增照片List1', lists); + } + console.log('新增照片 list:', lists); let fileListLen = this[`fileList${event.name}`].length; + console.log('新增照片List2', fileListLen); let categoryMap = [{ category: 'user' }, @@ -1254,6 +1325,7 @@ message: '上传中' }); }); + console.log('新增照片List3', lists); for (let i = 0; i < lists.length; i++) { const result = await this.uploadFilePromise(lists[i].url, categoryMap[event.name - 1].category); if (result == '') { @@ -1270,8 +1342,30 @@ fileListLen++; // 更新对应的list字段 if (event.name === '1') { + console.log('event.name', this.fileList1); // this.list1 = this.fileList1[0]?.url || ''; //单张 - this.list1 = this.fileList1.map(item => item.url).join(','); + // for (let i = 0; i < this.fileList1.length; i++) { + // if (/^https?:\/\//i.test(this.fileList1[i].url)) { + // this.fileList1[i].url = this.fileList1[i].url.replace(/^https?:\/\/[^/]+/, ''); + // console.log('this.fileList1[i].url', this.fileList1[i].url); + + // } + + + // } + if (this.id || this.type == 1 || this.type == 2) { + this.list1 = this.fileList1.map(url => { + // 使用URL对象方法 + // const urlObj = new URL(url); + const urlObj = url.url.split('qingchunta.hschool.com.cn')[1] + console.log('urlObj', urlObj); + return urlObj; + }); + } else { + this.list1 = this.fileList1.map(item => item.url); + } + console.log('this.fileList1', this.fileList1); + this.list1 = this.fileList1.map(item => item.url); console.log('this.list1', this.list1); } } @@ -1292,7 +1386,7 @@ }, success: (res) => { var js = JSON.parse(res.data); - console.log(js.data.errcode); + console.log('js.data.errcode:', js.data.errcode); if (js.data.errcode == '30002') { uni.showToast({ title: '请登录...', @@ -1323,7 +1417,7 @@ if (res.code == 1) { this.apply_info = res.data.apply_info this.State = res.data.type - console.log(res.data.type) + console.log('res.data.type:', res.data.type) if (res.data.auth_status == 2) { this.status = 2 this.reason = res.data.reason @@ -1481,7 +1575,7 @@ let hdtime = this.times_b_int + ' - ' + this.times_e_int; 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); + console.log('images', this.form.images); params = { title: this.form.title, cate_ids: this.form.cate_ids, @@ -1498,21 +1592,31 @@ address: this.form.address, address_detail: this.form.address_detail, image: this.qunQrcode, - ids:this.id + ids: this.id } console.log('params00', params); - console.log('params01', this.id ); - console.log('params01', this.original_activity_id ); + console.log('params01', this.id); + console.log('params01', this.original_activity_id); //编辑 if (this.id) { - console.log('编辑',params.images); - params.images = params.images.map(url => { - // 使用URL对象方法 - // const urlObj = new URL(url); - const urlObj = url.split('qingchunta.hschool.com.cn')[1] - console.log('urlObj', urlObj); - return urlObj; - }).join(','); + console.log('编辑', params.images); + for (let i = 0; i < params.images.length; i++) { + if (/^https?:\/\//i.test(params.images[i])) { + params.images[i] = params.images[i].replace(/^https?:\/\/[^/]+/, ''); + console.log('params.images[i].url', params.images[i]); + }else { + params.images[i] = params.images[i] + } + } + console.log('params.images排查数组的url的路径', params.images); + params.images = params.images.join(','); + // params.images = params.images.map(url => { + // // 使用URL对象方法 + // // const urlObj = new URL(url); + // const urlObj = url.split('qingchunta.hschool.com.cn')[1] + // console.log('urlObj', urlObj); + // return urlObj; + // }).join(','); console.log('params', params.images); // params.image = new URL(params.image).pathname ; // params.image = params.image.replace(/^https?:\/\/[^/]+/, '') @@ -1558,7 +1662,7 @@ } uni.showToast({ - title: '发布成功！', + title: '修改成功！', icon: 'none', duration: 2000, }); @@ -1570,11 +1674,11 @@ }, 1000); } else { this.$u.toast(res.msg); - // uni.showToast({ - // title: res.msg, - // icon: 'none', - // duration: 2000 - // }); + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); } }).catch(error => { uni.showToast({ @@ -1584,16 +1688,24 @@ }); }); } else { - console.log('新增'); - - if(this.type == 1 || this.type == 2) { - params.images = params.images.map(url => { - // 使用URL对象方法 - // const urlObj = new URL(url); - const urlObj = url.split('qingchunta.hschool.com.cn')[1] - console.log('urlObj', urlObj); - return urlObj; - }).join(','); + console.log('新增', params.images); + if (this.type == 1 || this.type == 2) { + console.log('新增11', params.images); + for (let j = 0; j < params.images.length; j++) { + if (/^https?:\/\//i.test(params.images[j])) { + params.images[j] = params.images[j].replace(/^https?:\/\/[^/]+/, ''); + console.log('params.images[i].url', params.images[j]); + } + } + params.images = params.images.join(',') + console.log('params.images排查数组的url的路径', params.images); + // params.images = params.images.map(url => { + // // 使用URL对象方法 + // // const urlObj = new URL(url); + // const urlObj = url.split('qingchunta.hschool.com.cn')[1] + // console.log('urlObj', urlObj); + // return urlObj; + // }).join(','); console.log('params', params.images); // params.image = new URL(params.image).pathname ; // params.image = params.image.replace(/^https?:\/\/[^/]+/, '') @@ -1605,7 +1717,7 @@ params.image = params.image.replace(/^https?:\/\/[^/]+/, ''); console.log('params', params.image); } - + uni.$u.http.post(url, params).then(res => { if (res.code == 1) { //置空 diff --git a/packageB/invoice/addHead.vue b/packageB/invoice/addHead.vue index ce2916c..0185800 100644 --- a/packageB/invoice/addHead.vue +++ b/packageB/invoice/addHead.vue @@ -33,7 +33,7 @@ - diff --git a/packageB/invoice/addInvoice.vue b/packageB/invoice/addInvoice.vue index a4497ea..cf3f678 100644 --- a/packageB/invoice/addInvoice.vue +++ b/packageB/invoice/addInvoice.vue @@ -52,7 +52,7 @@ - @@ -187,7 +187,7 @@ {{item.tax_id}} - @@ -205,7 +205,7 @@ - diff --git a/packageB/invoice/invoiceCenter.vue b/packageB/invoice/invoiceCenter.vue index cce69c1..c450fa2 100644 --- a/packageB/invoice/invoiceCenter.vue +++ b/packageB/invoice/invoiceCenter.vue @@ -142,7 +142,7 @@ - + 抬头信息仅用于开具发票，请勿用于转账等其他用途谨防受骗 @@ -160,7 +160,7 @@ {{item.tax_id}} - + @@ -178,7 +178,7 @@ - + --> diff --git a/packageB/invoice/invoiceInfo.vue b/packageB/invoice/invoiceInfo.vue index 8287296..7f65e5c 100644 --- a/packageB/invoice/invoiceInfo.vue +++ b/packageB/invoice/invoiceInfo.vue @@ -2,10 +2,10 @@ - + - + {{detailAny.invoice_status_text}} 已开发票金额: ￥{{detail.price}} diff --git a/pages.json b/pages.json index 0ead5f1..e1aaec0 100644 --- a/pages.json +++ b/pages.json @@ -221,18 +221,18 @@ "navigationBarTitleText": "邀请入驻" } }, - { - "path": "my/management", - "style": { - "navigationBarTitleText": "课程管理" - } - }, - { - "path": "my/ac-management", - "style": { - "navigationBarTitleText": "活动管理" - } - }, + // { + // "path": "my/management", + // "style": { + // "navigationBarTitleText": "课程管理" + // } + // }, + // { + // "path": "my/ac-management", + // "style": { + // "navigationBarTitleText": "活动管理" + // } + // }, { "path": "my/help", "style": { @@ -246,25 +246,25 @@ } }, - { - "path": "my/addManagement", - "style": { - "navigationBarTitleText": "新增课程" - } - }, - { - "path": "my/mentList", - "style": { - "navigationBarTitleText": "订单管理" - } - }, + // { + // "path": "my/addManagement", + // "style": { + // "navigationBarTitleText": "新增课程" + // } + // }, + // { + // "path": "my/mentList", + // "style": { + // "navigationBarTitleText": "订单管理" + // } + // }, - { - "path": "my/refund", - "style": { - "navigationBarTitleText": "发起退款" - } - }, + // { + // "path": "my/refund", + // "style": { + // "navigationBarTitleText": "发起退款" + // } + // }, { "path": "center/detail", "style": { @@ -285,19 +285,19 @@ "navigationBarTitleText": "报名信息" } }, - { - "path": "center/MechanismDetail", - "style": { - "navigationBarTitleText": "机构详情" - } - }, + // { + // "path": "center/MechanismDetail", + // "style": { + // "navigationBarTitleText": "机构详情" + // } + // }, - { - "path": "center/orderDetail", - "style": { - "navigationBarTitleText": "订单详情" - } - }, + // { + // "path": "center/orderDetail", + // "style": { + // "navigationBarTitleText": "订单详情" + // } + // }, { "path": "center/applyDetail", "style": { diff --git a/pages/center/index.vue b/pages/center/index.vue index 27edd6d..c277140 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -58,19 +58,7 @@ - - - - * - 报名时间 - - - - - - - + @@ -90,6 +78,21 @@ + + + * + 报名时间 + + + {{ + form.sign_time == '' ? '请选择报名时间' : form.sign_time }} + + + + + *活动分类 @@ -151,8 +154,7 @@ v-model.number="form.stock" /> --> - + @@ -368,11 +370,12 @@ - + - 注意：【活动金额为0时，将不支持自动退款。若金额设置为1或以上，可设置其他退款政策。】 + + 注意：【活动金额为0时，将不支持自动退款。若金额设置为1或以上，可设置其他退款政策。】