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

.gitignore

@@ -23,3 +23,4 @@ yarn-error.log*
 node_modules
 /package-lock.json
 /src/api/index.js
+/src/components/common/common.vue

src/components/common/common.vue

@@ -1,19 +0,0 @@
-<script>
-	const mediaUrl = '/public/';
-	const baseUrl = '/';
-
-	// const mediaUrl = 'http://www.tougao.com/';
-	// const baseUrl = 'http://www.tougao.com/';
-	// const IMGdoURL = 'http://www.journal.com/';
-	// const IMGupURL = 'http://www.journal.com/';
-	
-	
-	// const mediaUrl = 'http://testtougao.tmrjournals.com/public/';
-	// const baseUrl = 'http://testtougao.tmrjournals.com/public/index.php/';
-	
-	
-	export default {
-		baseUrl,
-		mediaUrl
-	}
-</script>

src/components/page/articleAdd.vue

@@ -573,6 +573,7 @@
 		</el-dialog>
 
 
+
 		<!-- 选择期刊弹出框 -->
 		<el-dialog title="Change Journal" :visible.sync="changeVisible" width="780px">
 			<el-form :model="jour_form" :rules="rules" label-width="85px">