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

# Conflicts:
#	src/api/index.js
#	vue.config.js

src/api/index.js

@@ -16,8 +16,12 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
 // 
 const service = axios.create({
 	// baseURL: 'http://testtougao.tmrjournals.com/public/index.php/', 
-	// baseURL: 'http://www.tougao.com/public/index.php/', 
-	baseURL: '/', 
+	// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
+	// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
+	
+
+	// baseURL: '/api', //本地
+	baseURL: '/', //正式
 });
 
 const service_new = axios.create({