diff --git a/public/index.html b/public/index.html index 7a05f02..7949a8c 100644 --- a/public/index.html +++ b/public/index.html @@ -16,7 +16,7 @@ - + diff --git a/src/assets/img/paypal.png b/src/assets/img/paypal.png new file mode 100644 index 0000000..46c248b Binary files /dev/null and b/src/assets/img/paypal.png differ diff --git a/src/assets/img/success.png b/src/assets/img/success.png new file mode 100644 index 0000000..700e7a4 Binary files /dev/null and b/src/assets/img/success.png differ diff --git a/src/assets/img/zhifubao.png b/src/assets/img/zhifubao.png new file mode 100644 index 0000000..4da4faa Binary files /dev/null and b/src/assets/img/zhifubao.png differ diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 202f8ec..0eceee8 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -191,10 +191,7 @@ export default { index: '1', title: this.$t('sidebar.author'), subs: [ - { - index: 'PendingPaymentAuthor', - title: this.$t('sidebar.author4') - }, + { index: 'articleList', title: this.$t('sidebar.author1') @@ -206,7 +203,10 @@ export default { { index: 'articleAdd', title: this.$t('sidebar.author2') - } + } , { + index: 'orderListAuthor', + title: this.$t('sidebar.author4') + }, ] } // ,{ diff --git a/src/components/common/common.vue b/src/components/common/common.vue index 1b4465d..e6a6b8e 100644 --- a/src/components/common/common.vue +++ b/src/components/common/common.vue @@ -2,12 +2,17 @@ //记得切换 //正式 -// const mediaUrl = '/public/'; -// const baseUrl = '/'; +const mediaUrl = '/public/'; +const baseUrl = '/'; -const mediaUrl = 'https://submission.tmrjournals.com/public/'; -const baseUrl = '/api'; +// const mediaUrl = 'https://submission.tmrjournals.com/public/'; +// const baseUrl = '/api'; +const paypalInfo= { + sandbox: 'ARyoAhBNlTMDEBb6QvJYmK0gA4cfSS6WY0Vr2uJhX3NOe7V9qVCJuNwuRHRO09WGcTgS5AkuTIgRZDcx',//沙盒环境 + production: '' + } + //本地(正式环境 ) @@ -27,6 +32,7 @@ const baseUrl = '/api'; export default { baseUrl, mediaUrl, + paypalInfo }; diff --git a/src/components/common/langs/en.js b/src/components/common/langs/en.js index 31e3346..0e92d3f 100644 --- a/src/components/common/langs/en.js +++ b/src/components/common/langs/en.js @@ -149,7 +149,7 @@ const en = { author: 'Author', author1: 'My manuscripts', author2: 'Submit manuscript', - author4: 'Pending payment', + author4: 'Order List', author3: 'Manuscripts in Draft', editor: 'Editor', editor1: 'Paper Editing System', @@ -380,7 +380,19 @@ const en = { journal:'Journal', Paymentamount:'Payment Amount', Paymentstatus:'Payment Status', + subtotal:'Subtotal', payment:'Online Payment', + payDetail:'Payment Details', + total:'Total price', + youhui:'Discount', + submitOrder:'Submit Order', + state0:'Obligation', + state1:'Payment successful', + state2:'Cancelled', + paymentmethod:'Payment Method', + Disbursements:'Disbursements', + Confirmorderinformation:'Confirm order information', + orderDetail:'Order information', } } diff --git a/src/components/common/langs/zh.js b/src/components/common/langs/zh.js index d47ec6b..6de5212 100644 --- a/src/components/common/langs/zh.js +++ b/src/components/common/langs/zh.js @@ -143,7 +143,7 @@ const zh = { author1: '我的稿件', author2: '新增稿件', author3: '草稿箱', - author4: '待缴费', + author4: '订单列表', editor: '编辑', editor1: '待审稿件', editormanage: '编辑管理', @@ -373,7 +373,19 @@ const zh = { journal:'期刊', Paymentamount:'缴费金额', Paymentstatus:'缴费状态', + subtotal:'小计', payment:'在线缴费', + payDetail:'付款详情', + total:'总价', + youhui:'优惠', + submitOrder:'提交订单', + state0:'待付款', + state1:'已缴费', + state2:'已取消', + paymentmethod:'付款方式', + Disbursements:'已付款', + Confirmorderinformation:'确认订单信息', + orderDetail:'订单信息', } } diff --git a/src/components/page/Complete_profile.vue b/src/components/page/Complete_profile.vue index 5898e4a..2bf5e6f 100644 --- a/src/components/page/Complete_profile.vue +++ b/src/components/page/Complete_profile.vue @@ -1,5 +1,6 @@ + + diff --git a/src/components/page/orderListAuthor.vue b/src/components/page/orderListAuthor.vue new file mode 100644 index 0000000..63e5643 --- /dev/null +++ b/src/components/page/orderListAuthor.vue @@ -0,0 +1,119 @@ + + + + \ No newline at end of file diff --git a/src/components/page/partyRole.vue b/src/components/page/partyRole.vue index c9364e5..e37fd36 100644 --- a/src/components/page/partyRole.vue +++ b/src/components/page/partyRole.vue @@ -695,6 +695,15 @@ + + + + + + + @@ -1101,9 +1110,13 @@