From 2e79e5d5c211e0537853993930c5cee0788a8a2e Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:20:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(payment):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=87=91=E9=A2=9D=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将判断条件和支付金额从 qrData.value.price改为 qrData.value.leftPrice- 更新页面显示的金额相关文案
- 优化支付流程中的金额计算和提示信息
---
 app/pages/collectCode/payment/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index eebe98f..94608ad 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -21,7 +21,7 @@ const confirmPay = async () => {
     message.warning('请输入金额')
     return
   }
-  if (Number(qrData.value.price) < Number(amount.value)) {
+  if (Number(qrData.value.leftPrice) < Number(amount.value)) {
     message.warning('不得高于全部金额')
     return
   }
@@ -30,7 +30,7 @@ const confirmPay = async () => {
     forbidClick: true,
   });
   const res = await createOrder({
-    price: payStatus.value === 0 ? qrData.value.price : amount.value,
+    price: payStatus.value === 0 ? qrData.value.leftPrice : amount.value,
     currency: qrData.value.currency,
     qrUid:qrUid.value,
     testReturnHost:window.location.origin,
@@ -69,11 +69,11 @@ const handleInput = (e) => {
     </div>
     <div class="text-#1A1A1A text-16px mb-25px font-bold">{{ payStatus === 0 ? '支付全部' : '支付部分' }}</div>
     <div class="text-#999999 text-16px mb-24px font-bold" v-if="payStatus===0">{{ qrData.currency }}
-      {{ qrData?.price }}
+      {{ qrData?.leftPrice }}
     </div>
     <div class="mb-12px" v-else>
       <input v-model="amount" class="w-272px h-48px bg-#F3F3F3 px-11px text-16px" type="text"
-             :placeholder="`最多${qrData.currency}${qrData?.price}`" @input="handleInput">
+             :placeholder="`最多${qrData.currency}${qrData?.leftPrice}`" @input="handleInput">
     </div>
     <div class="text-#2B53AC text-14px" @click="changePayStatus">{{ payStatus === 1 ? '支付全部' : '支付部分' }}</div>
     <div class="w-full mt-auto mb-40px">