Commit 021b9f68 authored by 黄奎's avatar 黄奎

页面修改

parent 2f7f6127
...@@ -40,19 +40,10 @@ ...@@ -40,19 +40,10 @@
<img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url" <img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url" class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index"> :id="'viewSpotImg_'+(item*4)+'_0'+index">
<template
v-if="ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].FileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="ScenicArrayList[0].NewImaArray[0].VideoPath"
controls="controls" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</video>
</template>
</template> </template>
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute" <img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :id="'viewSpotImg_'+(item*4)+'_0'+index"> :src="item.TrafficObj.trafficIntroduce.IntroduceImage" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable> </VueDraggableResizable>
<img
v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute" src="../../../../assets/img/defaultairline.png">
</div> </div>
</div> </div>
</div> </div>
...@@ -171,7 +162,6 @@ ...@@ -171,7 +162,6 @@
return { return {
RenderingOk: false, RenderingOk: false,
canEdit: true, canEdit: true,
backgroundColor: '', backgroundColor: '',
backgroundColor2: '', backgroundColor2: '',
textColor: '', textColor: '',
...@@ -186,6 +176,7 @@ ...@@ -186,6 +176,7 @@
queryId: 0, queryId: 0,
}, },
imgIndex: null, imgIndex: null,
defaultScenicIndex:0,//当前默认选中的景点
}; };
}, },
...@@ -275,7 +266,6 @@ ...@@ -275,7 +266,6 @@
let blob = that.base64ToBlob(event.target.result); let blob = that.base64ToBlob(event.target.result);
let newArr = []; let newArr = [];
newArr.push(blob); newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`; var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, '', x => { that.uploadSelfBlob(path, newArr, '', x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath; let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
...@@ -321,16 +311,20 @@ ...@@ -321,16 +311,20 @@
that.ScenicArrayList[that.imgIndex].ScenicJson.y = 0 that.ScenicArrayList[that.imgIndex].ScenicJson.y = 0
that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray); that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
}); });
} else { } else {
this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path
this.item.TrafficObj.trafficIntroduce.x = 0 this.item.TrafficObj.trafficIntroduce.x = 0
this.item.TrafficObj.trafficIntroduce.y = 0 this.item.TrafficObj.trafficIntroduce.y = 0
this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce); this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
} }
this.isShowScenicImg = false; this.isShowScenicImg = false;
this.item.ScenicArray = JSON.parse(JSON.stringify(this.ScenicArrayList)) if(this.item.ScenicArray&&this.item.ScenicArray.length>0)
{
this.item.ScenicArray[this.defaultScenicIndex]=JSON.parse(JSON.stringify(this.ScenicArrayList[0]));
}
//this.item.ScenicArray = JSON.parse(JSON.stringify(this.ScenicArrayList))
} }
}, },
computed: {}, computed: {},
...@@ -339,8 +333,9 @@ ...@@ -339,8 +333,9 @@
handler(val, oldVal) { handler(val, oldVal) {
this.RenderingOk = false; this.RenderingOk = false;
this.ScenicArrayList = [] this.ScenicArrayList = []
this.item.ScenicArray.forEach(x => { this.item.ScenicArray.forEach((x ,index)=> {
if (x.Rank > 0) { if (x.DefaultNum > 0) {
this.defaultScenicIndex=index;
this.ScenicArrayList.push(x) this.ScenicArrayList.push(x)
} }
}); });
......
...@@ -217,8 +217,7 @@ ...@@ -217,8 +217,7 @@
filterable filterable
@change="getScenicArray"> @change="getScenicArray">
<el-option v-for="(item,index) in dayObj.ScenicArray" :label="item.CouponsName" :value="item.CouponsId" :key="index"> <el-option v-for="(item,index) in dayObj.ScenicArray" :label="item.CouponsName" :value="item.CouponsId" :key="index">
<span style="float: left">{{ item.CouponsName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -226,7 +225,6 @@ ...@@ -226,7 +225,6 @@
</div> </div>
</div> </div>
<!-- 行程景点信息 --> <!-- 行程景点信息 -->
<div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}"> <div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
<div class="TC-SpecialInstruction clearfix column"> <div class="TC-SpecialInstruction clearfix column">
<div class="TC-leftTitle" style="height: 20px;">温馨提示</div> <div class="TC-leftTitle" style="height: 20px;">温馨提示</div>
...@@ -317,17 +315,14 @@ ...@@ -317,17 +315,14 @@
methods: { methods: {
// 默认需要展示的图 // 默认需要展示的图
getScenicArray(){ getScenicArray(){
let i = 1
let list = []
this.dayObj.ScenicArray.forEach(x=>{ this.dayObj.ScenicArray.forEach(x=>{
x.Rank = 0 x.DefaultNum = 0
if(x.CouponsId===this.ScenicArraySingle){ if(x.CouponsId===this.ScenicArraySingle){
x.Rank = 1 x.DefaultNum = 1
} }
}) })
this.dayObj.ScenicArrayImg = this.ScenicArraySingle; this.dayObj.ScenicArrayImg = this.ScenicArraySingle;
this.dayObj.ScenicArray = this.dayObj.ScenicArray.sort((a, b)=>{return b.Rank - a.Rank}); this.dayObj.ScenicArray = this.dayObj.ScenicArray.sort((a, b)=>{return b.DefaultNum - a.DefaultNum});
}, },
//非直采切换 //非直采切换
NoDirectScenicCheck(number) { NoDirectScenicCheck(number) {
......
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