Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/commonPage/oneday.vue

@@ -22,10 +22,10 @@
                         <div class="item big" style='margin-bottom:20px;'>
                             <div class="left">
                                 <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                <img v-else src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/DefalutImage/DMC/defaultairline.png" />
-                                <img  v-else-if="day.dayNum==1 && day.details[0].img==''" src='https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/nll.jpg' />
-                                <img  v-else-if="day.islast && day.details[0].img==''" src='https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/nll.jpg' />
-                                <img  v-else src='https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/activy.jpg' />
+                                <img v-else :src="`${domainManager().ViittoFileUrl}/Upload/DefalutImage/DMC/defaultairline.png`" />
+                                <img  v-else-if="day.dayNum==1 && day.details[0].img==''" :src='`${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/nll.jpg`' />
+                                <img  v-else-if="day.islast && day.details[0].img==''" :src='`${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/nll.jpg`' />
+                                <img  v-else :src='`${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/activy.jpg`' />
                             </div>
                             <div class="right">
                                 <div class="details">

src/components/global/confirmationOrderDownLoad.vue

@@ -1455,7 +1455,7 @@
       <div id='pdfDom' style="padding:0 20px;">
         <div id="pdf_1">
           <div class="logo-div">
-            <img :src="TripLayer.vshowJ===true?'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/headerImg.jpg':'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/headerImg2.jpg'">
+            <img :src="TripLayer.vshowJ===true? `${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/headerImg.jpg` : `${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/headerImg2.jpg`">
           </div>
           <div class="website">
             <div class="website-line"></div>
@@ -1896,7 +1896,7 @@
             </tr>
           </table> -->
           <div v-if='TripLayer.vshowJ' class="footer-div">
-            <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/TravelControlTripIcon20.png" />
+            <img :src="`${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/TravelControlTripIcon20.png`" />
           </div>
         </div>
       </div>

src/components/mall/detailTwo.vue

@@ -899,7 +899,7 @@ export default {
                     this.feature = data.feature;
                     this.isDirect = data.isDirect;
                     if (data.videoStr) {
-                        let path = data.videoStr.indexOf('http') > -1 ? data.videoStr : 'https://reborndev.oss-cn-hangzhou.aliyuncs.com' + data.videoStr;
+                        let path = data.videoStr.indexOf('http') > -1 ? data.videoStr : domainManager().ViittoFileUrl + data.videoStr;
                         this.VideoStr = path;
                     }
                     // console.log(data.priceList[0].priceFlight)

src/plugins/index.js

@@ -32,7 +32,7 @@ export default {
                 PostUrl: domainUrl + "/api/common/post",
                 // javaUrl: "http://192.168.2.16:9000",
                 javaUrl: "http://47.96.12.235:9001",//测试接口
-
+                ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" :  'http://192.168.2.214:8130',
                 LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
             };
             return obj;