no message

4085d63e · 华国豪 · 9939e2f2 · 4085d63e
Commit 4085d63e authored Mar 08, 2019 by 华国豪 🙄
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

index.js src/plug/index.js +0 -5

No files found.
--- a/src/plug/index.js
+++ b/src/plug/index.js
@@ -115,12 +115,7 @@ 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";
     }