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

# Conflicts:
#	src/components/SalesVisa/ModifyVisaProduct.vue
#	src/components/SalesVisa/VisaProductCountryManager.vue
#	src/router/config.js

src/plug/index.js

@@ -117,10 +117,10 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let locationName = window.location.hostname;
-        // domainUrl = "http://192.168.2.65:8025"; //214主域名
-        domainUrl = "http://192.168.2.214:8082"; //214主域名
+        domainUrl = "http://192.168.2.65:8025"; //214主域名
+        // domainUrl = "http://192.168.2.214:8082"; //214主域名
         // domainUrl = "http://192.168.0.119:8082";
-        // domainUrl = "http://192.168.2.16:8083";
+        // domainUrl = "http://192.168.2.106:8082";
         if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
         } else if (locationName.indexOf('viitto') !== -1) {
@@ -148,7 +148,7 @@ export default {
           //google地图图片地址
           GoogleMapImageUrl: "http://super.oytour.com",
           //上传站点
-          UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
+          UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.106:8120",
           //文件站点
           ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
           javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
@@ -597,7 +597,7 @@ export default {
         }
       },
       //上传文件到本地服务器
-      Vue.prototype.UploadSelfFileT = function (path, files, successCall) {
+      Vue.prototype.UploadSelfFileT = function (path, files, successCall, ocr) {
         if (files && files.length > 0) {
           let nameList = new Array()
           for (let index = 0; index < files.length; index++) {
@@ -609,7 +609,7 @@ export default {
               let fileName = nameList[index]
               fileName = path + fileName + "." + files[index].name.split('.').pop()
               var formData = new FormData();
-              var uploadUrl = that.domainManager().UploadUrl + "/Upload?filePath=" + path;
+              var uploadUrl = that.domainManager().UploadUrl + "/Upload?filePath=" + path +'&ocr='+ ocr;
               formData.append("myfile", files[index]);
               that.$http.post(uploadUrl, formData, {})
                 .then(res => {