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

src/assets/utils/tripUtils.js

 let locationName = window.location.hostname;
-let ViittoFileUrl = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130'
+let ViittoFileUrl = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130'
 var tripUtils = {
   TypeKey: {
     traffic: "1",

src/components/Login2019.vue

@@ -45,7 +45,7 @@
       <el-col :span="8" class="login-box newSummaryLogin">
         <div v-if="isShow==1" class="login_Div">
           <div class="logo_box">
-            <img style="width: 40px;" src="http://imgfile.oytour.com/Upload/CompanyImage/20181219/636808340326373827.png" alt="">
+            <img style="width: 40px;" src="http://staticfile.oytour.com/Upload/CompanyImage/20181219/636808340326373827.png" alt="">
             <p class="FPF_b">{{groupModel.GroupName?groupModel.GroupName:''}}</p>
           </div>
             <div class="sumMainTitle FPF_s">登录</div>
@@ -86,7 +86,7 @@
           </div>
           <div v-if="isShow==2" class="phoneLogin login_Div>">
             <div  class="logo_box">
-              <img style="width: 40px;" src="http://imgfile.oytour.com/Upload/CompanyImage/20181219/636808340326373827.png" alt="">
+              <img style="width: 40px;" src="http://staticfile.oytour.com/Upload/CompanyImage/20181219/636808340326373827.png" alt="">
               <p class="FPF_b">{{groupModel.GroupName?groupModel.GroupName:''}}</p>
             </div>
               <div class="sumMainTitle FPF_s">绑定手机号</div>
@@ -117,7 +117,7 @@
 
           <div v-if="isShow==3" class="phoneLogin login_Div">
             <div  class="logo_box">
-              <img style="width: 40px;" src="http://imgfile.oytour.com/Upload/CompanyImage/20181219/636808340326373827.png" alt="">
+              <img style="width: 40px;" src="http://staticfile.oytour.com/Upload/CompanyImage/20181219/636808340326373827.png" alt="">
               <p>{{groupModel.GroupName?groupModel.GroupName:''}}</p>
             </div>
               <div class="sumMainTitle FPF_s">修改密码</div>
@@ -170,19 +170,19 @@ export default {
       speed: 3000,
       imgList: [
         {
-          src: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/20190923020945469.jpg',
+          src: 'http://staticfile.oytour.com/New/Upload/Cloud/2019-09/20190923020945469.jpg',
           text: '京都独旅之秋',
           text1: '旅宿权威柏井寿的私房赏枫秘境',
           url: 'http://www.oytour.com/#/JuanDetails?id=70'
         },
         {
-          src:  'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/20190920035420544.jpg',
+          src:  'http://staticfile.oytour.com/New/Upload/Cloud/2019-09/20190920035420544.jpg',
           text: '邂逅北海道',
           text1: '看见 北海道 之美',
           url: 'http://www.oytour.com/#/FoodImg4'
         },
         {
-          src: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/20190920035420528.jpg',
+          src: 'http://staticfile.oytour.com/New/Upload/Cloud/2019-09/20190920035420528.jpg',
           text: '自由土耳其',
           text1: '翱翔天际 感受星月魅力',
           url: 'http://www.oytour.com/#/JuanDetails?id=70'

src/plug/index.js

@@ -147,9 +147,9 @@ 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://uploadfile.oytour.com" : "http://192.168.2.214:8120",
           //文件站点
-          ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
+          ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://staticfile.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",
          
           // javaUrl:"http://192.168.2.215:9000",
@@ -648,7 +648,7 @@ export default {
       } else if (type === 'h') {
         poise = 'm_h'
       }
-      return url + '/image/index?filePath=' + path.replace('http://192.168.2.214:8130', '').replace('http://imgfile.oytour.com', '').split('?')[0] + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
+      return url + '/image/index?filePath=' + path.replace('http://192.168.2.214:8130', '').replace('http://staticfile.oytour.com', '').split('?')[0] + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
     }
     Vue.prototype.uploadSelfBlob = function (path, files, successCall) {
         let that = this;