Merge branch 'master' of https://gitee.com/wjl2008_admin/tougao_web into pay

src/components/page/articleListEditor_E.vue

@@ -410,6 +410,10 @@
                                 <el-table-column type="index" align="center" width="50"> </el-table-column>
                                 <el-table-column label="CONTENT" align="center">
                                     <template slot-scope="scope">
+                                    <p class="wrongLine" style="text-align: left" v-if="scope.row.author == ''">
+                                        {{ scope.row.refer_frag }}
+                                    </p>
+                                    <div v-else>
                                         <div style="text-align: left" v-if="scope.row.refer_type == 'journal'">
                                             <p>
                                                 {{ scope.row.author }},{{ scope.row.title }}, <em>{{ scope.row.joura }}</em> ,{{
@@ -422,9 +426,7 @@
                                             <p>{{ scope.row.author }},{{ scope.row.title }},{{ scope.row.dateno }}<br /></p>
                                             <a class="doiLink" :href="scope.row.isbn" target="_blank">{{ scope.row.isbn }}</a>
                                         </div>
-                                        <p class="wrongLine" style="text-align: left" v-if="scope.row.refer_type == 'other'">
+                                    </div>
-                                            {{ scope.row.refer_frag }}
-                                        </p>
                                 </template>
                                 </el-table-column>
                             </el-table>

src/components/page/components/html/index.vue

@@ -1,7 +1,4 @@
 <template>
-   
-        
-
     <!-- Html排版 -->
     <el-dialog title="HTML layout" :visible.sync="HtmlVisible" width="900px" :close-on-click-modal="false" @close="CancelHtml">
         <div style="margin: 0 0 0 10px" class="htmlfile">
@@ -42,23 +39,18 @@
                     <template slot="title">
                         Html Layout :
                         <span style="margin-left: 15px; color: #666" v-if="mains == ''">No Layout</span>
-                            <el-button
+                        <el-button type="primary" @click="htmlLayout2('creat')" style="margin-left: 20px" class="import" v-if="mains == ''"
-                                type="primary"
-                                @click="htmlLayout2('creat')"
-                                style="margin-left: 20px"
-                                class="import"
-                                v-if="mains == ''"
                             >Create Html Proofread</el-button
                         >
                         <span style="margin-left: 15px; color: #0b4b6a" v-if="mains != ''">Typesetting completed</span>
                         <template v-if="mains != ''">
                             <el-button
-                                    v-if="html_type == 2&&tg_article_id!=0"
+                                v-if="html_type == 2 && tg_article_id != 0"
                                 type="primary"
                                 plain
                                 icon="el-icon-document-copy"
                                 @click.stop
-                                    @click=" htmlLayout2()"
+                                @click="htmlLayout2()"
                                 style="margin-left: 20px"
                             >
                                 <font>Edit Html Proofread</font>
@@ -182,6 +174,10 @@
                             <el-table-column type="index" align="center" width="50"> </el-table-column>
                             <el-table-column label="CONTENT" align="center">
                                 <template slot-scope="scope">
+                                    <p class="wrongLine" style="text-align: left" v-if="scope.row.author == ''">
+                                        {{ scope.row.refer_frag }}
+                                    </p>
+                                    <div v-else>
                                         <div style="text-align: left" v-if="scope.row.refer_type == 'journal'">
                                             <p>
                                                 {{ scope.row.author }},{{ scope.row.title }}, <em>{{ scope.row.joura }}</em> ,{{
@@ -194,9 +190,7 @@
                                             <p>{{ scope.row.author }},{{ scope.row.title }},{{ scope.row.dateno }}<br /></p>
                                             <a class="doiLink" :href="scope.row.isbn" target="_blank">{{ scope.row.isbn }}</a>
                                         </div>
-                                        <p class="wrongLine" style="text-align: left" v-if="scope.row.refer_type == 'other'">
+                                    </div>
-                                            {{ scope.row.refer_frag }}
-                                        </p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -208,7 +202,6 @@
             <el-button @click="CancelHtml" plain>Cancel</el-button>
         </span>
     </el-dialog>
-    
 </template>
 
 <script>
@@ -328,12 +321,8 @@ export default {
             newMains: []
         };
     },
-    created() {
+    created() {},
-       
+    computed: {},
-    },
-    computed: {
-       
-    },
     methods: {
         //跳转婴用列表
         goCite(row) {
@@ -921,7 +910,7 @@ export default {
         },
         // 文章html弹出层
         async htmlContet(e) {
-        console.log('e at line 923:', e)
+            console.log('e at line 923:', e);
             this.articleId = e.article_id;
             this.tg_article_id = e.tg_article_id;
             // this.articleId = '3444';