From ee33ce076ffef58156448d66195925e5f5dcb58d 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: Thu, 9 Jan 2025 11:23:33 +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

---
 src/components/common/langs/en.js             |   2 +-
 src/components/common/langs/zh.js             |   6 +-
 src/components/page/Complete_profile.vue      | 199 +++++++++++-------
 src/components/page/PreIngestedEditor.vue     |  35 +--
 src/components/page/articleList.vue           |   2 +-
 .../pendingPayment/OrderConfirmation.vue      |   6 +-
 .../components/pendingPayment/success.vue     |  47 +++--
 7 files changed, 156 insertions(+), 141 deletions(-)

diff --git a/src/components/common/langs/en.js b/src/components/common/langs/en.js
index 34de7e8..d5c9db7 100644
--- a/src/components/common/langs/en.js
+++ b/src/components/common/langs/en.js
@@ -396,7 +396,7 @@ const en = {
 	},
 	PreAccept:{
 successInfo:'Congratulations! Your manuscript has entered into <b>Pre-accept</b> status. Now please check and complete the necessary information of your manuscript for final publication.',
-step1:'Manuscript Payment',	
+step1:'Article Processing Charge',	
 step2:'Article Proofreading',	
 step3:'References',	
 step:'step',
diff --git a/src/components/common/langs/zh.js b/src/components/common/langs/zh.js
index 3a6e31e..dd34bdb 100644
--- a/src/components/common/langs/zh.js
+++ b/src/components/common/langs/zh.js
@@ -389,9 +389,9 @@ const zh = {
 	},
 	PreAccept: {
 		successInfo: 'Congratulations! Your manuscript has entered into <b>Pre-accept</b> status. Now please check and complete the necessary information of your manuscript for final publication.',
-		step1: 'Manuscript Payment',
-		step2: 'Article Proofreading',
-		step3: 'References',
+		step1: '文章处理费用',
+		step2: '文章校对',
+		step3: '参考',
 		step: 'step',
 		Information: 'Fill in information',
 
diff --git a/src/components/page/Complete_profile.vue b/src/components/page/Complete_profile.vue
index 2c41732..833546b 100644
--- a/src/components/page/Complete_profile.vue
+++ b/src/components/page/Complete_profile.vue
@@ -1,73 +1,26 @@
 <template>
-    <div class="container" style="padding-top: 0px">
-        <el-row :gutter="20">
-            <el-alert
-                v-if="alertShow"
-                :title="'Dear ' + user_name + ' Congratulations! , The information will be hidden after ' + hideSec + ' seconds'"
-                type="success"
-                show-icon
-            >
-            </el-alert>
-            <el-col class="mt20">
-                <p v-html="$t('PreAccept.successInfo')"></p>
-            </el-col>
-        </el-row>
-
-        <div style="" v-if="journalInfo.fee != '0.00'">
-            <p
-                v-if="articleInfo.is_buy == 0"
-                style="
-                    color: #409eff;
-                    margin-top: 10px;
-                    background: #ecf5ff;
-                    border-color: #b3d8ff;
-                    color: #505050;
-                    font-size: 14px;
-                    padding: 10px;
-                    box-sizing: border-box;
-                    position: relative;
-                    overflow: hidden;
-                "
-            >
-                <i class="el-icon-warning" style="color: #517fd5; margin-right: 10px"></i>The article processing fee is
-                <span style="color: #ff5000;font-weight: bold;">{{ journalInfo.fee }}</span> United States Dollars (USD), applicable to papers submitted after January 1, 2025, and ultimately
-                accepted for publication. For authors seeking to apply for a fee discount, please
-                <a
-                    style="color: rgb(81, 127, 213); cursor: pointer; text-decoration: underline"
-                    href="https://www.tmrjournals.com/apc/"
-                    target="_blank"
-                    >click here</a
-                >
-                to view the detailed policy.
-                <el-button
-                    size="mini"
-                    type="primary"
-                    style="padding: 4px 6px; float: right; background: #ff5000 !important; border-color: #ff5000 !important"
-                    @click="goOrderConfirmation(articleInfo)"
-                    >Payment</el-button
-                >
-            </p>
-            <p
-                v-if="articleInfo.is_buy == 1"
-                style="
-                    color: #409eff;
-                    margin-top: 10px;
-                    background: #ecf5ff;
-                    border-color: #b3d8ff;
-                    color: #505050;
-                    font-size: 14px;
-                    padding: 10px;
-                    box-sizing: border-box;
-                    position: relative;
-                    overflow: hidden;
-                "
-            >
-                <i class="el-icon-warning" style="color: #517fd5; margin-right: 10px"></i>
-                Dear {{ user_name }}, congratulations! Your manuscript has been successfully paid. Total amount: <span style="color: #ff5000;font-weight: bold;">{{ journalInfo.fee }}</span> USD
-              
-            </p>
-        </div>
+    <div class="container" style="padding-top: 20px; padding-bottom: 20px">
         <p
+            style="
+                background-color: #f0f9eb;
+                color: #67c23a;
+                padding: 8px 16px;
+                color: #67c23a;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            "
+        >
+            <i class="el-icon-success" style="margin-right: 10px"></i>
+            <span
+                >Dear {{ user_name }} , Congratulations! You manuscript has been pre-accepted for publication in
+                <b>{{ journalInfo.title }}</b
+                >. Please review and complete the necessary information of your manuscript. Kindly note that an article processing charge is
+                required for final publication.</span
+            >
+        </p>
+
+        <!-- <p
             style="
                 margin-top: 10px;
                 color: #409eff;
@@ -78,11 +31,11 @@
                 padding: 10px;
                 box-sizing: border-box;
             "
-            v-else
+           
         >
             <i class="el-icon-warning" style="color: #517fd5; margin-right: 10px"></i>
             This manuscript does not require payment
-        </p>
+        </p> -->
         <!-- <el-steps :active="active" finish-status="success" simple style="margin-top: 10px">
             <el-step :title="`${$t('PreAccept.step')} ${i + 1} ${v.title} `" v-for="(v, i) in stepList"> </el-step>
         </el-steps> -->
@@ -103,6 +56,60 @@
                 
             </div>
         </div> -->
+        <div class="content_box mt20 stepbox">
+            <!-- 文章引用 -->
+            <div class="con">
+                <h4 class="con-title">{{ this.$t('PreAccept.step1') }}</h4>
+                <div style="padding: 20px; box-sizing: border-box" v-loading="tableData.length==0">
+                    <p style="color: #505050; font-size: 14px; box-sizing: border-box; margin-bottom: 20px" v-if="tableData.length>0&&tableData[0].state==0">
+                        <i class="el-icon-warning" style="color: #517fd5; margin-right: 8px"></i> How to apply for a discount? Please see
+                        our discount policy here:
+                        <a
+                            style="color: rgb(81, 127, 213); cursor: pointer; text-decoration: underline"
+                            href="https://www.tmrjournals.com/apc/"
+                            target="_blank"
+                            >https://www.tmrjournals.com/apc/</a
+                        >.
+                    </p>
+                    <el-card class="box-card" style="width: 100%"
+                        ><el-table :data="tableData" style="width: 100%" align="center">
+                            <el-table-column prop="fee" label="Price">
+                                <template slot-scope="scope"> {{ scope.row.fee }} USD </template>
+                            </el-table-column>
+                            <el-table-column prop="name" label="Discounts">
+                                <template slot-scope="scope"> 0 USD </template>
+                            </el-table-column>
+                            <el-table-column prop="address" label="Tax">
+                                <template slot-scope="scope"> 0 USD </template>
+                            </el-table-column>
+                            <el-table-column prop="fee" label="Total Price"> 
+                                <template slot-scope="scope"> {{ scope.row.fee }} USD </template>
+                            </el-table-column>
+                            <el-table-column prop="" label="Current Status">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.state==1" style='color:#67c23a'><b>Completed</b></span>
+                                    <span v-if="scope.row.state==0" style='color:#f56c6c'><b>Incomplete</b></span>
+                                    
+                                
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <p style="text-align: right; margin: 20px 0 0" v-if="tableData.length>0&&tableData[0].state==0">
+                            <span
+                                @click="goOrderConfirmation(articleInfo)"
+                                style="color: rgb(81, 127, 213); cursor: pointer; text-decoration: underline"
+                                >Click here</span
+                            >
+                            to go to the payment page.
+                        </p></el-card
+                    >
+
+                    <!-- <p style="text-align: right;">Click here to request an invoice.</p> -->
+                </div>
+
+                <!-- <div v-else style="padding: 20px; box-sizing: border-box"></div> -->
+            </div>
+        </div>
         <div class="content_box mt20 stepbox">
             <!-- 文章引用 -->
             <div class="con">
@@ -118,13 +125,15 @@
             <div class="con">
                 <h4 class="con-title" style="overflow: hidden">
                     {{ this.$t('PreAccept.step3') }}
-                    <span v-if="Ainfo.refer_state.state" style="float: right" class="el-icon-check pass status"> Complete</span>
-                    <span v-else class="el-icon-pie-chart notPass status" style="float: right"> Pending</span>
+                    <b> <span v-if="Ainfo.refer_state.state" style="float: right" class="el-icon-check pass status"> Complete</span>
+                    <span v-else class="el-icon-pie-chart notPass status" style="float: right"> Pending</span></b>
+                   
                 </h4>
                 <p style="color: #505050; font-size: 14px; padding: 20px; box-sizing: border-box">
                     <i class="el-icon-warning" style="color: #517fd5; margin-right: 8px"></i> A total of
                     <i class="tip">{{ Ainfo.refer_state.num }}</i> references in this manuscript is identified.
                 </p>
+
                 <p style="color: #505050; font-size: 14px; padding: 0 20px 20px; box-sizing: border-box">
                     <el-button @click="goAddReferences(thisArtcleId)" icon="el-icon-edit" type="text">Edit</el-button>
                 </p>
@@ -138,7 +147,7 @@
                 <span class="el-icon-info help"></span>
                 <div>
                     <h4>Any questions/Help</h4>
-                    <p class="mt20">If you experience any problems, please contact us by publisher@tmrjournals.com</p>
+                    <p class="mt20">If you experience any problems, please contact us by {{ journalInfo.email }}</p>
                 </div>
             </div>
         </div>
@@ -150,10 +159,12 @@ import OrderConfirmation from '../page/components/pendingPayment/OrderConfirmati
 export default {
     data() {
         return {
+            tableData: [],
             articleInfo: {},
             journalInfo: {},
             urlList: {
-                detail: 'api/Order/preOrderDetail'
+                detail: 'api/Order/preOrderDetail',
+                getPreacceptPayment: 'api/Preaccept/getPreacceptPayment'
             },
             active: 0,
             stepList: [
@@ -190,6 +201,13 @@ export default {
         this.getInfoStatu();
         this.hideAlert();
         this.getDetail();
+        this.getPreacceptPayment();
+    },
+    activated() {
+        this.getInfoStatu();
+        this.hideAlert();
+        this.getDetail();
+        this.getPreacceptPayment();
     },
     components: {
         OrderConfirmation
@@ -203,10 +221,22 @@ export default {
                 path: '/OrderConfirmation',
                 query: {
                     id: this.$route.query.id,
-                    type: 'Pre-accept'
+                   
                 }
             });
         },
+        getPreacceptPayment() {
+            this.$api
+                .post(this.urlList.getPreacceptPayment, {
+                    article_id: this.$route.query.id
+                })
+                .then((res) => {
+                    console.log('res at line 191:', res);
+                    if (res.code == 0) {
+                        this.tableData = [{ ...res.data }];
+                    }
+                });
+        },
         getDetail() {
             this.$api
                 .post(this.urlList.detail, {
@@ -352,8 +382,8 @@ p {
 }
 .helpcontent {
     color: #888;
-    margin-top: 150px;
-    padding-top: 30px;
+    margin-top: 20px;
+    padding-top: 20px;
     border-top: 2px solid #f1f1f1;
 }
 .helpcontent p {
@@ -361,11 +391,22 @@ p {
     font-size: 12px;
 }
 .stepbox {
-    border: 1px solid #ebebeb;
+    border: 1px solid #006699;
 }
 .con-title {
-    background-color: #f8f8f8;
+    color: #fff;
+    background-color: #006699;
     padding: 10px 20px;
     box-sizing: border-box;
 }
+::v-deep .el-table th {
+    background-color: #f0f0f0 !important;
+    /* border-top: 1px solid #b0b0b0 !important; */
+
+    color: #333 !important;
+}
+::v-deep .el-table td.el-table__cell,
+.el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #b0b0b0 !important;
+}
 </style>
diff --git a/src/components/page/PreIngestedEditor.vue b/src/components/page/PreIngestedEditor.vue
index 74a9b38..d466e25 100644
--- a/src/components/page/PreIngestedEditor.vue
+++ b/src/components/page/PreIngestedEditor.vue
@@ -39,22 +39,7 @@
             </p>
             </div>
             <div style="margin-bottom: 10px">
-            <p
-                style="
-                    margin: 0;
-                    color: #409eff;
-                    background: #ecf5ff;
-                    border-color: #b3d8ff;
-                    color: #505050;
-                    font-size: 12px;
-                    padding: 10px;
-                    box-sizing: border-box;
-                "
-                v-if="feeStatus == 2"
-            >
-                <i class="el-icon-warning" style="color: #517fd5; margin-right: 10px"></i>
-                This manuscript does not require payment
-            </p>
+         
             </div>
             <div v-for="(item, index) in tabsList" @click="jumpTab(index, item)" :class="tabName == item.refName ? 'P_style' : ''">
                 <h5>
@@ -931,24 +916,16 @@ export default {
         getDetail() {
             this.isShowCommit = false;
             this.$api
-                .post('api/Order/preOrderDetail', {
+                .post('api/Preaccept/getPreacceptPayment', {
                     article_id: this.$route.query.id
                 })
                 .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;
-                        if (this.articleInfo.is_buy == 1 && this.journalInfo.fee != '0.00') {
-                            this.isShowCommit = true;
-                            this.feeStatus = 1;
-                        } else if (this.journalInfo.fee == '0.00' && this.articleInfo.is_buy == 1) {
-                            this.isShowCommit = true;
-                            this.feeStatus = 2;
-                        } else {
-                            this.feeStatus = 0;
-                            this.isShowCommit = false;
-                        }
+                        this.feeStatus=res.data.state
+                        this.isShowCommit=res.data.state==1?true:false
+                        console.log(this.isShowCommit)
+                      
                     }
                 });
         },
diff --git a/src/components/page/articleList.vue b/src/components/page/articleList.vue
index df37911..79ff0c3 100644
--- a/src/components/page/articleList.vue
+++ b/src/components/page/articleList.vue
@@ -108,7 +108,7 @@
 						
 						
 					</div>
-					<el-button v-if="item.state == 6&&item.is_buy==0" size="mini" type="primary"  style="position: absolute;top: 38%;right: 10px;background: #ff5000 !important;border-color: #ff5000 !important;" @click="goOrderConfirmation(item)">Payment</el-button>
+					<!-- <el-button v-if="item.state == 6&&item.is_buy==0" size="mini" type="primary"  style="position: absolute;top: 38%;right: 10px;background: #ff5000 !important;border-color: #ff5000 !important;" @click="goOrderConfirmation(item)">Payment</el-button> -->
 					<!-- <el-button v-if="item.is_buy==1" size="mini" type="text"  style="position: absolute;top: 38%;right: 10px;color: #ff5000 !important;">{{ $t('pendingPayment.state1') }}</el-button> -->
 					<!-- v-if="item.state == 6&&item.is_buy==0" -->
 					<!-- <common-paypal-button 
diff --git a/src/components/page/components/pendingPayment/OrderConfirmation.vue b/src/components/page/components/pendingPayment/OrderConfirmation.vue
index 10fe8f9..bc77837 100644
--- a/src/components/page/components/pendingPayment/OrderConfirmation.vue
+++ b/src/components/page/components/pendingPayment/OrderConfirmation.vue
@@ -241,11 +241,7 @@ export default {
                             setTimeout(() => {
                                 loading.close();
                                 var info={id: that.articleId}
-                                var type=''
-            type=that.$route.query.type?that.$route.query.type:'';
-           if(type == 'Pre-accept'){
-            info={...info,type:type} 
-                                    }
+          
                                     that.$router.replace({ name: 'OrderConfirmation' });
                                   
                                  
diff --git a/src/components/page/components/pendingPayment/success.vue b/src/components/page/components/pendingPayment/success.vue
index 3b173e9..78e7216 100644
--- a/src/components/page/components/pendingPayment/success.vue
+++ b/src/components/page/components/pendingPayment/success.vue
@@ -18,9 +18,7 @@
             </p>
             <!-- <p>Payment Method: {{ paymentMethod }}</p> -->
             <p>You will receive an email confirmation shortly.</p>
-            <button @click="goBack">
-                {{ $route.query.type && $route.query.type == 'Pre-accept' ? 'Continue Operation' : 'Back to Order List' }}
-            </button>
+            <button @click="goBack">Continue Operation</button>
             <p style="color: #67c23a; font-size: 13px; line-height: 40px">Automatically jump after {{ hideSec }} seconds</p>
         </div>
     </div>
@@ -78,28 +76,31 @@ export default {
                 });
         },
         goBack() {
-            var type=''
-            type=this.$route.query.type?this.$route.query.type:'';
-            var id=this.$route.query.id
-            console.log('id at line 83:', id)
-            // 跳转到新的路由 
-          
-            if (type == 'Pre-accept') {
-                this.$router.replace({ name: 'success' });
-                this.$router.push({
-                    path: '/PreIngested',
-                    query:{
+            var type = '';
+            type = this.$route.query.type ? this.$route.query.type : '';
+            var id = this.$route.query.id;
+            console.log('id at line 83:', id);
+            // 跳转到新的路由
+
+            // if (type == 'Pre-accept') {
+            //     this.$router.replace({ name: 'success' });
+            //     this.$router.push({
+            //         path: '/PreIngested',
+            //         query:{
+            //             id: id
+            //         }
+
+            //     });
+            // } else {
+            this.$router.replace({ name: 'success' });
+            this.$router.push({
+                path: '/PreIngested',
+                query:{
                         id: id
                     }
-                    
-                });
-            } else {
-                this.$router.replace({ name: 'success' });
-                this.$router.push({
-                    path: '/orderListAuthor'
-                });
-            }
-            // 
+            });
+            // }
+            //
         }
     }
 };