From ef61da5979ff82d4a282ce426d12b6f41ef8eba9 Mon Sep 17 00:00:00 2001 From: zhangkai <847704969@qq.com> Date: Tue, 3 Jun 2025 18:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E5=B8=83=20?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95=E5=8A=A8=E6=80=81?= =?UTF-8?q?=20=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/afterSales/index.vue | 8 +- packageA/center/applyDetail.vue | 36 ++++++- packageA/my/exercise.vue | 2 +- packageA/my/pendinPayStatus.vue | 165 +++++++++++++++++-------------- packageA/my/person-detail.vue | 4 +- pages.json | 3 +- pages/activity/index.vue | 2 +- pages/activity/stationStemys.vue | 8 +- pages/center/index.vue | 53 +++++----- 9 files changed, 167 insertions(+), 114 deletions(-) diff --git a/packageA/afterSales/index.vue b/packageA/afterSales/index.vue index 8a2e859..0d407f4 100644 --- a/packageA/afterSales/index.vue +++ b/packageA/afterSales/index.vue @@ -39,7 +39,7 @@ - 选择退款数量 (剩余{{detailAny.join_info.stock - detailAny.join_info.people_number}}张) + 选择退款数量 (剩余{{detailAny.verification.total_number - detailAny.verification.have_number}}张) {{ nummoney }} @@ -224,9 +224,9 @@ }) return; } - if (this.nummoney > this.detailAny.join_info.people_number) { + if (this.nummoney > this.detailAny.verification.total_number) { uni.showToast({ - title: '退款数量不能已购买数量', + title: '退款数量不能超过已购买数量', icon: 'none', duration: 2000 }) @@ -275,7 +275,7 @@ }) }, addMon(){ - if (this.nummoney < this.detailAny.join_info.people_number) { + if (this.nummoney < this.detailAny.verification.total_number) { this.nummoney++; this.priceGem = Number(this.detail.price)*Number(this.nummoney)+".00"; }else{ diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue index 4da44c1..b4f7551 100644 --- a/packageA/center/applyDetail.vue +++ b/packageA/center/applyDetail.vue @@ -113,7 +113,7 @@ - + @@ -285,6 +285,7 @@ titleStyle: { color: '#FFFFFF' }, + oper_data:null }; }, @@ -312,13 +313,39 @@ console.log(options.id) this.getDetail() // this.getShare() - this.getAgreement() + this.getAgreement(); + this.getMoneyGetm(); }, methods: { addMon(){ - this.nummoney++ - this.getMoneyGetm(); + if (this.detail.feel == 1) { + if (this.nummoney < Number(this.oper_data.free_activity_max_people) && + this.nummoney < (this.detail.join_info.stock - this.detail.join_info.people_number)) { + this.nummoney++ + this.getMoneyGetm(); + }else{ + uni.showToast({ + title: '不能超过免费限制数量和剩余可报名人数', + icon: 'none', + duration: 5000 + }) + return; + } + }else{ + + if (this.nummoney < (this.detail.join_info.stock - this.detail.join_info.people_number)) { + this.nummoney++ + this.getMoneyGetm(); + }else{ + uni.showToast({ + title: '不能超过剩余数量', + icon: 'none', + duration: 5000 + }) + return; + } + } }, removeMon(){ if (this.nummoney > 1) { @@ -576,6 +603,7 @@ if (res.code == 1) { this.priceGem = res.data.order_data.totalprice this.order_no = res.data.order_no + this.oper_data = res.data.oper_data } else { uni.showToast({ title: res.msg, diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index 2771062..b012459 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -298,7 +298,7 @@ }) }else{ uni.navigateTo({ - url: "/packageA/my/pendinPayStatus?id=" + id + url: "/packageA/my/pendinPayStatus?id=" + id + "&status=" + status }) } diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue index 3d6f97a..ef68c46 100644 --- a/packageA/my/pendinPayStatus.vue +++ b/packageA/my/pendinPayStatus.vue @@ -1,91 +1,95 @@ @@ -166,8 +170,11 @@ is_show_model: false, //是否显示分享模态窗 background: '#ffffff00', titleStyle: { - color: '#FFFFFF' + color: '#000000', + fontSize: '28rpx' }, + status:null, + toptitle: '', }; }, @@ -176,8 +183,19 @@ onLoad(options) { this.userInfo = uni.getStorageSync("userInfo") this.id = options.id - this.order_no = options.order_no + this.status = options.status; + if (options.status == 9) { + this.toptitle = '已完成' + }else if(options.status == -3){ + this.toptitle = '已关闭' + }else if(options.status == 4 || options.status == 7){ + this.toptitle = '售后中' + }else if(options.status == 5){ + this.toptitle = '退款中' + }else if(options.status == 6){ + this.toptitle = '已退款' + } this.getDetail() }, @@ -348,6 +366,7 @@ .box { position: relative; margin: 0 30rpx; + margin-top: 180rpx; } diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue index 0da8c4f..4bbd490 100644 --- a/packageA/my/person-detail.vue +++ b/packageA/my/person-detail.vue @@ -21,14 +21,14 @@ - + diff --git a/pages.json b/pages.json index 8a38c42..cc37688 100644 --- a/pages.json +++ b/pages.json @@ -141,7 +141,8 @@ { "path": "my/pendinPayStatus", "style": { - "navigationBarTitleText": "已完成订单" + "navigationBarTitleText": "已完成订单", + "navigationStyle": "custom" } }, diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 4976b42..97ad079 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -34,7 +34,7 @@ {{item.title}} {{item.createtime_text}} - {{item.desc}} + {{item.desc}}