From 0e20c3344bc3bf2c4c44bef014ed43a7c093aecf 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: Fri, 21 Nov 2025 11:08:01 +0800
Subject: [PATCH] tijiao

---
 src/api/index.js                              |  4 +--
 src/components/common/langs/en.js             |  2 ++
 src/components/common/langs/zh.js             |  2 ++
 src/components/page/Complete_profile.vue      |  4 +--
 .../pendingPayment/OrderConfirmation.vue      | 35 +++++++++++++------
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 525753d..487fb66 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -19,8 +19,8 @@ const service = axios.create({
 	// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
 	// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
 	// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
-	// baseURL: '/api', //本地
-	baseURL: '/', //正式
+	baseURL: '/api', //本地
+	// baseURL: '/', //正式
 
 });
 
diff --git a/src/components/common/langs/en.js b/src/components/common/langs/en.js
index cdf5f17..f75818b 100644
--- a/src/components/common/langs/en.js
+++ b/src/components/common/langs/en.js
@@ -410,6 +410,8 @@ const en = {
 		payDetail: 'Payment Details',
 		total: 'Total price',
 		youhui: 'Discount',
+		discountprice: 'Discount price',
+		youhuiremark: 'Discount description',
 		submitOrder: 'Submit Order',
 		state0: 'Obligation',
 		state1: 'Payment successful',
diff --git a/src/components/common/langs/zh.js b/src/components/common/langs/zh.js
index f154813..54f018b 100644
--- a/src/components/common/langs/zh.js
+++ b/src/components/common/langs/zh.js
@@ -401,6 +401,8 @@ const zh = {
 		payDetail: '付款详情',
 		total: '总价',
 		youhui: '优惠',
+		discountprice: '折扣价格',
+		youhuiremark: '优惠说明',
 		submitOrder: '提交订单',
 		state0: '待付款',
 		state1: '已缴费',
diff --git a/src/components/page/Complete_profile.vue b/src/components/page/Complete_profile.vue
index 5311539..f315132 100644
--- a/src/components/page/Complete_profile.vue
+++ b/src/components/page/Complete_profile.vue
@@ -66,9 +66,9 @@
                         our discount policy here:
                         <a
                             style="color: rgb(81, 127, 213); cursor: pointer; text-decoration: underline"
-                            href="https://www.tmrjournals.com/apc/"
+                            href="https://www.tmrjournals.com/tmr/free-application/"
                             target="_blank"
-                            >https://www.tmrjournals.com/apc/</a
+                            >https://www.tmrjournals.com/tmr/free-application/</a
                         >.
                     </p>
                     <el-card class="box-card" style="width: 100%"
diff --git a/src/components/page/components/pendingPayment/OrderConfirmation.vue b/src/components/page/components/pendingPayment/OrderConfirmation.vue
index 3e08246..35d406a 100644
--- a/src/components/page/components/pendingPayment/OrderConfirmation.vue
+++ b/src/components/page/components/pendingPayment/OrderConfirmation.vue
@@ -24,24 +24,33 @@
             <div class="settlementPanelContainer">
                 <div class="priceWrap">
                     <div class="priceLine priceLine_total">
-                        <div class="priceTotal_title">{{ $t('pendingPayment.total') }}</div>
+                        <div class="priceTotal_title" >{{ $t('pendingPayment.total') }}</div>
                         <div class="priceRight">
-                            <div class="trade-price-container price">
-                                <span class="trade-price-symbol priceTotal_unit">$</span>
-                                <span class="trade-price-integer priceTotal_num">{{ formatAmount(total) }}</span>
+                            <div class="trade-price-container price" >
+                                <span class="trade-price-symbol priceTotal_unit" >$</span>
+                                <span class="trade-price-integer priceTotal_num" >{{ formatAmount(original_price) }}</span>
                             </div>
                         </div>
                     </div>
-                    <div class="priceLine priceLine_total">
-                        <div class="priceTotal_title" style="font-weight: 400">{{ $t('pendingPayment.youhui') }}</div>
+                    <!-- <div class="priceLine priceLine_total">
+                        <div class="priceTotal_title" style="">{{ $t('pendingPayment.discountprice') }}</div>
                         <div class="priceRight" style="font-weight: 400; color: #7c889c">
                             <div class="trade-price-container price">
-                                <span class="trade-price-symbol priceTotal_unit" style="font-weight: 400; color: #7c889c">$</span>
-                                <span class="trade-price-integer priceTotal_num" style="font-weight: 400; color: #7c889c">0</span>
+                                <span class="trade-price-symbol priceTotal_unit" >$</span>
+                                <span class="trade-price-integer priceTotal_num" >{{ formatAmount(total) }}</span>
                             </div>
                         </div>
+                    </div> -->
+                    <!--  -->
+                    <div class="priceLine priceLine_total" v-if="fee_remark">
+                        <div class="priceTotal_title" style="font-weight: 400">{{ $t('pendingPayment.youhuiremark') }}</div>
+                        <div class="priceRight" style="font-weight: 400; color: #7c889c">
+                            <div class="trade-price-container price">
+                                <span class="trade-price-symbol priceTotal_unit" style="font-weight: 400; color: #7c889c">{{ fee_remark }}</span>
+                                       </div>
+                        </div>
                     </div>
-                    <div id="paymentCard" class="trade-container type-of-normal rounded-8 mx-16 bg-gray mt-24 mb-24 pb-20 pt-20">
+                    <div id="paymentCard" class="trade-container type-of-normal rounded-8 mx-16 bg-gray mt-24 mb-24 pb-20 pt-20" style="margin-top: 20px;">
                         <div class="SettlementOption">
                             <div class="title">
                                 <label class="ant-checkbox-wrapper">
@@ -184,6 +193,8 @@ export default {
             articleInfo: {},
             journalInfo: {},
             total: '',
+            original_price: '',
+            fee_remark: '',
             // selectedPaymentMethod: 'PayPal', // 默认选中 PayPal
             selectedPaymentMethod: 'Paystation', // 默认选中 PayPal
             articleId: this.$route.query.id,
@@ -353,7 +364,9 @@ export default {
                         //         journal: this.journalInfo.title
                         //     }
                         // ];
-                        this.total = this.journalInfo.fee;
+                        this.original_price = this.journalInfo.fee;
+                        this.fee_remark = this.articleInfo.fee_remark;
+                        this.total = this.articleInfo.fee;
                     }
                 });
         },
@@ -567,7 +580,7 @@ h3 {
 }
 
 .priceWrap .priceLine_total {
-    margin-bottom: 16px;
+    margin-bottom: 10px;
 }
 
 .priceWrap .priceTotal_unit {