tijiao
This commit is contained in:
@@ -19,8 +19,8 @@ const service = axios.create({
|
|||||||
// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
|
// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
|
||||||
// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
|
// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
|
||||||
// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
|
// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
|
||||||
// baseURL: '/api', //本地
|
baseURL: '/api', //本地
|
||||||
baseURL: '/', //正式
|
// baseURL: '/', //正式
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -410,6 +410,8 @@ const en = {
|
|||||||
payDetail: 'Payment Details',
|
payDetail: 'Payment Details',
|
||||||
total: 'Total price',
|
total: 'Total price',
|
||||||
youhui: 'Discount',
|
youhui: 'Discount',
|
||||||
|
discountprice: 'Discount price',
|
||||||
|
youhuiremark: 'Discount description',
|
||||||
submitOrder: 'Submit Order',
|
submitOrder: 'Submit Order',
|
||||||
state0: 'Obligation',
|
state0: 'Obligation',
|
||||||
state1: 'Payment successful',
|
state1: 'Payment successful',
|
||||||
|
|||||||
@@ -401,6 +401,8 @@ const zh = {
|
|||||||
payDetail: '付款详情',
|
payDetail: '付款详情',
|
||||||
total: '总价',
|
total: '总价',
|
||||||
youhui: '优惠',
|
youhui: '优惠',
|
||||||
|
discountprice: '折扣价格',
|
||||||
|
youhuiremark: '优惠说明',
|
||||||
submitOrder: '提交订单',
|
submitOrder: '提交订单',
|
||||||
state0: '待付款',
|
state0: '待付款',
|
||||||
state1: '已缴费',
|
state1: '已缴费',
|
||||||
|
|||||||
@@ -66,9 +66,9 @@
|
|||||||
our discount policy here:
|
our discount policy here:
|
||||||
<a
|
<a
|
||||||
style="color: rgb(81, 127, 213); cursor: pointer; text-decoration: underline"
|
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"
|
target="_blank"
|
||||||
>https://www.tmrjournals.com/apc/</a
|
>https://www.tmrjournals.com/tmr/free-application/</a
|
||||||
>.
|
>.
|
||||||
</p>
|
</p>
|
||||||
<el-card class="box-card" style="width: 100%"
|
<el-card class="box-card" style="width: 100%"
|
||||||
|
|||||||
@@ -24,24 +24,33 @@
|
|||||||
<div class="settlementPanelContainer">
|
<div class="settlementPanelContainer">
|
||||||
<div class="priceWrap">
|
<div class="priceWrap">
|
||||||
<div class="priceLine priceLine_total">
|
<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="priceRight">
|
||||||
<div class="trade-price-container price">
|
<div class="trade-price-container price" >
|
||||||
<span class="trade-price-symbol priceTotal_unit">$</span>
|
<span class="trade-price-symbol priceTotal_unit" >$</span>
|
||||||
<span class="trade-price-integer priceTotal_num">{{ formatAmount(total) }}</span>
|
<span class="trade-price-integer priceTotal_num" >{{ formatAmount(original_price) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="priceLine priceLine_total">
|
<!-- <div class="priceLine priceLine_total">
|
||||||
<div class="priceTotal_title" style="font-weight: 400">{{ $t('pendingPayment.youhui') }}</div>
|
<div class="priceTotal_title" style="">{{ $t('pendingPayment.discountprice') }}</div>
|
||||||
<div class="priceRight" style="font-weight: 400; color: #7c889c">
|
<div class="priceRight" style="font-weight: 400; color: #7c889c">
|
||||||
<div class="trade-price-container price">
|
<div class="trade-price-container price">
|
||||||
<span class="trade-price-symbol priceTotal_unit" style="font-weight: 400; color: #7c889c">$</span>
|
<span class="trade-price-symbol priceTotal_unit" >$</span>
|
||||||
<span class="trade-price-integer priceTotal_num" style="font-weight: 400; color: #7c889c">0</span>
|
<span class="trade-price-integer priceTotal_num" >{{ formatAmount(total) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
<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="SettlementOption">
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<label class="ant-checkbox-wrapper">
|
<label class="ant-checkbox-wrapper">
|
||||||
@@ -184,6 +193,8 @@ export default {
|
|||||||
articleInfo: {},
|
articleInfo: {},
|
||||||
journalInfo: {},
|
journalInfo: {},
|
||||||
total: '',
|
total: '',
|
||||||
|
original_price: '',
|
||||||
|
fee_remark: '',
|
||||||
// selectedPaymentMethod: 'PayPal', // 默认选中 PayPal
|
// selectedPaymentMethod: 'PayPal', // 默认选中 PayPal
|
||||||
selectedPaymentMethod: 'Paystation', // 默认选中 PayPal
|
selectedPaymentMethod: 'Paystation', // 默认选中 PayPal
|
||||||
articleId: this.$route.query.id,
|
articleId: this.$route.query.id,
|
||||||
@@ -353,7 +364,9 @@ export default {
|
|||||||
// journal: this.journalInfo.title
|
// 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 {
|
.priceWrap .priceLine_total {
|
||||||
margin-bottom: 16px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.priceWrap .priceTotal_unit {
|
.priceWrap .priceTotal_unit {
|
||||||
|
|||||||
Reference in New Issue
Block a user