Skip to content

S
SuperMan
Commit ea4734ed authored by 吴春's avatar 吴春
Browse files
Options

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

parents d48ac28f 6d84c47f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ ea4734ed
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
</div> </div>
</div> </div>
<!-- 5张 --> <!-- 5张 -->
<div v-if="item.ScenicArray.length>4"> <div v-if="item.ScenicArray.length==5||item.ScenicArray.length>5">
<div class="row-sb MB31"> <div class="row-sb MB31">
<div class=""> <div class="">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap5_1 hidden relative borderRadius18"> <div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap5_1 hidden relative borderRadius18">
...@@ -910,10 +910,9 @@ ...@@ -910,10 +910,9 @@
that.ScenicArrayList[that.imgIndex].NewImaArray[0].Url = allPath that.ScenicArrayList[that.imgIndex].NewImaArray[0].Url = allPath
that.ScenicArrayList[that.imgIndex].NewImaArray[0].x = 0 that.ScenicArrayList[that.imgIndex].NewImaArray[0].x = 0
that.ScenicArrayList[that.imgIndex].NewImaArray[0].y = 0 that.ScenicArrayList[that.imgIndex].NewImaArray[0].y = 0
that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray); that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[that.imgIndex].NewImaArray);
if (that.item.ScenicArray && that.item.ScenicArray.length > 0) { if (that.item.ScenicArray && that.item.ScenicArray.length > 0) {
that.item.ScenicArray[that.defaultScenicIndex] = JSON.parse(JSON.stringify(that.ScenicArrayList[ that.item.ScenicArray[that.defaultScenicIndex] = JSON.parse(JSON.stringify(that.ScenicArrayList[that.defaultScenicIndex]));
0]));
} }
} else { } else {
that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath
...@@ -949,7 +948,7 @@ ...@@ -949,7 +948,7 @@
that.ScenicArrayList[that.imgIndex].NewImaArray.push(obj); that.ScenicArrayList[that.imgIndex].NewImaArray.push(obj);
that.ScenicArrayList[that.imgIndex].ScenicJson.x = 0 that.ScenicArrayList[that.imgIndex].ScenicJson.x = 0
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[that.imgIndex].NewImaArray);
}); });
} else { } else {
this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path
...@@ -959,7 +958,7 @@ ...@@ -959,7 +958,7 @@
} }
this.isShowScenicImg = false; this.isShowScenicImg = false;
if (this.item.ScenicArray && this.item.ScenicArray.length > 0) { if (this.item.ScenicArray && this.item.ScenicArray.length > 0) {
this.item.ScenicArray[this.defaultScenicIndex] = JSON.parse(JSON.stringify(this.ScenicArrayList[0])); this.item.ScenicArray[this.defaultScenicIndex] = JSON.parse(JSON.stringify(this.ScenicArrayList[that.defaultScenicIndex]));
} }
} }
}, },
......
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