Commit d95b1d34 authored by youjie's avatar youjie

no message

parent bde85fa4
...@@ -190,8 +190,13 @@ ...@@ -190,8 +190,13 @@
}, },
changeMenuShowType() { changeMenuShowType() {
this.isCollapse = !this.isCollapse; if(this.$route.path=='/TravelManager'){
localStorage.navsot = this.isCollapse ? 'a' : 'b' this.isCollapse = true;
localStorage.navsot = 'a'
}else{
this.isCollapse = !this.isCollapse;
localStorage.navsot = this.isCollapse ? 'a' : 'b'
}
}, },
referPage() { referPage() {
this.currentTabName = this.tabs[this.currentRightIndex].name + '_' + this.currentRightIndex this.currentTabName = this.tabs[this.currentRightIndex].name + '_' + this.currentRightIndex
......
...@@ -121,9 +121,9 @@ ...@@ -121,9 +121,9 @@
</tr> </tr>
</template> </template>
<tr> <!-- <tr>
<td colspan="6" height="15"></td> <td colspan="6" height="15"></td>
</tr> </tr> -->
<tr class="marginT10"> <tr class="marginT10">
<td width="70" valign="top"> <td width="70" valign="top">
<img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png"> <img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png">
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y" :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop"> :z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0"> <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url" class="absolute" :src="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"
: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'"> <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" <video ref="myVideo" width="100%" height="100%" :src="ScenicArrayList[0].NewImaArray[0].VideoPath" controls="controls"
...@@ -299,8 +300,16 @@ ...@@ -299,8 +300,16 @@
} }
if(this.ScenicArrayList&&this.ScenicArrayList.length>0){ if(this.ScenicArrayList&&this.ScenicArrayList.length>0){
this.ScenicArrayList[this.imgIndex].ScenicJson.y = y this.ScenicArrayList[this.imgIndex].ScenicJson.y = y
this.item.ScenicArray.forEach(x=>{
this.ScenicArrayList.forEach(y=>{
if(x.CouponsId==y.CouponsId){
x.ScenicJson.y = y.ScenicJson.y
}
})
})
}else{ }else{
this.item.TrafficObj.trafficIntroduce.y = y this.item.TrafficObj.trafficIntroduce.y = y
this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
} }
this.$refs[ this.$refs[
"viewSpotVds_" + (this.item * 4)+ "_"+this.imgIndex + this.index "viewSpotVds_" + (this.item * 4)+ "_"+this.imgIndex + this.index
......
...@@ -616,13 +616,14 @@ ...@@ -616,13 +616,14 @@
let status = false let status = false
this.dayObj.ScenicArray.forEach(x => { this.dayObj.ScenicArray.forEach(x => {
this.dayObj.ChooseScenicArray.push(x.CouponsId); this.dayObj.ChooseScenicArray.push(x.CouponsId);
if(!status&&x.Rank>0){ if(!status&&x.Rank>0&&!this.ScenicArraySingle){
// this.ScenicArray = [x.CouponsId] // this.ScenicArray = [x.CouponsId]
this.ScenicArraySingle = x.CouponsId this.ScenicArraySingle = x.CouponsId
status = true status = true
} }
}); });
if(!status&&this.dayObj.ScenicArray.length>0){ if(!status&&this.dayObj.ScenicArray.length>0&&!this.ScenicArraySingle){
status = true
this.ScenicArraySingle = this.dayObj.ScenicArray[0].CouponsId this.ScenicArraySingle = this.dayObj.ScenicArray[0].CouponsId
} }
if(this.ScenicArray&&this.ScenicArray.length>0) { if(this.ScenicArray&&this.ScenicArray.length>0) {
......
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