From edd1c554dde738b43573cc971dc3d322c922739e Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Mon, 25 Mar 2024 23:41:01 +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 | 1 +
 pages/payment/settlement.vue  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index cf2c871..a3c887b 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -222,6 +222,7 @@
 						source: 999,
 						total_amount: that.cartForm.total_amount
 					};
+					console.log(that.merchantInfo[i]);
 
 					try {
 						let res = await addCart(info);
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 5c3176a..06ec57c 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -1536,8 +1536,8 @@
 
 			// 提交订单
 			truePayOrder(data) {
-        this.orderData.money = this.totalPrice;
 				if (!data) data = this.orderData;
+				data.money = this.totalPrice;
 
 				// #ifdef MP
 				openPaySubscribe().then(() => {