Merge remote-tracking branch 'origin/master'

src/config/index.js

@@ -1,6 +1,10 @@
 var defaultConfig = {
 
-    baseUrl : '/api',
+    //baseUrl : 'http://2.142.215.98:8010',
+	
+	//baseUrl : 'http://192.168.1.102:3000',
+	
+	baseUrl : 'http://localhost:3000',
   
     timeout : '50000',
 

src/styles/index.css

@@ -150,7 +150,7 @@ p {
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 20px;
+    padding: 14px;
 }
 
 
@@ -184,4 +184,4 @@ p {
 .settingtitlelay {
     display: flex;
     margin-top: 30px;
-}
+}

src/utils/config.js

@@ -4,8 +4,10 @@ if (process.env.NODE_ENV === 'development') {
     // 开发环境
     //APP_SERVER_URL = 'http://192.168.139.110:8084'
     //APP_SERVER_URL = 'http://192.168.139.74:8080'
-    APP_SERVER_URL = 'http://192.168.139.77:8084'
+    //APP_SERVER_URL = 'http://192.168.139.77:8084'    
     //APP_SERVER_URL = 'http://localhost:8084'
+    //测试线上
+    APP_SERVER_URL = 'http://112.3.63.60:58081'
     
 } else {
     // 生产环境
@@ -14,4 +16,4 @@ if (process.env.NODE_ENV === 'development') {
 
 // APP_SERVER_URL = APP_SERVER_URL + "/app"
 
-export default APP_SERVER_URL
+export default APP_SERVER_URL