From f9ebae5cfe0b06f5bc2bd335c9a2147c74602ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Wed, 5 Mar 2025 14:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pendingPayment/OrderConfirmation.vue         |  4 ++--
 .../page/components/pendingPayment/success.vue   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/page/components/pendingPayment/OrderConfirmation.vue b/src/components/page/components/pendingPayment/OrderConfirmation.vue
index 082d2e4..e7f5a90 100644
--- a/src/components/page/components/pendingPayment/OrderConfirmation.vue
+++ b/src/components/page/components/pendingPayment/OrderConfirmation.vue
@@ -240,8 +240,8 @@ export default {
                 .then((res) => {
                     console.log('res at line 222:', res);
                     if (res.code == 0) {
-                        this.$router.push(res.data.paystation.payment_url)
-                        // window.location.href = res.data.paystation.payment_url; 
+                       
+                        window.location.href = res.data.detail.paystation_url; 
                         loading.close();
                     } else {
                         this.$message.error(res.data.msg);
diff --git a/src/components/page/components/pendingPayment/success.vue b/src/components/page/components/pendingPayment/success.vue
index 78e7216..d98bef2 100644
--- a/src/components/page/components/pendingPayment/success.vue
+++ b/src/components/page/components/pendingPayment/success.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="success-box" v-if="articleInfo.accept_sn">
+    <div class="success-box" v-if="articleInfo.order_sn">
         <div class="payment-success">
             <div style="display: flex; align-items: center; margin-bottom: 10px">
                 <h2 style="margin: 0 auto; display: flex; align-items: center">
@@ -10,11 +10,11 @@
             <p>
                 Article ID:
 
-                <span style="color: #333; font-weight: 600"> {{ articleInfo.accept_sn }}</span>
+                <span style="color: #333; font-weight: 600"> {{ articleInfo.order_sn }}</span>
             </p>
             <p>
-                Total Amount: <span style="color: #ff5000"><span class="currency">$</span></span
-                ><span style="color: #ff5000; font-size: 24px; line-height: 24px">{{ formatAmount(total) }}</span>
+                Total Amount: <span style="color: #ff5000"></span
+                ><span style="color: #ff5000; font-size: 24px; line-height: 24px">{{ formatAmount(total) }} <span class="" style="font-size: 20px;">{{ articleInfo.paystation.currency }}</span></span>
             </p>
             <!-- <p>Payment Method: {{ paymentMethod }}</p> -->
             <p>You will receive an email confirmation shortly.</p>
@@ -30,7 +30,7 @@ export default {
         return {
             alertShow: true,
             urlList: {
-                detail: 'api/Order/preOrderDetail',
+                detail: 'api/Preaccept/getPreacceptPayment',
                 createdOrder: 'api/Order/creatArticleOrder'
             },
             articleInfo: {},
@@ -68,10 +68,10 @@ export default {
                 .then((res) => {
                     console.log('res at line 191:', res);
                     if (res.code == 0) {
-                        this.articleInfo = res.data.article_detail;
-                        this.journalInfo = res.data.journal_detail;
+                        this.articleInfo = res.data.order;
+                        // this.journalInfo = res.data.journal_detail;
 
-                        this.total = this.journalInfo.fee;
+                        this.total = Number(res.data.order.paystation.amount / 100);
                     }
                 });
         },