Skip to content

S
SuperMan
Commit 952c7746 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents cc9eab22 8c93043d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 410 additions and 637 deletions
src/assets/utils/tripUtils.js
View file @ 952c7746
......@@ -346,7 +346,7 @@ var tripUtils = {
//行程介绍
trafficIntroduce: {
IntroduceTitle: "", //行程介绍标题
IntroduceImage: "https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
IntroduceImage: this.domainManager().ViittoFileUrl+"/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
IntroduceDetail: "", //行程介绍详细信息
}
};
......
src/components/FinancialModule/ReportForm/TeamRevenueReportChange.vue
View file @ 952c7746
......@@ -673,49 +673,6 @@
getPageList(){ // 获取列表数据
this.loading = true;
let _this = this;
// this.DataList = [];
// setTimeout(function(){
// _this.loading= false;
// },1000)
// for(let i = 0; i<18;i++){
// this.DataList.push(
// {
// "FrID":574+i+parseInt(Math.random()*10),
// "Type":2,
// "TypeName":"支出",
// "islianyun":'是', // 是 字体颜色 红色
// "TCIDList":[253],
// "TCIDAndTCNUMList":[{"TCID":253,"TCNUM":"NRTNH06181206B"}],
// "TCNUM":"123",
// "TCID":"NRTNH06181206B",
// "OrderID":10582,
// "OrderSource":8,
// "SourceID":0,
// "Term":null,
// "Money":Math.random()*9999,
// "PayMoney":6522,
// "Status":2,
// "InOrNotProcess":-1,
// "Conditon":null,
// "Is_Self":0,
// "StatusStr":"通过",
// "CompanyName":"四川和平国际旅行社",
// "BranchName":"微途科技",
// "DepartName":"研发部",
// "CreateBy":910,
// "EmName":"王悦",
// "EmPhoto":"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/User/636710766394367326.jpg",
// "OriginalMoney":[6522],
// "CostTypeList":["国际段机票"],
// "TradeWayList":[{"AccountType":"对公","Alias":"和工","BankNo":"4402205019100427185","TypeName":"银行"}],
// "ClientTypeName":"机票供应商",
// "RemitterName":"华宗泉-建行",
// "AccountNumber":"6217003810000218902 建行高新支行",
// "CreateDate":"2018-12-06 10:53:56",
// "modelShow":false
// }
// )
// }
if(!this.msg.OutBranchId && this.msg.OutBranchId!==0)this.msg.OutBranchId=-1;
if(!this.msg.StartCityId)this.msg.StartCityId=0;
if(!this.msg.LineId)this.msg.LineId=0;
......
src/components/LeaderManagement/leaderArrangement.vue
View file @ 952c7746
......@@ -524,7 +524,7 @@
],
CountryIDStr: "",
defaultImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
imgBeforeFile: this.domainManager().AliUrl,
imgBeforeFile: this.domainManager().ViittoFileUrl,
outerVisible: false,
leaderAndGuid: "",
TeamSaleStateList: "",
......
src/components/LeaderManagement/leaderPerformance.vue
View file @ 952c7746
......@@ -156,8 +156,7 @@ export default {
pageIndex: 1,
pageSize: 10,
ShoppingID: ""
},
imgBeforeFile:this.domainManager().AliUrl,
},
noData: false,
loading: true,
DataList: "",
......
src/components/LeaderManagement/leaderTaskBoard.vue
View file @ 952c7746
......@@ -471,7 +471,7 @@ export default {
leaderAndGuid: "",
defaultImg:
'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
imgBeforeFile: this.domainManager().AliUrl,
imgBeforeFile: this.domainManager().ViittoFileUrl,
loading: false,
total: 0,
dataList: "",
......
src/components/Restaurant/restaurantInfoManage.vue
View file @ 952c7746
......@@ -1201,7 +1201,7 @@
obj.Path = x;
obj.PicID = 0;
obj.ShowPath =
this.domainManager().AliUrl +
this.domainManager().ViittoFileUrl +
x +
"?x-oss-process=image/resize,l_140";
this.DiningImageArray.push(obj);
......
src/components/SalesModule/yingyanMap.vue
View file @ 952c7746
......@@ -569,7 +569,7 @@
this.personData.forEach(person => {
let item = this.markersList.find(markers => markers.entity_name == person.entity_name)
if(item) {
let myIcon = new BMap.Icon("https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/Icon/Common/positioning.png", new BMap.Size(32,40));
let myIcon = new BMap.Icon(this.domainManager().ViittoFileUrl+"/Upload/Icon/Common/positioning.png", new BMap.Size(32,40));
let point = new BMap.Point(item.latest_location.longitude, item.latest_location.latitude)
let marker
if(this.getOnlineStatus(item.latest_location.loc_time) === 0){
......@@ -629,7 +629,7 @@
let b = this.lastLocation.lat
let point = new BMap.Point(this.lastLocation.log, this.lastLocation.lat);
if(this.isShowAll==0){
let myIcon = new BMap.Icon("https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/Icon/Common/positioning.png", new BMap.Size(32,40));
let myIcon = new BMap.Icon(this.domainManager().ViittoFileUrl+"/Upload/Icon/Common/positioning.png", new BMap.Size(32,40));
let marker = new BMap.Marker(point)
if(this.getOnlineStatus(this.locationLastTime) === 0){
marker = new BMap.Marker(point)
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 952c7746
......@@ -210,10 +210,11 @@
methods: {
downLoadPZ: function (src) {
const link = document.createElement('a');
link.href = src;
document.body.appendChild(link);
link.click();
var a = document.createElement('a')
var event = new MouseEvent('click')
a.download = '下载图片名称'
a.href = src;
a.dispatchEvent(event)
},
stringToArr(str) {
return str.split(',')
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 952c7746
......@@ -434,7 +434,7 @@
<div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}">
<div class="resourceList" v-for="item in dataInfo" :key="item.subCode">
<div class="reTopInfo">
<img v-if="item.PicPath!=''" :src="'https://reborndev.oss-cn-hangzhou.aliyuncs.com'+item.PicPath" :onerror='defaultImg' />
<img v-if="item.PicPath!=''" :src="domainManager().ViittoFileUrl+item.PicPath" :onerror='defaultImg' />
<img v-else src="../../assets/img/shoppingstore.jpg" :onerror='defaultImg' />
<div class="profitList" style="display:none">
<div class="profOne">一<span class="cumlaProfit">累计利润</span>一</div>
......@@ -973,7 +973,7 @@
}
res.data.data.PicPath.split(",").forEach(x => {
if (x != "") {
this.imgArray.push(this.domainManager().AliUrl + x);
this.imgArray.push(this.domainManager().ViittoFileUrl + x);
this.PicPathArray.push(x);
}
});
......
src/components/Ticketing/airlineManagement.vue
View file @ 952c7746
......@@ -438,8 +438,7 @@ export default {
if (this.total > 0) {
res.data.data.pageData.forEach(x => {
if (x.image) {
x.image =
"https://reborndev.oss-cn-hangzhou.aliyuncs.com" + x.image;
x.image =this.domainManager().ViittoFileUrl+ x.image;
}
});
this.noData = false;
......
src/components/TravelControlTrip.vue
View file @ 952c7746
......@@ -6,7 +6,7 @@
<div id='pdfDom' style="padding:0 20px;">
<div id="pdf_1">
<div class="logo-div">
<img :src="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="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>
......@@ -429,7 +429,7 @@
</tr>
</table>
<div v-if='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/TravelManager/TravelGroupControl/TravelFeature.vue
View file @ 952c7746
......@@ -117,64 +117,6 @@
</div>
</div>
<div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial">
<!-- <span class="userDeSpan">效果预览（可进行单张修改）</span> -->
<!-- <div id="travelSpecial">
<div class="travelSpecial">
<div v-for="(option, index) in this.travelsList" :key="index">
<div class="special_header" v-if="index%3===0">
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-pic.png"
>
<div>
<vEditDiv v-model="FeatureData.Subtitle"></vEditDiv>
<div>
<span>&#9670;</span>
<vEditDiv v-model="FeatureData.Title"></vEditDiv>
</div>
<div class="special_portrait">
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/plane.png"
>
</div>
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/logo.png"
>
<div class="special_title">
<div>行程特色</div>
<div>&#9660;</div>
</div>
</div>
</div>
<div class="special_content" v-if="option.length!==0">
<component :is="option.temp" :travelsObj="option"></component>
<div v-if="del_show===true" class="special_del">
<span class="iconfont icon-shanchu" @click="delFeature(index)"></span>
</div>
</div>
<div class="special_footer" v-if="index%3===2||index===travelsList.length-1">
<div>
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/line.png"
>
<div>感动·与世界同步</div>
</div>
<div>
<div>{{FeatureData.LineName}}</div>
<div>
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bottom_pic.png"
>
</div>
</div>
</div>
</div>
</div>
</div> -->
<new-feature ref='newFeature' :data='FeatureData'></new-feature>
</div>
<div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial2">
......@@ -372,39 +314,6 @@ export default {
err => {}
)
},1000)
// this.h2c(document.getElementById("travelSpecial"), {
// useCORS: true,
// logging: false
// }).then(canvas => {
// let imgUrl = canvas.toDataURL("image/png");
// let blob = this.base64ToBlob(imgUrl);
// let newArr = [];
// newArr.push(blob);
// let fileName = `${this.uuid(10, 10)}.png`;
// let user = JSON.parse(window.localStorage.userInfo);
// let path = `/Upload/TravelFeature/${user.EmployeeId}/${fileName}`;
// var that = this;
// this.uploadBlob(path, newArr, x => {
// if (x.res.statusCode === 200) {
// postData.Feature.FeatureHtmlImage =
// "http://reborndev.oss-cn-hangzhou.aliyuncs.com" + path;
// this.apipost(
// "travel_post_SetFeature",
// postData,
// res => {
// if (res.data.resultCode == 1) {
// }
// },
// err => {}
// );
// } else {
// this.Error("生成图片失败");
// }
// });
// });
// }
},
//切换tab事件
clickFeature(item) {
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelHotel1.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelHotel1_top">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_860,image/crop,x_0,y_0,w_860,h_430,g_west'">
<div class="travelTab_right travelHotel1_travelTab">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>酒店</span>
</div>
</div>
......@@ -12,10 +12,10 @@
<div class="travel_title_left_red travelHotel1_title_red">
<div>{{this.travelsObj.HotelName}}</div>
<div>
<img crossOrigin="Anonymous" class="travelHotel1_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone1.png">
<img crossOrigin="Anonymous" class="travelHotel1_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone1.png'">
</div>
<div class="travelHotel1_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>优选酒店</div>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelHotel2.vue
View file @ 952c7746
......@@ -9,18 +9,18 @@
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelHotel2_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>优选酒店</div>
</div>
</div>
<div class="travelHotel2_space"></div>
<div class="travelHotel2_bottom" v-html="this.travelsObj.Description"></div>
<img crossOrigin="Anonymous" class="travelHotel2_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone1.png">
<img crossOrigin="Anonymous" class="travelHotel2_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone1.png'">
</div>
<div class="travelHotel2_right">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_560,image/crop,x_0,y_0,w_560,h_280,g_west'">
<div class="travelTab_right">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>酒店</span>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelHotel3.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelHotel3_left">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_315,g_west'">
<div class="travelTab_left">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_left.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_left.png'">
<span>酒店</span>
</div>
</div>
......@@ -16,7 +16,7 @@
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelHotel3_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>优选酒店</div>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelRestaurant1.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelRestaurant1_top">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_860,image/crop,x_0,y_0,w_860,h_480,g_west'">
<div class="travelTab_right travelRestaurant1_travelTab">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>美食</span>
</div>
</div>
......@@ -11,14 +11,14 @@
<div class="travel_title_left_red travelRestaurant1_title_red">
<div>{{this.travelsObj.DinnerName}}</div>
<div>
<img crossOrigin="Anonymous" class="travelRestaurant1_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone1.png">
<img crossOrigin="Anonymous" class="travelRestaurant1_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone1.png'">
</div>
<div class="travel_title_right_yellow travelRestaurant1_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelRestaurant1_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>特色餐食</div>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelRestaurant2.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelRestaurant2_left">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_420,g_west'">
<div class="travelTab_left">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_left.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_left.png'">
<span>美食</span>
</div>
</div>
......@@ -11,13 +11,13 @@
<div class="travel_title_right_red travelRestaurant2_title_red">
<div></div>
<div>{{this.travelsObj.DinnerName}}</div>
<img crossOrigin="Anonymous" class="travelRestaurant2_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone2.png">
<img crossOrigin="Anonymous" class="travelRestaurant2_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone2.png'">
<div class="travel_title_right_yellow travelRestaurant2_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelRestaurant2_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag2.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag2.png'">
<div>特色餐食</div>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelViewSpot1.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelViewSpot1_left">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_315,g_west'">
<div class="travelTab_left">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_left.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_left.png'">
<span>景点</span>
</div>
</div>
......@@ -11,13 +11,13 @@
<div class="travel_title_left_red travelViewSpot1_title_red">
<div>{{this.travelsObj.CouponsName}}</div>
<div></div>
<img crossOrigin="Anonymous" class="travelViewSpot1_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone2.png">
<img crossOrigin="Anonymous" class="travelViewSpot1_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone2.png'">
<div class="travel_title_right_yellow travelViewSpot1_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelViewSpot1_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>特色推荐</div>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/TravelViewSpot2.vue
View file @ 952c7746
......@@ -4,13 +4,13 @@
<div class="travel_title_left_red travelViewSpot2_title_red">
<div>{{this.travelsObj.CouponsName}}</div>
<div></div>
<img crossOrigin="Anonymous" class="travelViewSpot2_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone2.png">
<img crossOrigin="Anonymous" class="travelViewSpot2_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone2.png'">
<div class="travel_title_right_yellow travelViewSpot2_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelViewSpot2_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>特色推荐</div>
</div>
</div>
......@@ -19,7 +19,7 @@
<div class="travelViewSpot2_right">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_315,g_west'">
<div class="travelTab_right">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>景点</span>
</div>
</div>
......
src/components/TravelManager/TravelGroupControl/TravelTemp/travelFeature2.vue
View file @ 952c7746
......@@ -5,16 +5,16 @@
<!-- 酒店1 -->
<div class="travel_hotel_1" v-if="item === 0">
<div class="hotel_1_header">
<img class="hotel_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg">
<img class="hotel_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-1.png">
<img class="hotel_1_header_bg" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/top-1.jpg'">
<img class="hotel_1_header_bg2" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/title-1.png'">
<div class="hotel_1_header_title">
<div>
<vEditDiv :canEdit='canEdit' v-model="hotelObj.title.first"></vEditDiv>
</div>
<div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-5.png'">
<vEditDiv :canEdit='canEdit' v-model="hotelObj.title.second"></vEditDiv>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-4.png'">
</div>
</div>
</div>
......@@ -29,7 +29,7 @@
</div>
<div class="hotel_1_info_1_info">
<div class="hotel_1_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png">
<img :src="domainManager().ViittoFileUrl+'Upload/PictureMaterial/Web/icon-1.png'">
<div></div>
</div>
<div class="hotel_1_info_1_info_right">
......@@ -53,7 +53,7 @@
<img v-if="hotelObj.list[item*2+1].images[2]" :src="hotelObj.list[item*2+1].images[2].Url">
</div>
<div class="hotel_1_info_2_bottom_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-1.png'">
<div></div>
</div>
<div class="hotel_1_info_2_bottom_right">
......@@ -67,7 +67,7 @@
<!-- 酒店2 -->
<div class="travel_hotel_2" v-if="item !== 0">
<div class="hotel_2_info_1" v-if="hotelObj.list[item*2]">
<img class="hotel_2_info_1_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-2.jpg">
<img class="hotel_2_info_1_bg" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/top-2.jpg'">
<div class="hotel_2_info_1_content">
<div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div>
<div><div></div></div>
......@@ -93,7 +93,7 @@
</div>
</div>
<div class="hotel_2_info_2_top_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-1.png'">
<div></div>
</div>
<div class="hotel_2_info_2_top_right">
......@@ -118,8 +118,8 @@
<!-- 景点1 -->
<div class="travel_viewSpot_1" v-if="item === 0">
<div class="viewSpot_1_header">
<img class="viewSpot_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg">
<img class="viewSpot_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-3.jpg">
<img class="viewSpot_1_header_bg" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/top-1.jpg'">
<img class="viewSpot_1_header_bg2" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/title-3.jpg'">
<div class="viewSpot_1_header_title">
<div>
<div>看见</div>
......@@ -127,9 +127,9 @@
<div>之美</div>
</div>
<div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-5.png'">
<div>放慢旅途步伐·畅游自在假期</div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-4.png'">
</div>
</div>
</div>
......@@ -139,7 +139,7 @@
</div>
<div class="viewSpot_1_info_1_info">
<div class="viewSpot_1_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-3.png'">
<div></div>
</div>
<div class="viewSpot_1_info_1_info_right">
......@@ -159,7 +159,7 @@
</div>
</div>
<div class="viewSpot_1_info_2_bottom_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-3.png'">
<div></div>
</div>
<div class="viewSpot_1_info_2_bottom_right">
......@@ -175,7 +175,7 @@
<div class="viewSpot_2_info_1" v-if="viewSpotObj.list[item*4-2]">
<div class="viewSpot_2_info_1_info">
<div class="viewSpot_2_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-3.png'">
<div></div>
</div>
<div class="viewSpot_2_info_1_info_right">
......@@ -229,8 +229,8 @@
<div class="travle_page" v-for="(item, index) in restaurantObj.pageList" :key="index">
<div class="travel_restaurant_1">
<div class="restaurant_1_header">
<img class="restaurant_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg">
<img class="restaurant_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-3.jpg">
<img class="restaurant_1_header_bg" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/top-1.jpg'">
<img class="restaurant_1_header_bg2" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/title-3.jpg'">
<div class="restaurant_1_header_title">
<div>
<div>品尝</div>
......@@ -238,9 +238,9 @@
<div>之味</div>
</div>
<div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-5.png'">
<div>特色美味，征服你的味蕾</div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-4.png'">
</div>
</div>
</div>
......@@ -250,7 +250,7 @@
</div>
<div class="restaurant_1_info_1_info">
<div class="restaurant_1_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-2.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-2.png'">
<div></div>
</div>
<div class="restaurant_1_info_1_info_right">
......@@ -276,7 +276,7 @@
</div>
<div class="restaurant_1_info_2_right_bottom">
<div class="restaurant_1_info_2_right_bottom_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-2.png">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/icon-2.png'">
<div></div>
</div>
<div class="restaurant_1_info_2_right_bottom_right">
......
src/components/TravelManager/TravelGroupControl/travelFeature/featureBody.vue
View file @ 952c7746
......@@ -380,7 +380,7 @@ export default {
var path = `/feature/${that.cid}/${fileName}`;
//msg.AdvertisingPicUrl=path
that.uploadBlob(path, newArr, x => {
let allPath='https://reborndev.oss-cn-hangzhou.aliyuncs.com'+x.name
let allPath=this.domainManager().ViittoFileUrl+x.name
let i=e.target.id.split('_')[2]
that.opera('change',parseInt(i),allPath)
})
......
src/components/TravelManager/travelLineTrip/dinnerTrip_Direct.vue
View file @ 952c7746
......@@ -272,7 +272,7 @@ export default {
var dinnerImgList = obj.PicPath.split(",");
for (var i = 0; i < dinnerImgList.length; i++) {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().AliUrl + dinnerImgList[i];
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = "";
this.subItemObj.childItem.ImaArray.push(fileObj);
}
......
src/components/TravelManager/travelLineTrip/scienTrip_Direct.vue
View file @ 952c7746
......@@ -250,7 +250,7 @@
for (var i = 0; i < scenImgList.length; i++) {
var fileObj = that.$commonUtils.FileObject();
if (scenImgList[i] != "") {
fileObj.Url = that.domainManager().AliUrl + scenImgList[i];
fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
fileObj.Name = "";
that.subItemObj.childItem.ImaArray.push(fileObj);
}
......
src/components/administrative/Announcement.vue
View file @ 952c7746
......@@ -366,7 +366,7 @@
this.detailMessage=res.data.data
this.downLoadList=JSON.parse(res.data.data.File_url)
this.downLoadList.forEach(item=>{
item.Url="https://reborndev.oss-cn-hangzhou.aliyuncs.com"+item.Url
item.Url=this.domainManager().ViittoFileUrl+item.Url
})
}else{
this.$message.error(res.data.message)
......
src/components/commonPage/oneday.vue
View file @ 952c7746
......@@ -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/confirmationOrderDownLoad.vue
View file @ 952c7746
......@@ -19,7 +19,7 @@
<div id='pdfDom' style="padding:0 20px;">
<div id="pdf_1">
<div class="logo-div">
<img :src="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="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>
......@@ -460,7 +460,7 @@
</tr>
</table>
<div v-if='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/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 952c7746
......@@ -231,7 +231,7 @@
methods: {
loadVideo: function () { // 输入地址
if (this.PostConfig.VideoStr)
this.VideoStr = this.VideoStr.indexOf('http') > -1 ? this.VideoStr : 'https://reborndev.oss-cn-hangzhou.aliyuncs.com' + this.VideoStr;
this.VideoStr = this.VideoStr.indexOf('http') > -1 ? this.VideoStr : this.domainManager().ViittoFileUrl+ this.VideoStr;
},
reUploadVideo(file) {
let newArr = [];
......@@ -422,7 +422,7 @@
},
mounted() {
if (this.PostConfig.VideoStr) {
let url = this.PostConfig.VideoStr.indexOf('http') > -1 ? this.PostConfig.VideoStr : 'https://reborndev.oss-cn-hangzhou.aliyuncs.com' + this.PostConfig.VideoStr;
let url = this.PostConfig.VideoStr.indexOf('http') > -1 ? this.PostConfig.VideoStr : this.domainManager().ViittoFileUrl+ + this.PostConfig.VideoStr;
this.VideoStr = url;
}
this.init();
......@@ -465,7 +465,7 @@
'PostConfig.VideoStr': { // 监听视频参数
handler: function (val, oldVal) {
if(val && val!==''){
let url = val.indexOf('http') > -1 ? val : 'https://reborndev.oss-cn-hangzhou.aliyuncs.com' + val;
let url = val.indexOf('http') > -1 ? val : this.domainManager().ViittoFileUrl+ + val;
this.VideoStr = url;
}
},
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 952c7746
......@@ -95,68 +95,9 @@
</div>
</div>
<div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial">
<!-- <span class="userDeSpan">效果预览（可进行单张修改）</span> -->
<!-- <div id="travelSpecial">
<div class="travelSpecial">
<div v-for="(option, index) in this.travelsList" :key="index">
<div class="special_header" v-if="index%3===0">
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-pic.png"
>
<div>
<vEditDiv v-model="FeatureData.Subtitle"></vEditDiv>
<div>
<span>&#9670;</span>
<vEditDiv v-model="FeatureData.Title"></vEditDiv>
</div>
<div class="special_portrait">
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/plane.png"
>
</div>
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/logo.png"
>
<div class="special_title">
<div>行程特色</div>
<div>&#9660;</div>
</div>
</div>
</div>
<div class="special_content" v-if="option.length!==0">
<component :is="option.temp" :travelsObj="option"></component>
<div v-if="del_show===true" class="special_del">
<span class="iconfont icon-shanchu" @click="delFeature(index)"></span>
</div>
</div>
<div class="special_footer" v-if="index%3===2||index===travelsList.length-1">
<div>
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/line.png"
>
<div>感动·与世界同步</div>
</div>
<div>
<div>{{FeatureData.LineName}}</div>
<div>
<img
crossorigin="Anonymous"
src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bottom_pic.png"
>
</div>
</div>
</div>
</div>
</div>
</div> -->
<new-feature ref='newFeature' :data='FeatureData'></new-feature>
</div>
<div v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<!--<newFeature2 ref='newFeature2' :data='FeatureData'></newFeature2>-->
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div>
</div>
......@@ -448,39 +389,6 @@
}
)
}, 2000)
// this.h2c(document.getElementById("travelSpecial"), {
// useCORS: true,
// logging: false
// }).then(canvas => {
// let imgUrl = canvas.toDataURL("image/png");
// let blob = this.base64ToBlob(imgUrl);
// let newArr = [];
// newArr.push(blob);
// let fileName = `${this.uuid(10, 10)}.png`;
// let user = JSON.parse(window.localStorage.userInfo);
// let path = `/Upload/TravelFeature/${user.EmployeeId}/${fileName}`;
// var that = this;
// this.uploadBlob(path, newArr, x => {
// if (x.res.statusCode === 200) {
// postData.Feature.FeatureHtmlImage =
// "http://reborndev.oss-cn-hangzhou.aliyuncs.com" + path;
// this.apipost(
// "travel_post_SetFeature",
// postData,
// res => {
// if (res.data.resultCode == 1) {
// }
// },
// err => {}
// );
// } else {
// this.Error("生成图片失败");
// }
// });
// });
// }
},
//切换tab事件
clickFeature(item) {
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 952c7746
......@@ -579,6 +579,7 @@
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("tempData",tempData);
if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelHotel1.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelHotel1_top">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_860,image/crop,x_0,y_0,w_860,h_430,g_west'">
<div class="travelTab_right travelHotel1_travelTab">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>酒店</span>
</div>
</div>
......@@ -12,10 +12,10 @@
<div class="travel_title_left_red travelHotel1_title_red">
<div>{{this.travelsObj.HotelName}}</div>
<div>
<img crossOrigin="Anonymous" class="travelHotel1_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone1.png">
<img crossOrigin="Anonymous" class="travelHotel1_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone1.png'">
</div>
<div class="travelHotel1_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>优选酒店</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelHotel2.vue
View file @ 952c7746
......@@ -9,18 +9,18 @@
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelHotel2_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>优选酒店</div>
</div>
</div>
<div class="travelHotel2_space"></div>
<div class="travelHotel2_bottom" v-html="this.travelsObj.Description"></div>
<img crossOrigin="Anonymous" class="travelHotel2_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone1.png">
<img crossOrigin="Anonymous" class="travelHotel2_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone1.png'">
</div>
<div class="travelHotel2_right">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_560,image/crop,x_0,y_0,w_560,h_280,g_west'">
<div class="travelTab_right">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>酒店</span>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelHotel3.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelHotel3_left">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_315,g_west'">
<div class="travelTab_left">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_left.png">
<img crossOrigin="Anonymous" :src="this.domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_left.png'">
<span>酒店</span>
</div>
</div>
......@@ -16,7 +16,7 @@
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelHotel3_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>优选酒店</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelRestaurant1.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelRestaurant1_top">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_860,image/crop,x_0,y_0,w_860,h_480,g_west'">
<div class="travelTab_right travelRestaurant1_travelTab">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>美食</span>
</div>
</div>
......@@ -11,14 +11,14 @@
<div class="travel_title_left_red travelRestaurant1_title_red">
<div>{{this.travelsObj.DinnerName}}</div>
<div>
<img crossOrigin="Anonymous" class="travelRestaurant1_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone1.png">
<img crossOrigin="Anonymous" class="travelRestaurant1_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone1.png'">
</div>
<div class="travel_title_right_yellow travelRestaurant1_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelRestaurant1_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>特色餐食</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelRestaurant2.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelRestaurant2_left">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_420,g_west'">
<div class="travelTab_left">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_left.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_left.png'">
<span>美食</span>
</div>
</div>
......@@ -11,13 +11,13 @@
<div class="travel_title_right_red travelRestaurant2_title_red">
<div></div>
<div>{{this.travelsObj.DinnerName}}</div>
<img crossOrigin="Anonymous" class="travelRestaurant2_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone2.png">
<img crossOrigin="Anonymous" class="travelRestaurant2_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone2.png'">
<div class="travel_title_right_yellow travelRestaurant2_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelRestaurant2_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag2.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag2.png'">
<div>特色餐食</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelViewSpot1.vue
View file @ 952c7746
......@@ -3,7 +3,7 @@
<div class="travelViewSpot1_left">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_315,g_west'">
<div class="travelTab_left">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_left.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_left.png'">
<span>景点</span>
</div>
</div>
......@@ -11,13 +11,13 @@
<div class="travel_title_left_red travelViewSpot1_title_red">
<div>{{this.travelsObj.CouponsName}}</div>
<div></div>
<img crossOrigin="Anonymous" class="travelViewSpot1_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone2.png">
<img crossOrigin="Anonymous" class="travelViewSpot1_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone2.png'">
<div class="travel_title_right_yellow travelViewSpot1_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelViewSpot1_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>特色推荐</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/TravelViewSpot2.vue
View file @ 952c7746
......@@ -4,13 +4,13 @@
<div class="travel_title_left_red travelViewSpot2_title_red">
<div>{{this.travelsObj.CouponsName}}</div>
<div></div>
<img crossOrigin="Anonymous" class="travelViewSpot2_stone" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/stone2.png">
<img crossOrigin="Anonymous" class="travelViewSpot2_stone" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/stone2.png'">
<div class="travel_title_right_yellow travelViewSpot2_title_yellow">
<div></div>
<div>{{this.travelsObj.CityName}}</div>
</div>
<div class="travelViewSpot2_label">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag.png'">
<div>特色推荐</div>
</div>
</div>
......@@ -19,7 +19,7 @@
<div class="travelViewSpot2_right">
<img crossOrigin="Anonymous" :src="this.travelsObj.ImaArray[0].Url + '?x-oss-process=image/resize,w_630,image/crop,x_0,y_0,w_630,h_315,g_west'">
<div class="travelTab_right">
<img crossOrigin="Anonymous" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/tag_right.png">
<img crossOrigin="Anonymous" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/tag_right.png'">
<span>景点</span>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/travelFeature/featureBody.vue
View file @ 952c7746
......@@ -475,7 +475,7 @@ export default {
var fileName = `${that.uuid(10,10)}.png`
var path = `/feature/${that.cid}/${fileName}`;
that.uploadBlob(path, newArr, x => {
let allPath='https://reborndev.oss-cn-hangzhou.aliyuncs.com'+x.name
let allPath=this.domainManager().ViittoFileUrl+x.name
let i=e.target.id.split('_')[2]
let objType=e.target.id.split('_')[3];
that.opera('change',parseInt(i),objType,allPath)
......
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @ 952c7746
......@@ -398,7 +398,7 @@
for (var i = 0; i < dinnerImgList.length; i++) {
if (dinnerImgList[i] != "") {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().AliUrl + dinnerImgList[i];
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = "";
dinnerObj.ImaArray.push(fileObj);
}
......@@ -465,7 +465,7 @@
for (var i = 0; i < dinnerImgList.length; i++) {
if (dinnerImgList[i] != "") {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().AliUrl + dinnerImgList[i];
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = "";
dinnerObj.ImaArray.push(fileObj);
}
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 952c7746
......@@ -586,7 +586,7 @@
};
if (s.PicPath != "") {
let picPath = s.PicPath.split(",")[0];
scenicImg.Url = this.domainManager().AliUrl + picPath;
scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
scenicImg.fileName = picPath;
}
scenic.NewImaArray.push(scenicImg);
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 952c7746
......@@ -1112,7 +1112,7 @@
obj.Path = x;
obj.PicID = 0;
obj.ShowPath =
this.domainManager().AliUrl +
this.domainManager().ViittoFileUrl +
x +
"?x-oss-process=image/resize,l_140";
this.TicketCouponsImageArray.push(obj);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment