Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

config/index.js

@@ -99,7 +99,7 @@ module.exports = {
     
     
     // Various Dev Server settings
-    host: 'testerp.oytour.com', // can be overwritten by process.env.HOST
+    host: 'www.test.com', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/plug/index.js

@@ -114,7 +114,7 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-        domainUrl = "http://127.0.0.1:8082";
+        domainUrl = "http://192.168.2.214:8082";
         let locationName = window.location.hostname;
 
         let javaUrldo = "";
@@ -122,8 +122,6 @@ export default {
 
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
-          //domainUrl = "http://reborn.oytour.com";
-          //domainUrl = "http://127.0.0.1"
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
         }