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

# Conflicts:
#	src/api/index.js

src/api/index.js

@@ -21,10 +21,11 @@ const service = axios.create({
 	// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
 	// baseURL: '/api', //本地
 	baseURL: '/', //正式
+
 });
 
 const service_new = axios.create({
-	baseURL: 'http://journal.com/', 
+	baseURL: 'http://journal.com/',
 	// baseURL: '/', 
 });