From 4eb5580ff14adaf518f9ded09fe14d3fa1e8947e Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 2 Mar 2024 18:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/payment/get_payment.vue | 19 +- pages/payment/settlement.vue | 1699 +++++++++++++++++---------------- 2 files changed, 881 insertions(+), 837 deletions(-) diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue index 33da8bd..e393cb4 100644 --- a/pages/payment/get_payment.vue +++ b/pages/payment/get_payment.vue @@ -157,16 +157,15 @@ addCart(this.cartForm).then(res => { // 购物车ID that.checkForm.cart_id.push(res.data.cart_id); - that.$util.Tips({ - title: "操作成功!" - }, () => { - orderCheck(that.checkForm).then(res => { - uni.navigateTo({ - url: "/pages/payment/settlement?cartId=" + this.checkForm - .cart_id + "&money=" + this.cartForm.total_amount + - "&merName=" + this.merchantInfo.merchant.mer_name - }) - }); + orderCheck(that.checkForm).then(res1 => { + uni.navigateTo({ + url: "/pages/payment/settlement?cartId=" + this.checkForm + .cart_id + "&money=" + this.cartForm.total_amount + + "&merName=" + this.merchantInfo.merchant.mer_name, + success: (res) => { + res.eventChannel.emit('datas', res1.data.platformConsumption); + } + }) }); }).catch((err) => { this.$util.Tips({ diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue index a10405b..f60f603 100644 --- a/pages/payment/settlement.vue +++ b/pages/payment/settlement.vue @@ -1,916 +1,961 @@ \ No newline at end of file