Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board

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: '/api', //本地
-	// baseURL: '/', //正式
+	baseURL: '/', //正式
 
 });
 

src/components/page/PreIngestedEditor.vue

@@ -1,9 +1,6 @@
 <template>
     <div>
         <div class="tab_post">
-
-
-            
             <div style="margin-bottom: 10px">
                 <p
                     v-if="feeStatus == 0"
@@ -33,17 +30,12 @@
                         font-size: 12px;
                         padding: 10px;
                         box-sizing: border-box;
-                    
-                   
                     "
                 >
                     <i class="el-icon-warning" style="color: #67c23a; margin-right: 10px"></i>Paid already
-               
                 </p>
             </div>
-            <div style="margin-bottom: 10px">
+            <div style="margin-bottom: 10px"></div>
-         
-            </div>
             <div v-for="(item, index) in tabsList" @click="jumpTab(index, item)" :class="tabName == item.refName ? 'P_style' : ''">
                 <h5>
                     <span>{{ index + 1 }}</span>
@@ -65,6 +57,12 @@
                     Push To Accept
                 </el-button>
             </div>
+            <div style="margin: 20px 0 0 0">
+                <el-button type="text" @click="pushToProduce(detailMes)" style="font-size: 13px">
+                    <i class="el-icon-finished"></i>
+                    Begin to Production
+                </el-button>
+            </div>
             <!-- 作者联系 -->
             <div class="contactAuthor">
                 <h4>Contact author</h4>
@@ -840,7 +838,8 @@ export default {
             }
         };
     },
-    created() {this.opMedical=this.$commonJS.opMedicalList()
+    created() {
+        this.opMedical = this.$commonJS.opMedicalList();
         this.getDetail();
         this.getHight();
         window.addEventListener('resize', this.getHight);
@@ -927,10 +926,9 @@ export default {
                 .then((res) => {
                     console.log('res at line 191:', res);
                     if (res.code == 0) {
-                        this.feeStatus=res.data.state
+                        this.feeStatus = res.data.state;
-                        this.isShowCommit=res.data.state==1?true:false
+                        this.isShowCommit = res.data.state == 1 ? true : false;
-                        console.log(this.isShowCommit)
+                        console.log(this.isShowCommit);
-                      
                     }
                 });
         },
@@ -1673,11 +1671,15 @@ export default {
 
         // 6----校对文章
         htmlContet() {
-            window.open(this.$router.resolve({  path: '/GenerateCharts',
+            window.open(
+                this.$router.resolve({
+                    path: '/GenerateCharts',
                     query: {
                         id: this.$route.query.id
-                } }).href, '_blank');
+                    }
-            
+                }).href,
+                '_blank'
+            );
         },
 
         // 6----修改时间为年月日
@@ -2123,6 +2125,50 @@ export default {
                 })
                 .catch(() => {});
         },
+        pushToProduce(detailMes) {
+            if (!this.isShowCommit) {
+                this.$message.error('The manuscript has not been paid, please contact the author promptly for payment');
+                return false;
+            }
+
+            this.$confirm(`Please confirm if you would like to push this article to the production stage?`, 'Prompt', {
+                confirmButtonText: 'Yes',
+                cancelButtonText: 'Cancle',
+                type: 'warning'
+            })
+                .then(() => {
+                    const load = this.$loading({
+                        lock: true,
+                        text: 'Loading...',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    });
+                    this.$api
+                        .post('api/Preaccept/beginProduce', {
+                            article_id: this.$route.query.id
+                        })
+                        .then((res) => {
+                            if (res.code == 0) {
+                                load.close();
+                                this.$message.success('successed!');
+                                setTimeout(() => {
+                                    localStorage.setItem('U_point', 2);
+                                    this.$router.push({
+                                        path: 'articleListEditor'
+                                    });
+                                }, 1000);
+                            } else {
+                                load.close();
+                                this.$message.error(res.msg);
+                            }
+                        })
+                        .catch((err) => {
+                            load.close();
+                            this.$message.error(err);
+                        });
+                })
+                .catch(() => {});
+        },
         // 点击开始上线显示
         pushOnline(detailMes) {
             if (this.authorData.length == 0) {
@@ -2310,7 +2356,7 @@ export default {
 }
 
 .contactAuthor {
-    margin-top: 50px;
+    margin-top: 30px;
     color: #8c939d;
 }
 .contactAuthor > p {

src/components/page/articleListEditor.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :style="[2,5].includes(activeIndex) ?'height:100%':''">
+    <div :style="[2, 5].includes(Number(activeIndex)) ? 'height:100%' : ''">
         <!-- 		<div class="crumbs">
 			<el-breadcrumb separator="/">
 				<el-breadcrumb-item>
@@ -8,7 +8,6 @@
 			</el-breadcrumb>
 		</div> -->
 
-       
         <div class="tab_all">
             <!-- 正在处理 -->
             <p @click="tabIndex(1)" :class="activeIndex == 1 ? 'tab_Normal tab_Select' : 'tab_Normal'">Edit</p>
@@ -27,12 +26,12 @@
             <!-- <p @click="tabIndex(4)" :class="activeIndex == 4 ? 'tab_Normal tab_Select' : 'tab_Normal'">Investigte and
 				Retrace</p> -->
             <br clear="both" />
-      
         </div>
-        <div class="container" style="padding: 20px 15px 10px;box-sizing: border-box;" 
+        <div
-        :style="[2,5].includes(activeIndex) ?'height:calc(100% - 60px)':''"
+            class="container"
+            style="padding: 20px 15px 10px; box-sizing: border-box"
+            :style="[2, 5].includes(Number(activeIndex)) ? 'height:calc(100% - 60px)' : ''"
         >
-		
             <articleListA v-if="activeIndex == '1'" :journals="journals[0]"></articleListA>
             <articleListB v-if="activeIndex == '2'" :journals="journals[1]" @changeEvent="changeEvent" ></articleListB>
             <articleListC v-if="activeIndex == '3'" :journals="journals[0]"></articleListC>
@@ -67,16 +66,25 @@ export default {
         articleListE,
         articleListF
     },
-  async  created() {
+    async created() { this.$nextTick(() => {
-      await  this.initJournal();
-	//   await this.getDate();
             if (localStorage.getItem('U_point') != null) {
                 this.activeIndex = localStorage.getItem('U_point');
                 localStorage.removeItem('U_point');
             }
-    },
+        });
-	async  activated() {
         await this.initJournal();
+        this.$forceUpdate()
+        //   await this.getDate();
+       
+    },
+    async activated() { this.$nextTick(() => {
+            if (localStorage.getItem('U_point') != null) {
+                this.activeIndex = localStorage.getItem('U_point');
+                localStorage.removeItem('U_point');
+            }
+        });
+        await this.initJournal();
+       this.$forceUpdate()
         // await this.getDate();
     },
     methods: {
@@ -120,12 +128,10 @@ export default {
                 } else {
                     return res; // 返回数据
                 }
-				
             } catch (error) {
                 console.error('Error fetching data:', error);
                 return []; // 如果发生错误，返回空数组
             }
-      
         },
         // 获取数据
         getDate() {
@@ -158,7 +164,6 @@ export default {
 </script>
 
 <style scoped>
-
 .tab_all {
     border-bottom: 1px solid #ddd;
 }

src/components/page/articleListEditor_A.vue

@@ -274,7 +274,7 @@
                                                         overflow: hidden;
                                                         text-overflow: ellipsis;
                                                     "
-                                                    >{{ v.realname || '-' }}
+                                                    >{{ v.realname || v.email ||'-' }}
                                                 </span>
                                                 <svg
                                                     @click="linkEmail(item, v.art_aut_id)"