Commit 8c93043d authored by 黄奎's avatar 黄奎

上传修改

parent 02fda4ec
......@@ -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: "",
......
......@@ -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);
......
......@@ -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) {
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -24,8 +24,8 @@
<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="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='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-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">
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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