save

src/plug/index.js

@@ -120,13 +120,8 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.10.128";
-<<<<<<< HEAD
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
          domainUrl = "http://192.168.10.226:8015";
-=======
-        domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-        //  domainUrl = "http://192.168.10.226:8015";
->>>>>>> 0174365330048ea2c9cbfd58a13172ca717c4acf
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";