js修改

src/plug/index.js

@@ -115,14 +115,9 @@ export default {
       Vue.prototype.domainManager = function () {
       let domainUrl = '';
       let locationName = window.location.hostname;
-<<<<<<< HEAD
-      domainUrl = "http://192.168.2.65:8025"; //214主域名
-=======
       domainUrl = "http://192.168.2.214:8082"; //214主域名
-      // domainUrl = "http://192.168.2.16:8083";
->>>>>>> f86b3a7beecb55955eae334e9c3e56a9f3e331ad
       if (locationName.indexOf('oytour')!==-1) {
-        domainUrl = "http://webapi.viitto.com";
+        domainUrl = "http://reborn.oytour.com";
      }
       else if (locationName.indexOf('viitto')!==-1) {
          domainUrl = "https://test.viitto.com";