Skip to content

A
Athena
Commit a9856589 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 5d073399 98926e1b
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 38 deletions
src/components/mall/OneDayDetailTwo.vue
View file @ a9856589
......@@ -137,18 +137,18 @@
</el-col>
<el-col :span='12'>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last">
<img v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)">
<img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="BigImgShow(4)">
查看全部图片
</div>
</div>
......@@ -157,23 +157,23 @@
</template>
<template v-else>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 0" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" />
<img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" />
</el-col>
<el-col :span='12'>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last">
<img v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" />
<img @click="BigImgShow(4)" v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)">
<div class="tip" @click="BigImgShow(4)">
查看全部图片
</div>
</div>
......@@ -539,6 +539,11 @@
</table>
</div>
</el-dialog>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="(item,index) in images" :src="item.Url" :key="index+5000">
</viewer>
</div>
</template>
......@@ -645,6 +650,11 @@ export default {
city: -1,
routed:"b2b_get_GetB2BTravelInfoV1",
local:0,
images:[],
imageOptions:{
navbar:false,
title:false
}
}
},watch: { // 监听参数变化
changeCity: {
......@@ -676,6 +686,16 @@ export default {
// this.initMap();
},
methods: {
inited (viewer){
this.$viewer = viewer
},
BigImgShow(index){
// if(num==1){
this.$viewer.view(index)
this.$viewer.show()
// }
},
orderChosen: function (date) {
let day = date.split('-')[0] + '-' + date.split('-')[1];
console.log("this.calendarTit",this.calendarTit)
......@@ -846,6 +866,7 @@ export default {
this.dataList = data;
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null;
this.imgCover = JSON.parse(this.dataList.imgCover);
this.images = this.imgCover;
this.showType = this.feature.featureType;
this.dayTrip = this.dataList.dayNum;
if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){
......
src/components/mall/detailTwo.vue
View file @ a9856589
......@@ -136,18 +136,18 @@
</el-col>
<el-col :span='12'>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="imgCover[2].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last">
<img v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)">
<div class="tip" @click="BigImgShow(4)">
查看全部图片
</div>
</div>
......@@ -156,23 +156,23 @@
</template>
<template v-else>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 0" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" />
<img @click="BigImgShow(0)" v-if="imgCover&&imgCover[0]" :src="editSrc(imgCover[0].Url)" style="height: 259px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 259px;width:100%" />
</el-col>
<el-col :span='12'>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex =1" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="showImg(imgCover),initialIndex = 2" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<img @click="BigImgShow(1)" v-if="imgCover&&imgCover[1]" :src="editSrc(imgCover[1].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(2)" v-if="imgCover&&imgCover[2]" :src="editSrc(imgCover[2].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
</el-col>
<el-col :span='12'>
<img @click="showImg(imgCover),initialIndex = 3" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img @click="showImg(imgCover)" v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<img @click="BigImgShow(3)" v-if="imgCover&&imgCover[3]" :src="imgCover[3].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[3].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%" />
<div class="last">
<img v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" />
<img @click="BigImgShow(4)" v-if="imgCover&&imgCover[4]" :src="imgCover[4].Url==''?'../../assets/img/bg_c2@3x.png':editSrc(imgCover[4].Url)" style="height: 126px;width:100%" />
<img v-else src="../../assets/img/bg_c2@3x.png" style="height: 126px;width:100%;margin-top:3px;" />
<div class="tip" @click="showImg(imgCover)">
<div class="tip" @click="BigImgShow(4)">
查看全部图片
</div>
</div>
......@@ -639,6 +639,11 @@
</table>
</div>
</el-dialog>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="(item,index) in images" :src="item.Url" :key="index+5000">
</viewer>
</div>
</template>
......@@ -746,6 +751,12 @@ export default {
city: -1,
teamType:0,
free:0,
images:[],
imageOptions:{
navbar:false,
title:false
},
}
},watch: { // 监听参数变化
changeCity: {
......@@ -780,6 +791,16 @@ export default {
// this.initMap();
},
methods: {
inited (viewer){
this.$viewer = viewer
},
BigImgShow(index){
// if(num==1){
this.$viewer.view(index)
this.$viewer.show()
// }
},
orderChosen: function (date) {
let day = date.split('-')[0] + '-' + date.split('-')[1]
this.calendarTit.forEach((x, index)=>{
......@@ -949,9 +970,9 @@ export default {
this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
this.dataList = data;
console.log("this.dataList ",this.dataList )
this.toDayObj = data.currentPriceInfo;
this.imgCover = JSON.parse(this.dataList.imgCover);
this.images = this.imgCover;
this.showType = this.feature.featureType;
this.dayTrip = this.dataList.dayNum;
if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){
......
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